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

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

@@ -150,6 +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<SysCategoryModel> sysCategoryModels = sysBaseAPI.queryAllSysCategory();
         Double num = Double.valueOf(0);
@@ -177,7 +178,13 @@ public class QcSsgqzysytdqkGzvServiceImpl extends ServiceImpl<QcSsgqzysytdqkGzvM
         Map<String, Double> xzqhByAreaCollect = list.stream().collect(
                 Collectors.groupingBy(QcSsgqzysytdqkGzv::getXzqh,
                         Collectors.summingDouble(s -> Optional.ofNullable(s.getSjsyjzmj() * 0.0015).orElse(0.0))));
-        result.add(xzqhByAreaCollect);
+        Map<String, Double> sortedMap = new LinkedHashMap<>();
+        for (DictModel dictModel : xzqh) {
+            String key = dictModel.getText(); // 获取行政区划编码
+            Double value = xzqhByAreaCollect.getOrDefault(key, 0.0); // 从原map获取值，若不存在则使用0.0
+            sortedMap.put(key, value);
+        }
+        result.add(sortedMap);
         //土地使用现状编码
         Map<String, List<QcSsgqzysytdqkGzv>> syxzCollect = list.stream().collect(
                 Collectors.groupingBy((QcSsgqzysytdqkGzv::getTdsyxz)));
@@ -189,6 +196,13 @@ 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, Long> wjlxCollect = list.stream().collect(
@@ -223,6 +237,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<SysCategoryModel> sysCategoryModels = sysBaseAPI.queryAllSysCategory();
         Double num = Double.valueOf(0);
         List<Map<String, Double>> result = new ArrayList<>();
@@ -248,8 +263,14 @@ public class QcSsgqzysytdqkGzvServiceImpl extends ServiceImpl<QcSsgqzysytdqkGzvM
         Map<String, Double> xzqhByAreaCollect = list.stream().collect(
                 Collectors.groupingBy(QcSsgqzysytdqkGzv::getXzqh,
                         Collectors.summingDouble(s -> Optional.ofNullable(s.getSjsyjzmj() * 0.0015).orElse(0.0))));
-        result.add(xzqhByAreaCollect);
-        //土地使用方式
+        Map<String, Double> sortedMap = new LinkedHashMap<>();
+        for (DictModel dictModel : xzqh) {
+            String key = dictModel.getText(); // 获取行政区划编码
+            Double value = xzqhByAreaCollect.getOrDefault(key, 0.0); // 从原map获取值，若不存在则使用0.0
+            sortedMap.put(key, value);
+        }
+        result.add(sortedMap);
+        //土地使用现状
         Map<String, List<QcSsgqzysytdqkGzv>> syxzCollect = list.stream().collect(
                 Collectors.groupingBy((QcSsgqzysytdqkGzv::getTdsyxz)));
         for (String s : syxzCollect.keySet()) {
@@ -260,7 +281,13 @@ 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))));
-        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,
@@ -280,6 +307,7 @@ 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());