Sfoglia il codice sorgente

修改字段名称

fengyanjie@sagacloud.cn 4 anni fa
parent
commit
85262ecf77

+ 1 - 1
dmp-report/src/main/java/com/persagy/dmp/report/entity/ReportConfig.java

@@ -21,7 +21,7 @@ public class ReportConfig extends BaseEntity {
     private String calculated;
     private String tableName;
     private String mappingName;
-    private String group;
+    private String groupColumn;
     @Type(type = "json")
     private ArrayNode tableGroup;
 }

+ 2 - 2
dmp-report/src/main/java/com/persagy/dmp/report/service/ReportConfigService.java

@@ -28,7 +28,7 @@ public class ReportConfigService implements BaseService {
         exps.addAll(CriteriaUtils.parse(qt.calculated, criteria.get("calculated")));
         exps.addAll(CriteriaUtils.parse(qt.tableName, criteria.get("tableName")));
         exps.addAll(CriteriaUtils.parse(qt.mappingName, criteria.get("mappingName")));
-        exps.addAll(CriteriaUtils.parse(qt.group, criteria.get("group")));
+        exps.addAll(CriteriaUtils.parse(qt.groupColumn, criteria.get("group")));
         return exps;
     }
 
@@ -41,7 +41,7 @@ public class ReportConfigService implements BaseService {
             entity.setCalculated(item.get(qt.calculated));
             entity.setTableName(item.get(qt.tableName));
             entity.setMappingName(item.get(qt.mappingName));
-            entity.setGroup(item.get(qt.group));
+            entity.setGroupColumn(item.get(qt.groupColumn));
             entity.setTableGroup(item.get(qt.tableGroup));
             list.add(entity);
         });

+ 1 - 1
dmp-report/src/main/java/com/persagy/dmp/report/service/ReportService.java

@@ -105,7 +105,7 @@ public class ReportService {
         if (!one.isPresent()) {
             return null;
         }
-        List<String> groupList = Arrays.asList(one.get().getGroup().split(","));
+        List<String> groupList = Arrays.asList(one.get().getGroupColumn().split(","));
         if (groupList.containsAll(groupbyColumns)) {
             return one.get();
         }

+ 1 - 1
dmp-report/src/main/java/com/persagy/dmp/report/service/ReportUtils.java

@@ -313,7 +313,7 @@ public class ReportUtils {
         configAll.forEach(item -> {
             reportConfig.setCalculated(item.getCalculated());
             reportConfig.setTableGroup(item.getTableGroup());
-            reportConfig.setGroup(item.getGroup());
+            reportConfig.setGroupColumn(item.getGroupColumn());
             reportConfig.setMappingName(item.getMappingName());
             reportConfig.setTableName(item.getTableName());
             if (null == reportConfig.getCalculatedColumns()) {