1. 修改排序规则

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qyxx/controller/QcQyxxController.java

@@ -1005,26 +1005,22 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         QueryWrapper ssDwsl = new QueryWrapper<>();
         //SELECT sum(CAST(sjzytdmj AS DECIMAL(10,2)))*0.0015 as  SUMSS,count(SJZYTDMJ) as  COUNTDK from qc_ssgqzysytdqk_gzv where sfsb=3 and sys_org_code like 'A04%'
         queryWrapper.select("sum(CAST(sjzytdmj AS DECIMAL(10,2)))*0.0015 as  \"SUMSS\",count(SJZYTDMJ) as  \"COUNTDK\"");
-        queryWrapper.eq("SFSB", 3);
         queryWrapper.likeRight("SYS_ORG_CODE", "A04");
         Map<String, Object> map = qcSsgqzysytdqkGzvService.getMap(queryWrapper);
 
         //转亩
         queryWrapperBysz.select("sum(SJZYTDMJ) as  \"sumsz\",count(SJZYTDMJ) as  \"countdk\"").likeRight("SYS_ORG_CODE", "A03");
-        queryWrapperBysz.eq("SFSB", 3);
         map.put("SUMSZ", Double.parseDouble(qcSsgqzysytdqkGzvService.getMap(queryWrapperBysz).get("sumsz").toString()) * 0.0015);
         map.put("COUNTDKBYSZ", qcSsgqzysytdqkGzvService.getMap(queryWrapperBysz).get("countdk").toString());
 
         //省属闲置地效
         queryWrapperBydxss.select("sum(CAST(sjzytdmj AS DECIMAL(10,2)))*0.0015 as \"sumssxzdx\",count(SJZYTDMJ) as  \"countdk\"");
-        queryWrapperBydxss.eq("SFSB", 3);
         queryWrapperBydxss.eq("TDSYXZ", "闲置低效土地");
         queryWrapperBydxss.likeRight("SYS_ORG_CODE", "A04");
         map.put("SUMSSXZDX", qcSsgqzysytdqkGzvService.getMap(queryWrapperBydxss).get("sumssxzdx"));
         map.put("COUNTDKBYSSXZDX", qcSsgqzysytdqkGzvService.getMap(queryWrapperBydxss).get("countdk"));
 
         queryWrapperBydxsz.select("sum(SJZYTDMJ) as \"sumszxzdx\",count(SJZYTDMJ) as  \"countdk\"");
-        queryWrapperBydxsz.eq("SFSB", 3);
         queryWrapperBydxsz.eq("TDSYXZ", "闲置低效土地");
         queryWrapperBydxsz.likeRight("SYS_ORG_CODE", "A03");
         map.put("SUMSZXZDX", Double.parseDouble(qcSsgqzysytdqkGzvService.getMap(queryWrapperBydxsz).get("sumszxzdx").toString()) * 0.0015);
@@ -1032,22 +1028,18 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
 
         //已审核
         ssQysl.select("count(SYS_ORG_CODE) as  \"ssQysl\"");
-        ssQysl.eq("SFSB", 3);
         ssQysl.likeRight("SYS_ORG_CODE", "A04");
         map.put("SSQYSL", qcQyxxService.getMap(ssQysl).get("ssQysl").toString());
 
         sbdkQysl.select(" count(DISTINCT(SYS_ORG_CODE)) as \"sbdkQysl\"");
-        sbdkQysl.eq("SFSB", 3);
         sbdkQysl.likeRight("SYS_ORG_CODE", "A04");
         map.put("SBDKQYSL", qcSsgqzysytdqkGzvService.getMap(sbdkQysl).get("sbdkQysl"));
 
         szQysl.select("count(SYS_ORG_CODE) as  \"szQysl\"");
-        szQysl.eq("SFSB", 3);
         szQysl.likeRight("SYS_ORG_CODE", "A03");
         map.put("SZQYSL", qcQyxxService.getMap(szQysl).get("szQysl").toString());
 
         ssDwsl.select(" count(DISTINCT(SYS_ORG_CODE)) as \"ssDwsl\"");
-        ssDwsl.eq("SFSB", 3);
         ssDwsl.likeRight("SYS_ORG_CODE", "A03");
         map.put("SSDWSL", qcSsgqzysytdqkGzvService.getMap(ssDwsl).get("ssDwsl"));
         /*上报地块面积*/
@@ -1071,7 +1063,7 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
      *
      * @return
      */
-    @ApiOperation(value = "统计-土地获取方式占比", notes = "统计-土地获取方式占比")
+    @ApiOperation(value = "统计(省属)-土地获取方式占比", notes = "统计-土地获取方式占比")
     @GetMapping(value = "/tdhqfs")
     public Result<?> tdhqfs(@RequestParam(name = "xzqh") String xzqh) {
         QueryWrapper queryWrapper = new QueryWrapper<>();
@@ -1079,11 +1071,12 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
             queryWrapper.likeRight("XZQH", xzqh);
         }
         Map<String, Object> resultMap = new HashMap<>();
-        queryWrapper.select("count(syqsyfs) as \"value\",SYQSYFS as \"name\"");
+        queryWrapper.select("count(syqsyfs) as \"value\",SYQSYFS as \"name\",syqsyfs_code");
         queryWrapper.groupBy("SYQSYFS");
+        queryWrapper.groupBy("syqsyfs_code");
         queryWrapper.likeRight("SYS_ORG_CODE", "A04");
-        List list = qcSsgqzysytdqkGzvService.listMaps(queryWrapper);
-        Collections.reverse(list);
+        queryWrapper.orderByDesc("syqsyfs_code");
+        List<Map<String, Object>> list = qcSsgqzysytdqkGzvService.listMaps(queryWrapper);
         return Result.OK(list);
     }
 
@@ -1092,7 +1085,7 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
      *
      * @return
      */
-    @ApiOperation(value = "统计-土地获取方式占比按照面积", notes = "统计-土地获取方式占比按照面积")
+    @ApiOperation(value = "统计(省属)-土地获取方式占比按照面积", notes = "统计-土地获取方式占比按照面积")
     @GetMapping(value = "/tdhqfsArea")
     public Result<?> tdhqfsArea(@RequestParam(name = "xzqh") String xzqh) {
         QueryWrapper queryWrapper = new QueryWrapper<>();
@@ -1100,12 +1093,12 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
             queryWrapper.likeRight("XZQH", xzqh);
         }
         Map<String, Object> resultMap = new HashMap<>();
-        queryWrapper.select("sum(CAST(sjzytdmj AS DECIMAL(10,2))) as \"value\",SYQSYFS as \"name\"");
+        queryWrapper.select("ROUND(sum(SJZYTDMJ * 0.0015), 2) as \"value\",SYQSYFS as \"name\" ,syqsyfs_code");
         queryWrapper.groupBy("SYQSYFS");
+        queryWrapper.groupBy("syqsyfs_code");
         queryWrapper.likeRight("SYS_ORG_CODE", "A04");
+        queryWrapper.orderByDesc("syqsyfs_code");
         List list = qcSsgqzysytdqkGzvService.listMaps(queryWrapper);
-        //其它类放后面
-        Collections.reverse(list);
         return Result.OK(list);
     }
 
@@ -1115,19 +1108,54 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
      *
      * @return
      */
-    @ApiOperation(value = "统计-土地获取方式占比省直", notes = "统计-土地获取方式占比省直")
+    @ApiOperation(value = "统计(省直)-土地获取方式占比省直", notes = "统计-土地获取方式占比省直")
     @GetMapping(value = "/tdhqfssz")
     public Result<?> tdhqfssz(@RequestParam(name = "xzqh") String xzqh) {
+//        QueryWrapper queryWrapper = new QueryWrapper<>();
+//        if (StringUtils.isNotBlank(xzqh)) {
+//            queryWrapper.likeRight("XZQH", xzqh);
+//        }
+//        Map<String, Object> resultMap = new HashMap<>();
+//        queryWrapper.select("count(syqsyfs) as \"value\",SYQSYFS as \"name\"");
+//        queryWrapper.groupBy("SYQSYFS");
+//        queryWrapper.likeRight("SYS_ORG_CODE", "A03");
+//        List list = qcSsgqzysytdqkGzvService.listMaps(queryWrapper);
+//        Collections.reverse(list);
+//        return Result.OK(list);
+
+        QueryWrapper queryWrapper = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(xzqh)) {
+            queryWrapper.likeRight("XZQH", xzqh);
+        }
+        Map<String, Object> resultMap = new HashMap<>();
+        queryWrapper.select("count(syqsyfs) as \"value\",SYQSYFS as \"name\",syqsyfs_code");
+        queryWrapper.groupBy("SYQSYFS");
+        queryWrapper.groupBy("syqsyfs_code");
+        queryWrapper.likeRight("SYS_ORG_CODE", "A03");
+        queryWrapper.orderByDesc("syqsyfs_code");
+        List<Map<String, Object>> list = qcSsgqzysytdqkGzvService.listMaps(queryWrapper);
+        return Result.OK(list);
+    }
+
+    /**
+     * 统计-土地获取方式占比省直
+     *
+     * @return
+     */
+    @ApiOperation(value = "统计(省直)-土地获取方式占比省直", notes = "统计-土地获取方式占比省直")
+    @GetMapping(value = "/tdhqfsszArea")
+    public Result<?> tdhqfsszArea(@RequestParam(name = "xzqh") String xzqh) {
         QueryWrapper queryWrapper = new QueryWrapper<>();
         if (StringUtils.isNotBlank(xzqh)) {
             queryWrapper.likeRight("XZQH", xzqh);
         }
         Map<String, Object> resultMap = new HashMap<>();
-        queryWrapper.select("count(syqsyfs) as \"value\",SYQSYFS as \"name\"");
+        queryWrapper.select("ROUND(sum(SJZYTDMJ * 0.0015), 2) as \"value\",SYQSYFS as \"name\" ,syqsyfs_code");
         queryWrapper.groupBy("SYQSYFS");
+        queryWrapper.groupBy("syqsyfs_code");
         queryWrapper.likeRight("SYS_ORG_CODE", "A03");
+        queryWrapper.orderByDesc("syqsyfs_code");
         List list = qcSsgqzysytdqkGzvService.listMaps(queryWrapper);
-        Collections.reverse(list);
         return Result.OK(list);
     }
 
@@ -1149,7 +1177,48 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         queryWrapper.groupBy("zslx");
         queryWrapper.likeRight("SYS_ORG_CODE", "A03");
         List<HashMap<String, Object>> list = qcSsgqzysytdqkGzvService.listMaps(queryWrapper);
-        return getResult(sum, list);
+        return getResultSz(sum, list);
+    }
+
+    @NotNull
+    private Result<?> getResultSz(int sum, List<HashMap<String, Object>> list) {
+        int conut = 0;
+        HashMap<String, String> Maps = new HashMap<>();
+        HashMap<String, String> Map = new HashMap<>();
+        double yzmj = 0;
+        double wzmj = 0;
+        for (HashMap<String, Object> map : list) {
+            if (map.get("name").equals("无") || map.get("name").equals("无权属证明材料") || map.get("name").equals("文件合同等权属证明材料")) {
+                conut = conut + Integer.valueOf(map.get("value").toString());
+                wzmj = wzmj + Double.parseDouble(map.get("mj").toString());
+            } else {
+                sum = sum + Integer.valueOf(map.get("value").toString());
+                yzmj = yzmj + Double.parseDouble(map.get("mj").toString());
+            }
+        }
+        //数量
+        List<HashMap<String, String>> resultSum = new ArrayList<>();
+        List<HashMap<String, String>> resultArea = new ArrayList<>();
+        Map.put("name", "无证");
+        Map.put("value", String.valueOf(conut));
+        Maps.put("name", "有证");
+        Maps.put("value", String.valueOf(sum));
+        resultSum.add(Map);
+        resultSum.add(Maps);
+        //面积
+        HashMap<String, String> MapsRes = new HashMap<>();
+        HashMap<String, String> MapRes = new HashMap<>();
+        MapsRes.put("name", "无证");
+        MapsRes.put("value", String.valueOf(wzmj));
+        MapRes.put("name", "有证");
+        MapRes.put("value", String.valueOf(yzmj));
+        resultArea.add(MapsRes);
+        resultArea.add(MapRes);
+        //包装返回
+        Map result = new HashMap();
+        result.put("zySum", resultSum);
+        result.put("zyArea", resultArea);
+        return Result.OK(result);
     }
 
     @NotNull

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qyxx/mapper/xml/QcQyxxMapper.xml

@@ -299,6 +299,7 @@
                             where TDSYXZ = '闲置低效土地'
                               and SYS_ORG_CODE like 'A04%'
                             GROUP BY b.SJXZQHDM) d on c.xzqh = d.xzqh2
+                            order by c.xzqh
     </select>
     <select id="ssdkmjbyqx" resultType="java.util.HashMap">
         select VA as "value", NA as "name", VA2 as "value2", numb as "numb", numb2 as "numb2"
@@ -325,6 +326,7 @@
                               and SYS_ORG_CODE like 'A04%'
                               and xzqh like CONCAT(#{xzqh}, '%')
                             GROUP BY b.XJXZQHDM) d on c.xzqh = d.xzqh2
+                            order by c.xzqh
     </select>
     <select id="szdkmj" resultType="java.util.HashMap">
         select VA as "value", NA as "name", VA2 as "value2", numb as "numb", numb2 as "numb2"
@@ -343,6 +345,7 @@
                             where TDSYXZ = '闲置低效土地'
                               and SYS_ORG_CODE like 'A03%'
                             GROUP BY b.SJXZQHDM) d on c.xzqh = d.xzqh2
+                            order by c.xzqh
     </select>
     <select id="szdkmjByqx" resultType="java.util.HashMap">
         select VA as "value", NA as "name", VA2 as "value2", numb as "numb", numb2 as "numb2"
@@ -367,6 +370,7 @@
                               and SYS_ORG_CODE like 'A03%'
                               and xzqh like CONCAT(#{xzqh}, '%')
                             GROUP BY b.XJXZQHDM) d on c.xzqh = d.xzqh2
+                            order by c.xzqh
     </select>
     <!--一级单位用地亩-->
     <select id="yjdwhz" resultType="java.util.HashMap">