地块表更新后的基本字段处理

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java

@@ -183,6 +183,9 @@ public class QueryGenerator {
 					if( (rule==null || QueryRuleEnum.EQ.equals(rule)) && "class java.lang.String".equals(type)) {
 						// 可以设置左右模糊或全模糊，因人而异
 						rule = QueryRuleEnum.LIKE;
+						if(name.equals("sjyt") || name.equals("pzyt")){
+							rule=QueryRuleEnum.EQ;
+						}
 					}
 					// add -end 添加判断为字符串时设为全模糊查询
 					addEasyQuery(queryWrapper, column, rule, value);

jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8088
+  port: 8080
   tomcat:
     max-swallow-size: -1
   error:

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

@@ -139,6 +139,10 @@ public class QcSsgqzysytdqkGzvController extends JeecgController<QcSsgqzysytdqkG
 		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);
@@ -869,10 +873,8 @@ public class QcSsgqzysytdqkGzvController extends JeecgController<QcSsgqzysytdqkG
 		//遍历这个数组，取出每个File对象
 		if (files != null) {
 			for (File f : files) {
-
 				//判断这个File是否是一个文件，是：
 				if (f.isFile() ) {
-
 					a = f.getParentFile().getName();
 //                    System.out.println(f.toString().substring(10));
 					if(a.equals(f.getParentFile().getName())&& !f.getParentFile().getName().equals("desktop.ini")){
@@ -881,7 +883,6 @@ public class QcSsgqzysytdqkGzvController extends JeecgController<QcSsgqzysytdqkG
 				} else {//否则就是一个目录，继续递归
 					//递归调用
 					printDirByRecursive(f, level,qcSsgqzysytdqks);
-
 				}
 			}
 			if(list.size()>0){
@@ -892,10 +893,8 @@ public class QcSsgqzysytdqkGzvController extends JeecgController<QcSsgqzysytdqkG
 						updateWrapper.eq("DKBH",a);
 						updateWrapper.set("IMAGES", StringUtils.join(list,","));
 						qcSsgqzysytdqkGzvService.update(null,updateWrapper);
-
 					}
 				}
-
 			}
 
 		}
@@ -934,8 +933,6 @@ public class QcSsgqzysytdqkGzvController extends JeecgController<QcSsgqzysytdqkG
 		if (year!=null){
 			queryWrapper.apply("TO_CHAR(create_time, 'YYYY') LIKE {0}", year + "%");
 		}
-		System.out.println("#############################>>>");
-		System.out.println(qcSsgqzysytdqk.toString());
 		ResultCount resultCount = qcSsgqzysytdqkGzvService.queryResultCount(queryWrapper);
 		if (resultCount==null){
 			resultCount = new ResultCount();

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/gzvhb/entity/QcSsgqzysytdqkGzv.java

@@ -140,15 +140,7 @@ public class QcSsgqzysytdqkGzv implements Serializable {
 	@Excel(name = "其中批准使用面积(㎡)", width = 15)
     @ApiModelProperty(value = "其中批准使用面积(㎡)")
     private java.lang.Double qzpzsymj;
-	/**证载批准用途代码*/
-	@Excel(name = "证载批准用途代码", width = 15)
-    @ApiModelProperty(value = "证载批准用途代码")
-    private String pzytCode;
-	/**批准用途*/
-	@Excel(name = "批准用途", width = 15)
-    @Dict(dicCode = "id", dictTable = "sys_category", dicText = "name")
-    @ApiModelProperty(value = "批准用途")
-    private String pzyt;
+
 	/**批准用途其它*/
 	@Excel(name = "批准用途其它", width = 15)
     @ApiModelProperty(value = "批准用途其它")
@@ -203,6 +195,15 @@ public class QcSsgqzysytdqkGzv implements Serializable {
 	@Excel(name = "政府规划用途是否与实际用途一致", width = 15)
     @ApiModelProperty(value = "政府规划用途是否与实际用途一致")
     private String zfghsfyz;
+    /**证载批准用途代码*/
+    @Excel(name = "证载批准用途代码", width = 15)
+    @ApiModelProperty(value = "证载批准用途代码")
+    private String pzytCode;
+    /**批准用途*/
+    @Excel(name = "批准用途", width = 15)
+    @Dict(dicCode = "id", dictTable = "sys_category", dicText = "name")
+    @ApiModelProperty(value = "批准用途")
+    private String pzyt;
 	/**实际用途编码*/
 	@Excel(name = "实际用途编码", width = 15)
     @ApiModelProperty(value = "实际用途编码")

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

@@ -68,6 +68,7 @@ public class QcSsgqzysytdqkGzvServiceImpl extends ServiceImpl<QcSsgqzysytdqkGzvM
     @Override
     public List<Map<String, Double>> sumList(List<QcSsgqzysytdqkGzv> list) {
         List<DictModel> xzqh = sysBaseAPI.getDictItems("xq");
+        //获取字典列表
         List<SysCategoryModel> sysCategoryModels = sysBaseAPI.queryAllSysCategory();
         Double num = Double.valueOf(0);
         List<Map<String, Double>> result = new ArrayList<>();
@@ -96,19 +97,19 @@ public class QcSsgqzysytdqkGzvServiceImpl extends ServiceImpl<QcSsgqzysytdqkGzvM
                 Collectors.groupingBy(QcSsgqzysytdqkGzv::getXzqh,
                         Collectors.summingDouble(s -> Optional.ofNullable(s.getSjsyjzmj()*0.0015).orElse(0.0))));
         result.add(xzqhByAreaCollect);
-
+        //土地使用现状编码
         Map<String, List<QcSsgqzysytdqkGzv>> syxzCollect = list.stream().collect(
                 Collectors.groupingBy((QcSsgqzysytdqkGzv::getTdsyxz)));
         for (String s : syxzCollect.keySet()) {
             syxzMap.put(s, (double) syxzCollect.get(s).size());
         }
         result.add(syxzMap);
-
+        //实际占用面积
         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, Long> wjlxCollect = list.stream().collect(
                 Collectors.groupingBy(QcSsgqzysytdqkGzv::getWjlx,
                         Collectors.counting())
@@ -117,7 +118,7 @@ public class QcSsgqzysytdqkGzvServiceImpl extends ServiceImpl<QcSsgqzysytdqkGzvM
             wjbhMap.put(s, (double) wjlxCollect.get(s));
         }
         result.add(wjbhMap);
-
+        //实际用途
         for (QcSsgqzysytdqkGzv qcSsgqzysytdqk : list) {
             for (SysCategoryModel sysCategoryModel : sysCategoryModels) {
                 if (qcSsgqzysytdqk.getSjyt().equals(sysCategoryModel.getId())) {
@@ -148,7 +149,7 @@ public class QcSsgqzysytdqkGzvServiceImpl extends ServiceImpl<QcSsgqzysytdqkGzvM
             map.put(s, (double) collect.get(s).size());
         }
         result.add(map);
-
+        //行政区划
         for (QcSsgqzysytdqkGzv qcSsgqzysytdqk : list) {
             String qh = qcSsgqzysytdqk.getXzqh().substring(0, 4);
             for (DictModel dictModel : xzqh) {
@@ -162,19 +163,19 @@ public class QcSsgqzysytdqkGzvServiceImpl extends ServiceImpl<QcSsgqzysytdqkGzvM
                 Collectors.groupingBy(QcSsgqzysytdqkGzv::getXzqh,
                         Collectors.summingDouble(s -> Optional.ofNullable(s.getSjsyjzmj()*0.0015).orElse(0.0))));
         result.add(xzqhByAreaCollect);
-
+        //土地使用方式
         Map<String, List<QcSsgqzysytdqkGzv>> syxzCollect = list.stream().collect(
                 Collectors.groupingBy((QcSsgqzysytdqkGzv::getTdsyxz)));
         for (String s : syxzCollect.keySet()) {
             syxzMap.put(s, (double) syxzCollect.get(s).size());
         }
         result.add(syxzMap);
-
+        //实际占用面积
         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, Long> wjlxCollect = list.stream().collect(
                 Collectors.groupingBy(QcSsgqzysytdqkGzv::getZslx,
                         Collectors.counting())
@@ -184,6 +185,7 @@ public class QcSsgqzysytdqkGzvServiceImpl extends ServiceImpl<QcSsgqzysytdqkGzvM
         }
         result.add(wjbhMap);
 
+        //批准用途
         for (QcSsgqzysytdqkGzv qcSsgqzysytdqk : list) {
             for (SysCategoryModel sysCategoryModel : sysCategoryModels) {
                 if (qcSsgqzysytdqk.getPzyt().equals(sysCategoryModel.getId())) {
@@ -191,6 +193,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());

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

@@ -1213,7 +1213,11 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
                 Map.put("name", "有证");
                 Map.put("value", map.get("value").toString());
                 result.add(Map);
-            } else {
+            } else if (map.get("name").equals("待核实")) {
+                Map.put("name", "待核实");
+                Map.put("value", map.get("value").toString());
+                result.add(Map);
+            }else{
                 sum = sum + Integer.valueOf(map.get("value").toString());
             }
         }

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

@@ -269,23 +269,11 @@
         <if test="orgCode=='A03'">
             ROUND(sum(SJZYTDMJ*0.0015),2) as "value2"
         </if>
-        from QC_SSGQZYSYTDQK a
+        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
         GROUP BY b.sjxzqhdm, b.SJXZQHMC ORDER BY b.sjxzqhdm DESC
-        <!--        select count(SUBSTR(a.xzqh, 0, 4)) as "value", b.SJXZQHMC as "name",-->
-        <!--        <if test="orgCode=='A04'">-->
-        <!--            sum(SJZYTDMJ_M) as "value2"-->
-        <!--        </if>-->
-        <!--        <if test="orgCode=='A03'">-->
-        <!--            sum(SJZYTDMJ*0.0015) as "value2"-->
-        <!--        </if>-->
-        <!--        from QC_SSGQZYSYTDQK a-->
-        <!--        LEFT JOIN (select DISTINCT SJXZQHDM, SJXZQHMC from XZQH) b-->
-        <!--        on SUBSTR(a.xzqh, 0, 4) = b.SJXZQHDM-->
-        <!--        where SYS_ORG_CODE like concat(#{orgCode}, '%') and sfsb=3-->
-        <!--        GROUP BY SUBSTR(a.xzqh, 0, 4), b.SJXZQHMC ORDER BY count(SUBSTR(a.xzqh, 0, 4)) DESC-->
     </select>
     <select id="sjyttjss" resultType="java.util.HashMap">
         select count(a.sjyt) as "value", b.name as "name", b.id as "code"