Преглед на файлове

添加classCode维度查询方法

fengyanjie@sagacloud.cn преди 4 години
родител
ревизия
ea179b55f1

+ 14 - 0
dmp-report/src/main/java/com/persagy/dmp/report/service/GroupColumnService.java

@@ -50,6 +50,20 @@ public class GroupColumnService {
         return result;
     }
 
+    public List<Object[]> classCode() {
+        PagedResponse<ClassDefModel> classResponse = rwdClient.queryClass(null, JacksonCriteria.newInstance());
+        if (!classResponse.success()) {
+            return null;
+        }
+        List<ClassDefModel> data = classResponse.getData();
+        List<String> list = data.stream().map(ClassDefModel::getCode).distinct().collect(Collectors.toList());
+        List<Object[]> result = new ArrayList<>();
+        for (String code : list) {
+            result.add(new String[]{code});
+        }
+        return result;
+    }
+
     public List<Object[]> classCodeObjType() {
         PagedResponse<ClassDefModel> classResponse = rwdClient.queryClass(null, JacksonCriteria.newInstance());
         if (!classResponse.success()) {

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

@@ -69,9 +69,7 @@ public class ReportService {
                     return;
                 }
             }
-            if(tuplePagedResponse.getCount()>count){
-                count = tuplePagedResponse.getCount();
-            }
+            count = tuplePagedResponse.getCount();
             List<BaseEntity> data = service.getData(tuplePagedResponse, value);
             setData(dataList, data, criteria.getGroupbyColumns());
         }