1. 修改闲置低效查询内容接口(syqsyfs)排序

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/gzvhb/service/impl/QcSsgqzysytdqkGzvServiceImpl.java

@@ -150,7 +150,7 @@ public class QcSsgqzysytdqkGzvServiceImpl extends ServiceImpl<QcSsgqzysytdqkGzvM
     @Override
     public List<Map<String, Double>> sumList(List<QcSsgqzysytdqkGzv> list) {
         List<DictModel> xzqh = sysBaseAPI.getDictItems("xq");
-        List<DictModel> tsyqsyfsList = sysBaseAPI.getDictItems("tsyqsyfs");
+        //List<DictModel> tsyqsyfsList = sysBaseAPI.getDictItems("tsyqsyfs");
         //获取字典列表
         List<SysCategoryModel> sysCategoryModels = sysBaseAPI.queryAllSysCategory();
         Double num = Double.valueOf(0);
@@ -196,14 +196,15 @@ public class QcSsgqzysytdqkGzvServiceImpl extends ServiceImpl<QcSsgqzysytdqkGzvM
         Map<String, Double> syxzByAreaCollect = list.stream().collect(
                 Collectors.groupingBy(QcSsgqzysytdqkGzv::getSyqsyfs,
                         Collectors.summingDouble(s -> Optional.ofNullable(s.getSjzytdmj() * 0.0015).orElse(0.0))));
-        Map<String, Double> syqlist = new LinkedHashMap<>();
-        for (DictModel dictModel : tsyqsyfsList) {
-            String key = dictModel.getText(); // 使用权使用方式
-            Double value = syxzByAreaCollect.getOrDefault(key, 0.0); // 从原map获取值，若不存在则使用0.0
-            syqlist.put(key, value);
-        }
-        result.add(syqlist);
         result.add(syxzByAreaCollect);
+//        Map<String, Double> syqlist = new LinkedHashMap<>();
+//        for (DictModel dictModel : tsyqsyfsList) {
+//            String key = dictModel.getText(); // 使用权使用方式
+//            Double value = syxzByAreaCollect.getOrDefault(key, 0.0); // 从原map获取值，若不存在则使用0.0
+//            syqlist.put(key, value);
+//        }
+//        result.add(syqlist);
+
         //文件类型
         Map<String, Long> wjlxCollect = list.stream().collect(
                 Collectors.groupingBy(QcSsgqzysytdqkGzv::getWjlx,
@@ -237,7 +238,7 @@ public class QcSsgqzysytdqkGzvServiceImpl extends ServiceImpl<QcSsgqzysytdqkGzvM
     @Override
     public List<Map<String, Double>> sumListBysz(List<QcSsgqzysytdqkGzv> list) {
         List<DictModel> xzqh = sysBaseAPI.getDictItems("xq");
-        List<DictModel> tsyqsyfsList = sysBaseAPI.getDictItems("tsyqsyfs");
+       // List<DictModel> tsyqsyfsList = sysBaseAPI.getDictItems("tsyqsyfs");
         List<SysCategoryModel> sysCategoryModels = sysBaseAPI.queryAllSysCategory();
         Double num = Double.valueOf(0);
         List<Map<String, Double>> result = new ArrayList<>();
@@ -281,13 +282,14 @@ public class QcSsgqzysytdqkGzvServiceImpl extends ServiceImpl<QcSsgqzysytdqkGzvM
         Map<String, Double> syxzByAreaCollect = list.stream().collect(
                 Collectors.groupingBy(QcSsgqzysytdqkGzv::getSyqsyfs,
                         Collectors.summingDouble(s -> Optional.ofNullable(s.getSjzytdmj() * 0.0015).orElse(0.0))));
-        Map<String, Double> syqlist = new LinkedHashMap<>();
-        for (DictModel dictModel : tsyqsyfsList) {
-            String key = dictModel.getText(); // 使用权使用方式
-            Double value = syxzByAreaCollect.getOrDefault(key, 0.0); // 从原map获取值，若不存在则使用0.0
-            syqlist.put(key, value);
-        }
-        result.add(syqlist);
+        result.add(syxzByAreaCollect);
+//        Map<String, Double> syqlist = new LinkedHashMap<>();
+//        for (DictModel dictModel : tsyqsyfsList) {
+//            String key = dictModel.getText(); // 使用权使用方式
+//            Double value = syxzByAreaCollect.getOrDefault(key, 0.0); // 从原map获取值，若不存在则使用0.0
+//            syqlist.put(key, value);
+//        }
+//        result.add(syqlist);
         //文件类型
         Map<String, Long> wjlxCollect = list.stream().collect(
                 Collectors.groupingBy(QcSsgqzysytdqkGzv::getZslx,
@@ -307,7 +309,6 @@ public class QcSsgqzysytdqkGzvServiceImpl extends ServiceImpl<QcSsgqzysytdqkGzvM
             }
         }
         //批准用途
-
         Map<String, List<QcSsgqzysytdqkGzv>> collectBysjyt = list.stream().collect(Collectors.groupingBy((QcSsgqzysytdqkGzv::getPzyt)));
         for (String s : collectBysjyt.keySet()) {
             sjytMap.put(s, (double) collectBysjyt.get(s).size());