上报数修改

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/sbjk/TuseXzqhMapper.java

@@ -17,11 +17,8 @@ public interface TuseXzqhMapper extends BaseMapper<TusexzqhDTO> {
 
     Integer getAllVillageNumByPid(String pid);
 
-    Integer getAllVillageNumByUseId(@Param("useIds") List<String> useIds);
+    Integer getTownReportVillage(@Param("useIds") List<String> useIds);
 
-    // 上报到市
-//    Integer getTownReportNum(String pid);
-    // 未上报到省厅村
     List<String> getTownUnReportVillage(@Param("pid") String pid, @Param("useIds") List<String> useIds);
 
     Integer getTownReportAllNum(String pid);

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/sbjk/XzczghcgsbServiceImpl.java

@@ -248,7 +248,7 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
 
             treeAnalyse.setQxwsbczs(treeAnalyse.getYbaczs());//默认是全部数量
             if (townCountMap.containsKey(tusexzqhDTO.getCode())) {
-                Integer reportNum = tuseXzqhMapper.getAllVillageNumByUseId(townCountMap.get(tusexzqhDTO.getCode()));
+                Integer reportNum = tuseXzqhMapper.getTownReportVillage(townCountMap.get(tusexzqhDTO.getCode()));
                 treeAnalyse.setSbdstczs(reportNum);//上报到省厅村庄数
 
                 List<String> unReportVillages = tuseXzqhMapper.getTownUnReportVillage(tusexzqhDTO.getCode(),townCountMap.get(tusexzqhDTO.getCode()));
@@ -260,17 +260,17 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
                 Map<String, List<String>> nodeMap = townNodeMap.get(tusexzqhDTO.getCode());
                 if (nodeMap.containsKey("补正") || nodeMap.containsKey("文本审核")) {// 文本审核+补正
                     List<String> bzList = nodeMap.get("补正");
-                    Integer bzNum = tuseXzqhMapper.getAllVillageNumByUseId(bzList);
+                    Integer bzNum = tuseXzqhMapper.getTownReportVillage(bzList);
                     treeAnalyse.setWbscjd(bzNum);
                 }
                 if (nodeMap.containsKey("机审")) {
                     List<String> jsList = nodeMap.get("机审");
-                    Integer jsNum = tuseXzqhMapper.getAllVillageNumByUseId(jsList);
+                    Integer jsNum = tuseXzqhMapper.getTownReportVillage(jsList);
                     treeAnalyse.setSlsjbz(jsNum);
                 }
                 if (nodeMap.containsKey("用地审查")) {
                     List<String> ydscList = nodeMap.get("用地审查");
-                    Integer ydscNum = tuseXzqhMapper.getAllVillageNumByUseId(ydscList);
+                    Integer ydscNum = tuseXzqhMapper.getTownReportVillage(ydscList);
                     treeAnalyse.setYbas(ydscNum);
                 }
             }

onemap-modules/onemap-apply/src/main/resources/mapper/oracle/sbjk/TuseXzqhMapper.xml

@@ -30,24 +30,15 @@
         WHERE "pid" = #{pid}
     </select>
 
-    <select id="getAllVillageNumByUseId" resultType="java.lang.Integer">
+    <select id="getTownReportVillage" resultType="java.lang.Integer">
         SELECT COALESCE(COUNT(*), 0)
-        FROM T_USE_XZQH
+        FROM T_USE_XZQH_REPORT
         WHERE "use_id" IN
         <foreach collection="useIds" item="useId" open="(" separator="," close=")">
             #{useId}
         </foreach>
     </select>
 
-<!--    <select id="getTownReportNum" resultType="java.lang.Integer">-->
-<!--        SELECT COALESCE(COUNT(*), 0)-->
-<!--        FROM T_USE_XZQH-->
-<!--        WHERE "use_id" IN (SELECT DISTINCT XZQ_CODE-->
-<!--                           FROM T_XZCZGHCGSB-->
-<!--                           WHERE LENGTH(XZQ_CODE) = 12-->
-<!--                             AND "XZQ_CODE" LIKE #{pid} || '%')-->
-<!--    </select>-->
-
     <select id="getTownUnReportVillage" resultType="String">
         select "village"
         FROM T_USE_XZQH_REPORT