1/25

src/main/java/cn/cslg/pas/controller/ReportProjectController.java

@@ -11,6 +11,7 @@ import cn.cslg.pas.common.model.cronModel.Records;
 import cn.cslg.pas.common.model.request.StringGroupRequest;
 import cn.cslg.pas.common.model.request.StringRequest;
 import cn.cslg.pas.common.utils.Response;
+import cn.cslg.pas.domain.business.ReportProject;
 import cn.cslg.pas.exception.ConditionException;
 import cn.cslg.pas.exception.UnLoginException;
 import cn.cslg.pas.exception.XiaoShiException;

src/main/java/cn/cslg/pas/service/business/ReportProjectService.java

@@ -48,8 +48,8 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
-@Service
 @Slf4j
+@Service
 public class ReportProjectService extends ServiceImpl<ReportProjectMapper, ReportProject> implements Business {
 
     @Autowired

src/main/resources/jsons/product.json

@@ -15,7 +15,7 @@
   {"name":"产品名称",
     "type":"String",
     "value":"product_name",
-    "field": "name",
+    "field": "product_name",
     "sqlField": "product.name",
     "sqlClass": "getLikeSql",
     "orderClass": "getComOrder",
@@ -29,7 +29,7 @@
   {"name":"公司名称",
     "type":"String",
     "value":"product_companyName",
-    "field": "companyName",
+    "field": "product_companyName",
     "sqlField": "product.company_name",
     "sqlClass": "",
     "orderClass": "getComOrder",
@@ -42,7 +42,7 @@
   {"name":"产品参考许可费率",
     "type":"Double",
     "value":"product_licenseRate",
-    "field": "licenseRate",
+    "field": "product_licenseRate",
     "sqlField": "product.license_rate",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
@@ -55,7 +55,7 @@
   {"name":"上市时间",
     "type":"DateTime",
     "value":"product_marketTime",
-    "field": "marketTime",
+    "field": "product_marketTime",
     "sqlField": "product.market_time",
     "sqlClass": "getDateTimeSql",
     "orderClass": "getComOrder",
@@ -80,7 +80,7 @@
   {"name":"可见类型",
     "type":"Integer",
     "value":"product_showType",
-    "field": "showType",
+    "field": "product_showType",
     "sqlField": "product.show_type",
     "sqlClass": "",
     "orderClass": "getComOrder",
@@ -92,7 +92,7 @@
   {"name":"描述",
     "type":"String",
     "value":"product_description",
-    "field": "description",
+    "field": "product_description",
     "sqlField": "product.description",
     "sqlClass": "",
     "orderClass": "getComOrder",
@@ -103,8 +103,8 @@
   {"name":"产品创建人",
     "type":"String",
     "value":"product_createName",
-    "field": "createName",
-    "sqlField": "product.createId",
+    "field": "product_createName",
+    "sqlField": "product.create_id",
     "sqlClass": "getCreateNameSql",
     "orderClass": "getCreateNameOrder",
     "ifSearch":"true",
@@ -116,7 +116,7 @@
     "name":"产品创建时间",
     "type":"DateTime",
     "value":"product_createTime",
-    "field":"createTime",
+    "field":"product_createTime",
     "sqlField": "product.create_time",
     "sqlClass": "getDateTimeSql",
     "orderClass": "getComOrder",

src/main/resources/jsons/productCategory.json

@@ -15,7 +15,7 @@
   {"name":"产品类别名称",
     "type":"String",
     "value":"category_name",
-    "field": "name",
+    "field": "category_name",
     "sqlField": "category.name",
     "sqlClass": "getLikeSql",
     "orderClass": "getComOrder",
@@ -28,7 +28,7 @@
   {"name":"产品类别参考许可费率",
     "type":"Double",
     "value":"category_licenseRate",
-    "field": "licenseRate",
+    "field": "category_licenseRate",
     "sqlField": "category.license_rate",
     "sqlClass": "getComSql",
     "orderClass": "getComOrder",
@@ -52,7 +52,7 @@
   {"name":"描述",
     "type":"String",
     "value":"category_description",
-    "field": "description",
+    "field": "category_description",
     "sqlField": "category.description",
     "sqlClass": "",
     "orderClass": "getComOrder",
@@ -63,7 +63,7 @@
   {"name":"产品类别创建人",
     "type":"String",
     "value":"category_createName",
-    "field": "createName",
+    "field": "category_createName",
     "sqlField": "category.create_id",
     "sqlClass": "getCreateNameSql",
     "orderClass": "getCreateNameOrder",
@@ -76,7 +76,7 @@
     "name":"产品类别创建时间",
     "type":"DateTime",
     "value":"category_createTime",
-    "field":"createTime",
+    "field":"category_createTime",
     "sqlField": "category.create_time",
     "orderClass": "getComOrder",
     "sqlClass": "getDateTimeSql",