1. 修改积木报表

jeecg-boot-module-gis/src/main/java/org/jeecg/modules/commonQueryConfig/controller/CommonQueryConfigController.java

@@ -73,12 +73,12 @@ public class CommonQueryConfigController extends JeecgController<CommonQueryConf
     @Autowired
     private ITopicsConfigService topicsConfigService;
 
-    //TODO
     @GetMapping(value = "/queryListByUser")
     public Result<?> queryListByUser(@RequestParam("username") String username, @RequestParam("topicId") String topicId) {
         List<JSONObject> queryList = new ArrayList<>();
         LambdaQueryWrapper<Rescatalog> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(Rescatalog::getQueryable, "true");
+        queryWrapper.orderByAsc(Rescatalog::getCreateTime);
         List<Rescatalog> resCatalogs = rescatalogService.list(queryWrapper);
 
         if (resCatalogs.size() > 0) {
@@ -98,6 +98,7 @@ public class CommonQueryConfigController extends JeecgController<CommonQueryConf
                 if (resCount == 0) {
                     continue;
                 }
+                //查询类型是否是空
                 if (!querytypes.isEmpty() && querytypes.indexOf(res_id) == -1) {
                     continue;
                 }
@@ -489,29 +490,33 @@ public class CommonQueryConfigController extends JeecgController<CommonQueryConf
         return queryResult;
     }
 
+
+
     private QueryResult doCommonQuery(String queryType, String query, String queryInfo, Integer pageNo, Integer pageSize) throws SQLException {
         QueryResult queryResult = new QueryResult();
         List<QueryRecord> queryRecords = new ArrayList<>();
         Integer total = 0;
         LambdaQueryWrapper<CommonQueryConfig> configLambdaQueryWrapper = new LambdaQueryWrapper<>();
         configLambdaQueryWrapper.eq(CommonQueryConfig::getTablename, queryType).orderByAsc(CommonQueryConfig::getShoworder);
+        //查询出 common_query_config 表配置内容
         List<CommonQueryConfig> commonQueryConfigs = commonQueryConfigService.list(configLambdaQueryWrapper);
         if (commonQueryConfigs.size() > 0) {
+            //包装查询条件
             CommonQueryConfig temp = commonQueryConfigs.get(0);
-            String queryField = temp.getQfldname();
-            String reltablename = temp.getReltablename();
-            String otherfield = temp.getOtherfield();
-            String returnArea = temp.getReturnarea();
+            String reltablename = temp.getReltablename();  //重定向表
+            String otherfield = temp.getOtherfield();      //其它字段信息,当前没有
+            //String returnArea = temp.getReturnarea();    //暂时无用
+            //String queryField = temp.getQfldname();      //暂时无用
             HashMap<String, Object> queryParams = new HashMap<>();
-            queryParams.put("tablename", queryType);
-            queryParams.put("queryfield", query);
-            queryParams.put("queryinfo", queryInfo);
-            queryParams.put("pageno", pageNo);
-            queryParams.put("pagesize", pageSize);
-
-            List<Map<String, Object>> queryList = new ArrayList<>();        //存储查询到的所有数据列表
+            queryParams.put("tablename", queryType);   //表名称
+            queryParams.put("queryfield", query);      //条件字段
+            queryParams.put("queryinfo", queryInfo);   //查询内容
+            queryParams.put("pageno", pageNo);         //页码数
+            queryParams.put("pagesize", pageSize);     //每页条数
+            //设置变量
+            List<Map<String, Object>> queryList = new ArrayList<>();               //存储查询到的所有数据列表
             List<Map<String, Object>> queryList_curPage = new ArrayList<>();       //存储查询到的当前页数据列表，然后在组装返回数据
-            System.out.println(queryType + " | " + reltablename);
+            //如果传入的表和重定向表一致,则直接返回
             if (queryType.equals(reltablename)) {
                 queryList = commonQueryConfigService.commonQuery(queryParams);
             } else {
@@ -521,12 +526,12 @@ public class CommonQueryConfigController extends JeecgController<CommonQueryConf
                 queryParams.put("fromfldname", fromfldname);
                 queryParams.put("tofldname", tofldname);
                 if (otherfield != null) {
+                    //当前没有otherfield
                     queryParams.put("otherfield", otherfield);
                     queryList = commonQueryConfigService.commonQuery3(queryParams);
                 } else {
-                    //todo
+                    //当前在用
                     queryList = commonQueryConfigService.commonQuery2(queryParams);
-                    log.info(queryList.toString());
                     total = commonQueryConfigService.count(queryParams);
                 }
             }
@@ -602,7 +607,6 @@ public class CommonQueryConfigController extends JeecgController<CommonQueryConf
                 }
             }
         }
-
         queryResult.setRecords(queryRecords);
         queryResult.setCurrent(pageNo);
         queryResult.setSize(pageSize);

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/gzvhb/controller/QcSsgqzysytdqkGzvController.java

@@ -107,9 +107,8 @@ public class QcSsgqzysytdqkGzvController extends JeecgController<QcSsgqzysytdqkG
 													   HttpServletRequest req) {
 		QueryWrapper<QcSsgqzysytdqkGzv> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
 		Page<QcSsgqzysytdqkGzv> page = new Page<QcSsgqzysytdqkGzv>(pageNo, pageSize);
-		List<Integer> sbzts = new ArrayList<>();
+		//todo:
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-		System.out.println(sysUser);
 		if ("gzw".equals(sysUser.getUsername())) {
 			queryWrapper.likeRight("sys_org_code", "A04");
 		}
@@ -139,17 +138,6 @@ public class QcSsgqzysytdqkGzvController extends JeecgController<QcSsgqzysytdqkG
 														   HttpServletRequest req) {
 		QueryWrapper<QcSsgqzysytdqkGzv> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
 		Page<QcSsgqzysytdqkGzv> page = new Page<QcSsgqzysytdqkGzv>(pageNo, pageSize);
-		List<Integer> sbzts = new ArrayList<>();
-		sbzts.add(1);
-		sbzts.add(2);
-		queryWrapper.in("sfsb", sbzts);
-		if (qcSsgqzysytdqk.getShzt() != null) {
-			queryWrapper.eq("shzt", qcSsgqzysytdqk.getShzt());
-		}
-		//实际用途
-//		if (qcSsgqzysytdqk.getSjyt() != null){
-//			queryWrapper.eq("sjyt",qcSsgqzysytdqk.getSjyt());
-//		}
 		queryWrapper.likeRight("sys_org_code", "A04");
 		IPage<QcSsgqzysytdqkGzv> pageList = qcSsgqzysytdqkGzvService.page(page, queryWrapper);
 		return Result.OK(pageList);
@@ -173,7 +161,6 @@ public class QcSsgqzysytdqkGzvController extends JeecgController<QcSsgqzysytdqkG
 														HttpServletRequest req) {
 		QueryWrapper<QcSsgqzysytdqkGzv> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
 		Page<QcSsgqzysytdqkGzv> page = new Page<QcSsgqzysytdqkGzv>(pageNo, pageSize);
-		queryWrapper.eq("sfsb", 4);
 		queryWrapper.likeRight("sys_org_code", "A04");
 		IPage<QcSsgqzysytdqkGzv> pageList = qcSsgqzysytdqkGzvService.page(page, queryWrapper);
 		return Result.OK(pageList);
@@ -198,17 +185,10 @@ public class QcSsgqzysytdqkGzvController extends JeecgController<QcSsgqzysytdqkG
 														HttpServletRequest req) {
 		QueryWrapper<QcSsgqzysytdqkGzv> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
 		Page<QcSsgqzysytdqkGzv> page = new Page<QcSsgqzysytdqkGzv>(pageNo, pageSize);
-		List<Integer> sbzts = new ArrayList<>();
-		sbzts.add(3);
-		sbzts.add(4);
-		queryWrapper.in("sfsb", sbzts);
 		queryWrapper.likeRight("sys_org_code", "A04");
 		if (year!=null){
 			queryWrapper.apply("TO_CHAR(create_time, 'YYYY') LIKE {0}", year + "%");
 		}
-		if (qcSsgqzysytdqk.getShzt() != null) {
-			queryWrapper.eq("shzt", qcSsgqzysytdqk.getShzt());
-		}
 		IPage<QcSsgqzysytdqkGzv> pageList = qcSsgqzysytdqkGzvService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
@@ -228,6 +208,7 @@ public class QcSsgqzysytdqkGzvController extends JeecgController<QcSsgqzysytdqkG
 															@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
 															@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
 															HttpServletRequest req) {
+		qcSsgqzysytdqk.setSfsb(null);
 		QueryWrapper<QcSsgqzysytdqkGzv> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
 		queryWrapper.likeRight("sys_org_code", "A04");
 		if (year!=null){
@@ -919,6 +900,8 @@ public class QcSsgqzysytdqkGzvController extends JeecgController<QcSsgqzysytdqkG
 																@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
 																@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
 																HttpServletRequest req) {
+		qcSsgqzysytdqk.setSfsb(null);
+		qcSsgqzysytdqk.setShzt(null);
 		QueryWrapper<QcSsgqzysytdqkGzv> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
 		queryWrapper.likeRight("sys_org_code", "A03");
 		queryWrapper.gt("sfsb", 0);

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

@@ -287,5 +287,4 @@ public class QcSsgqzysytdqkGzvServiceImpl extends ServiceImpl<QcSsgqzysytdqkGzvM
         result.add(sjytMap);
         return result;
     }
-
 }

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

@@ -1122,41 +1122,49 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
 //        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.select("count(syqsyfs) as \"value\",SYQSYFS as \"name\",syqsyfs_code,ROUND(sum(SJZYTDMJ * 0.0015), 2) as \"mj\"");
         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 Result.OK(tdhqfsRes(list));
     }
 
     /**
-     * 统计-土地获取方式占比省直
+     * 土地获取方式
      *
+     * @param 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);
+    private Map tdhqfsRes(List<Map<String, Object>> list) {
+        Map<String,Object> res=new HashMap();
+        //遍历结果
+        List<Map> listSize=new ArrayList<>();
+        List<Map> listArea=new ArrayList<>();
+        for (Map<String, Object> re : list) {
+            Map<String, Object> size = new LinkedHashMap<>();
+            Map<String, Object> area = new LinkedHashMap<>();
+            Object name = re.get("name");
+            Object value = re.get("value");
+            Object mj = re.get("mj");
+            //包装数量
+            size.put("name",name);
+            size.put("value",value);
+            listSize.add(size);
+            //包装面积
+            area.put("name",name);
+            area.put("value",mj);
+            listArea.add(area);
         }
-        Map<String, Object> resultMap = new HashMap<>();
-        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);
-        return Result.OK(list);
+        res.put("zySum", listSize);
+        res.put("zyArea", listArea);
+        return res;
     }
 
     /**

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

@@ -43,34 +43,29 @@
         select count(1) shzt
         from qc_ssgqzysytdqk_gzv
         where create_by = #{username}
-          and sfsb = 1
     </select>
     <select id="tgsh" resultType="String" parameterType="String">
         select count(1) shzt
         from qc_ssgqzysytdqk_gzv
         where shzt = '通过'
           and create_by = #{username}
-          and sfsb = 3
     </select>
     <select id="btgsh" resultType="String" parameterType="String">
         select count(1) shzt
         from qc_ssgqzysytdqk_gzv
         where shzt = '不通过'
           and create_by = #{username}
-          and sfsb = 3
     </select>
     <select id="tgshAdmin" resultType="String">
         select count(1) shzt
         from qc_ssgqzysytdqk_gzv
         where shzt = '通过'
-          and sfsb = 3
           and sys_org_code like 'A04%'
     </select>
     <select id="wshAdmin" resultType="String">
         select count(1) shzt
         from qc_ssgqzysytdqk_gzv
-        where sfsb = 1
-          and sys_org_code like 'A04%'
+        where  sys_org_code like 'A04%'
     </select>
     <select id="btgshAdmin" resultType="String">
         select count(1) shzt
@@ -244,10 +239,10 @@
         <if test="orgCode=='A03'">
             ROUND(sum(SJZYTDMJ*0.0015),2) as "value2"
         </if>
-        from QC_SSGQZYSYTDQK a
+        from qc_ssgqzysytdqk_gzv a
         right JOIN (select * from XZQH) b
         on a.xzqh=b.XJXZQHDM
-        where SYS_ORG_CODE like concat(#{orgCode}, '%') and xzqh like concat(#{xzqh}, '%') and sfsb=3
+        where SYS_ORG_CODE like concat(#{orgCode}, '%') and xzqh like concat(#{xzqh}, '%')
         GROUP BY b.XJXZQHDM, b.XJXZQHMC, b.sjxzqhdm ORDER BY b.XJXZQHDM DESC
     </select>
 
@@ -263,7 +258,7 @@
         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 concat(#{orgCode}, '%') and sfsb=3
+        where SYS_ORG_CODE like concat(#{orgCode}, '%')
         GROUP BY b.sjxzqhdm, b.SJXZQHMC ORDER BY b.sjxzqhdm
     </select>
     <select id="sjyttjss" resultType="java.util.HashMap">