1. 修改山东各地市土地情况(增加数量)

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

@@ -58,6 +58,7 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
     private String upLoadPath;
     @Autowired
     private IQcSsgqzysytdqkGzvService qcSsgqzysytdqkGzvService;
+
     /**
      * 查询添加的年份列表,倒叙
      *
@@ -411,7 +412,7 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
             if (qc.getShzt().equals("通过")) {
                 qc.setSfsb(3);
                 String sjdwdm = qc.getSjdwdm();
-                System.out.println(sjdwdm);
+                //System.out.println(sjdwdm);
                 String org_code = qc.getSysOrgCode();
                 if (org_code.length() > 6) {
                     qcQyxxService.updatePid(sjdwdm, org_code);
@@ -606,19 +607,19 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         String sbdks = null;
         String yhjs = null;
         String sbdkmj = null;      //上报地块面积
-        XzdxVO xzdx=new XzdxVO();  //闲置低效
+        XzdxVO xzdx = new XzdxVO();  //闲置低效
         for (String s : rolesByUsername) {
             if (s.equals("shyh") || s.equals("gzw") || s.equals("xfzx") || s.equals("sjzh")) {
                 yhjs = "shyh";
                 sbdks = qcQyxxService.sbdksAdmin();
                 sbdkmj = qcQyxxService.sbdksMjAdmin();
-                xzdx=qcQyxxService.getXzdx("");
+                xzdx = qcQyxxService.getXzdx("");
                 break;
             } else {
                 yhjs = "sbyh";
                 sbdks = qcQyxxService.sbdks(username);
                 sbdkmj = qcQyxxService.sbdksMj(username);
-                xzdx=qcQyxxService.getXzdx(username);
+                xzdx = qcQyxxService.getXzdx(username);
             }
         }
         //企业数量、上报地块企业数、地块数量、地块面积、闲置地块数、闲置地块面积
@@ -629,8 +630,8 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         list.add(ChangeNumber.ChangeString(sbdkmj));   //上报地块面积
         list.add(xzdx.getXzdxNum());
         list.add(xzdx.getXzdxArea());
-        String message="下发任务数,有效登录数,上报地块数,用戶角色,省属上报面积,闲置地块数、闲置地块面积";
-        return Result.OK(message,list);
+        String message = "下发任务数,有效登录数,上报地块数,用戶角色,省属上报面积,闲置地块数、闲置地块面积";
+        return Result.OK(message, list);
     }
 
     /**
@@ -653,7 +654,7 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         String wsh = null;
         String szsbMj = null;
         String szwshMj = null;
-        XzdxVO xzdx=new XzdxVO();  //闲置低效
+        XzdxVO xzdx = new XzdxVO();  //闲置低效
         for (String s : rolesByUsername) {
             if (s.equals("shyh") || s.equals("gzw") || s.equals("xfzx") || s.equals("sjzh")) {
                 yhjs = "shyh";
@@ -661,7 +662,7 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
                 //wsh = qcQyxxService.sydwwshAdmin();
                 szsbMj = qcQyxxService.sydwwshAdminMj();
                 //szwshMj = qcQyxxService.sydwwshAdminWshMj();
-                xzdx=qcQyxxService.getXzdxSz();
+                xzdx = qcQyxxService.getXzdxSz();
                 break;
             }
         }
@@ -675,8 +676,8 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         //list.add(ChangeNumber.ChangeString(szwshMj));//省直未审核面积
         list.add(xzdx.getXzdxNum());
         list.add(xzdx.getXzdxArea());
-        String message="下发任务数,有效登录数,上报地块数,用戶角色,省直上报面积,闲置地块数、闲置地块面积";
-        return Result.OK(message,list);
+        String message = "下发任务数,有效登录数,上报地块数,用戶角色,省直上报面积,闲置地块数、闲置地块面积";
+        return Result.OK(message, list);
     }
 
     /**
@@ -822,11 +823,11 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
 
     /**
      * 首页-未审核数量
-     *  0-未上报
-     *  1-已上报待审核
-     *  2-审核中
-     *  3-已审核
-     *  4-错误退回
+     * 0-未上报
+     * 1-已上报待审核
+     * 2-审核中
+     * 3-已审核
+     * 4-错误退回
      */
     //@AutoLog(value = "首页-未审核数量")
     @ApiOperation(value = "首页-省属未审核数量", notes = "首页-省属未审核数量")
@@ -1061,8 +1062,6 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
     @ApiOperation(value = "统计-上报地块面积", notes = "统计-上报地块面积")
     @GetMapping(value = "/xzqhtj")
     public Result<?> xzqhtj() {
-
-
         return Result.OK("null");
     }
 
@@ -1083,7 +1082,6 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         queryWrapper.select("count(syqsyfs) as \"value\",SYQSYFS as \"name\"");
         queryWrapper.groupBy("SYQSYFS");
         queryWrapper.likeRight("SYS_ORG_CODE", "A04");
-        queryWrapper.eq("SFSB", 3);
         List list = qcSsgqzysytdqkGzvService.listMaps(queryWrapper);
         Collections.reverse(list);
         return Result.OK(list);
@@ -1105,7 +1103,6 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         queryWrapper.select("sum(CAST(sjzytdmj AS DECIMAL(10,2))) as \"value\",SYQSYFS as \"name\"");
         queryWrapper.groupBy("SYQSYFS");
         queryWrapper.likeRight("SYS_ORG_CODE", "A04");
-        queryWrapper.eq("SFSB", 3);
         List list = qcSsgqzysytdqkGzvService.listMaps(queryWrapper);
         //其它类放后面
         Collections.reverse(list);
@@ -1129,7 +1126,6 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         queryWrapper.select("count(syqsyfs) as \"value\",SYQSYFS as \"name\"");
         queryWrapper.groupBy("SYQSYFS");
         queryWrapper.likeRight("SYS_ORG_CODE", "A03");
-        queryWrapper.gt("SFSB", 1);
         List list = qcSsgqzysytdqkGzvService.listMaps(queryWrapper);
         Collections.reverse(list);
         return Result.OK(list);
@@ -1149,8 +1145,7 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         }
         Map<String, Object> resultMap = new HashMap<>();
         int sum = 0;
-        queryWrapper.select("count(zslx) as \"value\",ZSLX as \"name\"");
-        //queryWrapper.gt("SFSB", 1);
+        queryWrapper.select("count(zslx) as \"value\",ZSLX as \"name\" ,ROUND(SUM(sjzytdmj)*0.0015, 2) AS \"mj\"");
         queryWrapper.groupBy("zslx");
         queryWrapper.likeRight("SYS_ORG_CODE", "A03");
         List<HashMap<String, Object>> list = qcSsgqzysytdqkGzvService.listMaps(queryWrapper);
@@ -1163,18 +1158,24 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         List<HashMap<String, String>> result = new ArrayList<>();
         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());
             }
         }
         Map.put("name", "无证");
         Map.put("value", String.valueOf(conut));
+        Map.put("mj", String.valueOf(wzmj));
         Maps.put("name", "有证");
         Maps.put("value", String.valueOf(sum));
+        Maps.put("mj", String.valueOf(yzmj));
         result.add(Maps);
         result.add(Map);
         return Result.OK(result);
@@ -1194,12 +1195,38 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         }
         Map<String, Object> resultMap = new HashMap<>();
         int sum = 0;
-        queryWrapper.select("count(TDSYXZ) as \"value\",TDSYXZ as \"name\"");
-        queryWrapper.eq("SFSB", 3);
+        queryWrapper.select("count(TDSYXZ) as \"value\",TDSYXZ as \"name\" ,ROUND(SUM(sjzytdmj)*0.0015, 2) AS \"mj\"");
         queryWrapper.groupBy("TDSYXZ");
         queryWrapper.likeRight("SYS_ORG_CODE", "A04");
         List<HashMap<String, Object>> list = qcSsgqzysytdqkGzvService.listMaps(queryWrapper);
-        return Result.OK(list);
+        return Result.OK(changeTdsyxzzb(list));
+    }
+
+    /**
+     * 处理统计-土地使用现状占比
+     *
+     * @param list
+     * @return
+     */
+    public Map changeTdsyxzzb(List<HashMap<String, Object>> list) {
+        List sumList = new ArrayList();
+        List areaList = new ArrayList();
+        for (HashMap<String, Object> item : list) {
+            String name = (String) item.get("name");
+            Map<String, Object> sum = new HashMap<>();
+            sum.put("name", name);
+            sum.put("value", item.get("value"));
+            sumList.add(sum);
+
+            Map<String, Object> area = new HashMap<>();
+            area.put("name", name);
+            area.put("value", item.get("mj"));
+            areaList.add(area);
+        }
+        Map<String, List<Map<String, Object>>> result = new HashMap<>();
+        result.put("zySum", sumList);
+        result.put("zyArea", areaList);
+        return result;
     }
 
     /**
@@ -1215,10 +1242,9 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
             queryWrapper.likeRight("XZQH", xzqh);
         }
         Map<String, Object> resultMap = new HashMap<>();
-        queryWrapper.select("count(wjlx) as \"value\",wjlx as \"name\"");
+        queryWrapper.select("count(wjlx) as \"value\",wjlx as \"name\" ,ROUND(SUM(sjzytdmj)*0.0015, 2) AS \"mj\"");
         queryWrapper.groupBy("wjlx");
         queryWrapper.likeRight("SYS_ORG_CODE", "A04");
-//        queryWrapper.eq("SFSB", 3);
         List<HashMap<String, Object>> list = qcSsgqzysytdqkGzvService.listMaps(queryWrapper);
         int sum = 0;
         return getResult2(sum, list);
@@ -1226,26 +1252,43 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
 
     @NotNull
     private Result<?> getResult2(int sum, List<HashMap<String, Object>> list) {
+        Map<String, Object> resMap = new HashMap<>();
         List<HashMap<String, String>> result = new ArrayList<>();
+        List<HashMap<String, String>> resultArea = new ArrayList<>();
         HashMap<String, String> Maps = new HashMap<>();
+        HashMap<String, String> MapsArea = new HashMap<>();
+        double mj = 0;
         for (HashMap<String, Object> map : list) {
             HashMap<String, String> Map = new HashMap<>();
+            HashMap<String, String> MapArea = new HashMap<>();
             if (map.get("name").equals("证书")) {
                 Map.put("name", "有证");
+                MapArea.put("name", "有证");
                 Map.put("value", map.get("value").toString());
+                MapArea.put("value", map.get("mj").toString());
                 result.add(Map);
+                resultArea.add(MapArea);
             } else if (map.get("name").equals("待核实")) {
                 Map.put("name", "待核实");
+                MapArea.put("name", "待核实");
                 Map.put("value", map.get("value").toString());
+                MapArea.put("value", map.get("mj").toString());
                 result.add(Map);
-            }else{
+                resultArea.add(MapArea);
+            } else {
                 sum = sum + Integer.valueOf(map.get("value").toString());
+                mj = mj + Double.parseDouble(map.get("mj").toString());
             }
         }
         Maps.put("name", "无证");
         Maps.put("value", String.valueOf(sum));
         result.add(Maps);
-        return Result.OK(result);
+        MapsArea.put("name", "无证");
+        MapsArea.put("value", String.valueOf(mj));
+        resultArea.add(MapsArea);
+        resMap.put("num", result);
+        resMap.put("area", resultArea);
+        return Result.OK(resMap);
     }
 
     /**
@@ -1258,7 +1301,7 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
     public Result<?> sjyttjsz(@RequestParam(name = "xzqh") String xzqh) {
         List<HashMap<String, Object>> list = qcQyxxService.sjyttjsz(xzqh);
         Collections.reverse(list);
-        return getResult(list);
+        return getResultSS(list);
     }
 
     /**
@@ -1282,11 +1325,11 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         for (HashMap<String, Object> map : list) {
             names.add(map.get("name"));
             values.add(map.get("value"));
-            codes.add(map.get("code"));
+            codes.add(map.get("number"));
         }
         res.put("name", names);
         res.put("value", values);
-        res.put("code", codes);
+        res.put("num", codes);
         return Result.OK(res);
     }
 
@@ -1299,9 +1342,35 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
     @GetMapping(value = "/sjyttjss")
     public Result<?> sjyttjss(@RequestParam(name = "xzqh") String xzqh) {
         List<HashMap<String, Object>> list = qcQyxxService.sjyttjss(xzqh);
-        return getResult(list);
+        Collections.reverse(list);
+        return getResultSS(list);
     }
 
+    @NotNull
+    private Result<?> getResultSS(List<HashMap<String, Object>> list) {
+        List names = new ArrayList<>();
+        List values = new ArrayList<>();
+        List codes = new ArrayList<>();
+        List mj = new ArrayList<>();
+        Map<String, Object> res = new HashMap<>();
+        Map<String, Object> resMj = new HashMap<>();
+        for (HashMap<String, Object> map : list) {
+            names.add(map.get("name"));
+            values.add(map.get("value"));
+            codes.add(map.get("code"));
+            mj.add(map.get("mj"));
+        }
+        res.put("name", names);
+        res.put("value", values);
+        resMj.put("name", names);
+        resMj.put("value", mj);
+        Map resMap = new HashMap();
+        resMap.put("zyNum", res);
+        resMap.put("zyArea", resMj);
+        return Result.OK(resMap);
+    }
+
+
     /**
      * 统计-省直地图统计
      *
@@ -1372,15 +1441,21 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         List names = new ArrayList<>();
         List values = new ArrayList<>();
         List values2 = new ArrayList<>();
+        List numb = new ArrayList<>();
+        List numb2 = new ArrayList<>();
         Map<String, Object> res = new HashMap<>();
         for (HashMap<String, Object> map : ssdkmj) {
             names.add(map.get("name"));
             values.add(map.get("value"));
             values2.add(map.get("value2"));
+            numb.add(map.get("numb"));
+            numb2.add(map.get("numb2"));
         }
         res.put("name", names);
         res.put("value", values);
         res.put("value2", values2);
+        res.put("numb", numb);
+        res.put("numb2", numb2);
         return Result.OK(res);
     }
 

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

@@ -22,7 +22,7 @@
     </select>
     <!--    上报地块面积-->
     <select id="sbdksMjAdmin" resultType="java.lang.String">
-        select ROUND(sum(sjzytdmj*0.0015) ,2) as sjmj
+        select ROUND(sum(sjzytdmj * 0.0015), 2) as sjmj
         from qc_ssgqzysytdqk_gzv
         where sys_org_code like 'A04%'
     </select>
@@ -34,7 +34,7 @@
     </select>
     <!--  面积-->
     <select id="sbdksMj" resultType="java.lang.String">
-        select ROUND(sum(sjzytdmj*0.0015),2) as sjmj
+        select ROUND(sum(sjzytdmj * 0.0015), 2) as sjmj
         from qc_ssgqzysytdqk_gzv
         where create_by = #{username}
     </select>
@@ -93,28 +93,28 @@
     </select>
     <!--    审核通过-->
     <select id="shmj" resultType="java.lang.String">
-        select ROUND(sum(sjzytdmj),2) as sjmj
+        select ROUND(sum(sjzytdmj), 2) as sjmj
         from qc_ssgqzysytdqk_gzv
         where shzt = '通过'
           and create_by = #{username}
     </select>
     <!--    审核不通过-->
     <select id="shmjNot" resultType="java.lang.String">
-        select ROUND(sum(sjzytdmj),2) as sjmj
+        select ROUND(sum(sjzytdmj), 2) as sjmj
         from qc_ssgqzysytdqk_gzv
         where shzt = '不通过'
           and create_by = #{username}
     </select>
-<!--    已审核-->
+    <!--    已审核-->
     <select id="wshsl" resultType="String" parameterType="String">
         select count(1) sbdk
         from qc_ssgqzysytdqk_gzv
         where create_by = #{username}
           and sfsb in (1)
     </select>
-<!--  未审核  -->
+    <!--  未审核  -->
     <select id="wshslMJ" resultType="java.lang.String">
-        select ROUND(sum(sjzytdmj*0.0015),2)as sjmj
+        select ROUND(sum(sjzytdmj * 0.0015), 2) as sjmj
         from qc_ssgqzysytdqk_gzv
         where create_by = #{username}
           and sfsb in (1)
@@ -124,13 +124,13 @@
     <select id="wshslAdmin" resultType="String" parameterType="String">
         select count(1) sbdk
         from qc_ssgqzysytdqk_gzv
-        where sfsb in (1,2)
+        where sfsb in (1, 2)
           and sys_org_code like 'A04%'
     </select>
     <select id="wshslAdminMJ" resultType="java.lang.String">
-        select ROUND(sum(sjzytdmj*0.0015),2) AS mj
+        select ROUND(sum(sjzytdmj * 0.0015), 2) AS mj
         from qc_ssgqzysytdqk_gzv
-        where sfsb in(1,2)
+        where sfsb in (1, 2)
           and sys_org_code like 'A04%'
     </select>
 
@@ -185,15 +185,15 @@
     </select>
     <!--省直上报面积-->
     <select id="sydwsbdksAdminMj" resultType="java.lang.String">
-        select ROUND(sum(sjzytdmj*0.0015) ,2)as sjmj
+        select ROUND(sum(sjzytdmj * 0.0015), 2) as sjmj
         from qc_ssgqzysytdqk_gzv
         where sys_org_code like 'A03%'
     </select>
 
     <select id="sydwwshAdminWshMj" resultType="java.lang.String">
-        select ROUND(sum(sjzytdmj*0.0015),2) as sjmj
+        select ROUND(sum(sjzytdmj * 0.0015), 2) as sjmj
         from qc_ssgqzysytdqk_gzv
-        where shzt='未审核'
+        where shzt = '未审核'
           and sys_org_code like 'A03%'
     </select>
 
@@ -226,7 +226,7 @@
 
 
     <select id="sjyttjsz" resultType="java.util.HashMap">
-        select count(a.pzyt) as "value", b.name as "name",b.id as "code"
+        select count(a.pzyt) as "value", b.name as "name",b.id as "code",ROUND(sum(SJZYTDMJ * 0.0015), 2) as "mj"
         from qc_ssgqzysytdqk_gzv a
         LEFT JOIN SYS_CATEGORY b
         on a.pzyt = b.id
@@ -264,112 +264,117 @@
         LEFT JOIN (select DISTINCT SJXZQHDM, SJXZQHMC from XZQH) b
         on a.xzqh like b.SJXZQHDM||'%'
         where SYS_ORG_CODE like concat(#{orgCode}, '%') and sfsb=3
-        GROUP BY b.sjxzqhdm, b.SJXZQHMC ORDER BY b.sjxzqhdm DESC
+        GROUP BY b.sjxzqhdm, b.SJXZQHMC ORDER BY b.sjxzqhdm
     </select>
     <select id="sjyttjss" resultType="java.util.HashMap">
-        select count(a.sjyt) as "value", b.name as "name", b.id as "code"
+        select count(a.sjyt) as "value", b.name as "name", b.id as "code",ROUND(sum(SJZYTDMJ * 0.0015), 2) as "mj"
         from qc_ssgqzysytdqk_gzv a
         LEFT JOIN SYS_CATEGORY b
         on a.sjyt = b.id
         where a.SYS_ORG_CODE like 'A04%'
-        and sfsb = 3
         <if test="xzqh !=null">
             and xzqh like CONCAT( #{xzqh},'%')
         </if>
         GROUP BY b.name, b.id
     </select>
     <select id="ssdkmj" resultType="java.util.HashMap">
-        select VA as "value", NA as "name", VA2 as "value2"
+        select VA as "value", NA as "name", VA2 as "value2", numb as "numb", numb2 as "numb2"
         from (
-                 select ROUND(sum(CAST(sjzytdmj AS DECIMAL(16, 2))*0.0015), 2) VA, b.SJXZQHMC na, b.SJXZQHDM xzqh
+                 select ROUND(sum(CAST(sjzytdmj AS DECIMAL(16, 2)) * 0.0015), 2) VA,
+                        b.SJXZQHMC                                               na,
+                        b.SJXZQHDM                                               xzqh,
+                        count(*) as                                              numb
                  from qc_ssgqzysytdqk_gzv a
                           LEFT JOIN (select DISTINCT SJXZQHDM, SJXZQHMC from XZQH) b
                                     on a.xzqh like b.SJXZQHDM || '%'
                  where SYS_ORG_CODE like 'A04%'
-                   and sfsb = 3
                  GROUP BY b.SJXZQHDM, b.SJXZQHMC
              ) c
-                 LEFT JOIN (select ROUND(sum(CAST(sjzytdmj AS DECIMAL(16, 2))*0.0015), 2) VA2, b.SJXZQHDM as xzqh2
+                 LEFT JOIN (select ROUND(sum(CAST(sjzytdmj AS DECIMAL(16, 2)) * 0.0015), 2) VA2,
+                                   b.SJXZQHDM as                                            xzqh2,
+                                   count(*)   as                                            numb2
                             from qc_ssgqzysytdqk_gzv a
                                      LEFT JOIN (select DISTINCT SJXZQHDM, SJXZQHMC from XZQH) b
                                                on a.xzqh like b.SJXZQHDM || '%'
                             where TDSYXZ = '闲置低效土地'
                               and SYS_ORG_CODE like 'A04%'
-
-                              and sfsb = 3
                             GROUP BY b.SJXZQHDM) d on c.xzqh = d.xzqh2
     </select>
     <select id="ssdkmjbyqx" resultType="java.util.HashMap">
-        select VA as "value", NA as "name", VA2 as "value2"
+        select VA as "value", NA as "name", VA2 as "value2", numb as "numb", numb2 as "numb2"
         from (
-                 select ROUND(sum(CAST(sjzytdmj AS DECIMAL(16, 2))*0.0015),2) VA, b.XJXZQHMC na, b.XJXZQHDM xzqh, b.SJXZQHDM
+                 select ROUND(sum(CAST(sjzytdmj AS DECIMAL(16, 2)) * 0.0015), 2) VA,
+                        b.XJXZQHMC                                               na,
+                        b.XJXZQHDM                                               xzqh,
+                        b.SJXZQHDM,
+                        count(*) as                                              numb
                  from qc_ssgqzysytdqk_gzv a
                           LEFT JOIN (select * from XZQH) b
                                     on a.xzqh = b.XJXZQHDM
                  where SYS_ORG_CODE like 'A04%'
-                   and sfsb = 3
                    and xzqh like CONCAT(#{xzqh}, '%')
                  GROUP BY b.XJXZQHDM, b.XJXZQHMC, b.SJXZQHDM
              ) c
-                 LEFT JOIN (select ROUND(sum(CAST(sjzytdmj AS DECIMAL(16, 2))*0.0015),2) VA2, b.XJXZQHDM as xzqh2
+                 LEFT JOIN (select ROUND(sum(CAST(sjzytdmj AS DECIMAL(16, 2)) * 0.0015), 2) VA2,
+                                   b.XJXZQHDM as                                            xzqh2,
+                                   count(*)   as                                            numb2
                             from qc_ssgqzysytdqk_gzv a
                                      LEFT JOIN (select * from XZQH) b
                                                on a.xzqh = b.XJXZQHDM
                             where TDSYXZ = '闲置低效土地'
                               and SYS_ORG_CODE like 'A04%'
-                              and sfsb = 3
                               and xzqh like CONCAT(#{xzqh}, '%')
-
                             GROUP BY b.XJXZQHDM) d on c.xzqh = d.xzqh2
     </select>
     <select id="szdkmj" resultType="java.util.HashMap">
-        select VA as "value", NA as "name", VA2 as "value2"
+        select VA as "value", NA as "name", VA2 as "value2", numb as "numb", numb2 as "numb2"
         from (
-                 select ROUND(sum(SJZYTDMJ * 0.0015), 2) VA, b.SJXZQHMC na, b.SJXZQHDM xzqh
+                 select ROUND(sum(SJZYTDMJ * 0.0015), 2) VA, b.SJXZQHMC na, b.SJXZQHDM xzqh, count(*) as numb
                  from qc_ssgqzysytdqk_gzv a
                           LEFT JOIN (select DISTINCT SJXZQHDM, SJXZQHMC from XZQH) b
                                     on a.xzqh like b.SJXZQHDM || '%'
                  where SYS_ORG_CODE like 'A03%'
-                   and sfsb = 3
                  GROUP BY b.SJXZQHDM, b.SJXZQHMC
              ) c
-                 LEFT JOIN (select ROUND(sum(SJZYTDMJ * 0.0015), 2) VA2, b.SJXZQHDM as xzqh2
+                 LEFT JOIN (select ROUND(sum(SJZYTDMJ * 0.0015), 2) VA2, b.SJXZQHDM as xzqh2, count(*) as numb2
                             from qc_ssgqzysytdqk_gzv a
                                      LEFT JOIN (select DISTINCT SJXZQHDM, SJXZQHMC from XZQH) b
                                                on a.xzqh like b.SJXZQHDM || '%'
                             where TDSYXZ = '闲置低效土地'
                               and SYS_ORG_CODE like 'A03%'
-                              and sfsb = 3
                             GROUP BY b.SJXZQHDM) d on c.xzqh = d.xzqh2
     </select>
     <select id="szdkmjByqx" resultType="java.util.HashMap">
-        select VA as "value", NA as "name", VA2 as "value2"
+        select VA as "value", NA as "name", VA2 as "value2", numb as "numb", numb2 as "numb2"
         from (
-                 select ROUND(sum(SJZYTDMJ * 0.0015), 2) VA, b.XJXZQHMC na, b.XJXZQHDM xzqh, b.SJXZQHDM
+                 select ROUND(sum(SJZYTDMJ * 0.0015), 2) VA,
+                        b.XJXZQHMC                       na,
+                        b.XJXZQHDM                       xzqh,
+                        b.SJXZQHDM,
+                        count(*) as                      numb
                  from qc_ssgqzysytdqk_gzv a
                           RIGHT JOIN (select * from XZQH) b
                                      on a.xzqh = b.XJXZQHDM
                  where SYS_ORG_CODE like 'A03%'
-                   and sfsb = 3
                    and xzqh like CONCAT(#{xzqh}, '%')
                  GROUP BY b.XJXZQHDM, b.XJXZQHMC, b.SJXZQHDM
              ) c
-                 LEFT JOIN (select ROUND(sum(SJZYTDMJ * 0.0015), 2) VA2, b.XJXZQHDM as xzqh2
+                 LEFT JOIN (select ROUND(sum(SJZYTDMJ * 0.0015), 2) VA2, b.XJXZQHDM as xzqh2, count(*) as numb2
                             from qc_ssgqzysytdqk_gzv a
                                      RIGHT JOIN (select * from XZQH) b
                                                 on a.xzqh = b.XJXZQHDM
                             where TDSYXZ = '闲置低效土地'
                               and SYS_ORG_CODE like 'A03%'
-                              and sfsb = 3
                               and xzqh like CONCAT(#{xzqh}, '%')
                             GROUP BY b.XJXZQHDM) d on c.xzqh = d.xzqh2
     </select>
-<!--一级单位用地亩-->
+    <!--一级单位用地亩-->
     <select id="yjdwhz" resultType="java.util.HashMap">
-        select a.depart_name as "name", ROUND(sum(b.area), 2) as "value"
+        select a.depart_name as "name", ROUND(sum(b.area), 2) as "value",sum(b.couts) as "number"
         from (select id, depart_name, org_code from sys_depart where org_type = '2' and org_code like 'A04%') a
         LEFT JOIN (
-        select ROUND(sum(CAST(sjzytdmj AS DECIMAL(16,2)))*0.0015,2) as area, sys_ORG_CODE as orgcode
+        select ROUND(sum(CAST(sjzytdmj AS DECIMAL(16,2)))*0.0015,2) as area, sys_ORG_CODE as orgcode,
+        count(*) as couts
         FROM qc_ssgqzysytdqk_gzv
         where sys_ORG_CODE like 'A04A%'
         <if test="xzqh !=null">
@@ -377,12 +382,10 @@
         </if>
         GROUP BY SYS_ORG_CODE) b on b.orgcode like a.org_code || '%'
         GROUP BY a.depart_name
-
     </select>
     <!--查询入库的年份-->
     <select id="queryYears" resultType="java.lang.String">
-        SELECT
-            TO_CHAR( create_time, 'YYYY' ) AS YEAR
+        SELECT TO_CHAR(create_time, 'YYYY') AS YEAR
         FROM
             qc_ssgqzysytdqk_gzv
         GROUP BY
@@ -399,11 +402,15 @@
         </if>
     </select>
     <select id="getXzdxSz" resultType="org.jeecg.modules.zrzyqc.qyxx.entity.XzdxVO">
-        select count(*) as xzdxNum, round(sum(sjzytdmj)* 0.0015,2) as xzdxArea
+        select count(*) as xzdxNum, round(sum(sjzytdmj) * 0.0015, 2) as xzdxArea
         from qc_ssgqzysytdqk_gzv
-        where tdsyxz='闲置低效土地' and sys_org_code like 'A03%'
+        where tdsyxz = '闲置低效土地'
+          and sys_org_code like 'A03%'
     </select>
     <select id="getFirstOrgNames" resultType="java.util.Map">
-        select sys_org_code AS key,qymc AS value from qc_qyxx where org_type='2' and sys_org_code like 'A04%' GROUP BY key,value
+        select sys_org_code AS key,qymc AS value
+        from qc_qyxx
+        where org_type='2' and sys_org_code like 'A04%'
+        GROUP BY key, value
     </select>
 </mapper>

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qyxx/service/impl/QcQyxxServiceImpl.java

@@ -246,7 +246,8 @@ public class QcQyxxServiceImpl extends ServiceImpl<QcQyxxMapper, QcQyxx> impleme
 
     @Override
     public List<HashMap<String, Object>> yjdwhz(String xzqh) {
-        return qcQyxxMapper.yjdwhz(xzqh);
+        List<HashMap<String, Object>> yjdwhz = qcQyxxMapper.yjdwhz(xzqh);
+        return yjdwhz;
     }
 
     @Override