修改数量

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/res/TreeAnalyse.java

@@ -11,14 +11,14 @@ public class TreeAnalyse {
     int level; //层级
     String xzqh; //行政区划
     int xzczs; //行政村总数
-    int qxysbczs; //旗县已上报的村庄数
+//    int qxysbczs; //旗县已上报的村庄数
     int ybaczs; //应备案村庄数
     int sbdstczs; //上报到省厅村庄数
     int wbscjd; //文本审查节点(补正)
     int slsjbz; //矢量数据审查节点(机审)
     int ybas; //已备案数(用地审查节点)
     String bal; //备案率(%)(已备案数行政村总数)
-    int qxwsbczs;//旗县未上报的村庄数
+    int qxwsbczs;//旗县未上报的村庄数到省厅
     List<String> wsbczs = new ArrayList<>(); //未上报村庄
 
     List<TreeAnalyse> children;

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

@@ -19,10 +19,10 @@ public interface TuseXzqhMapper extends BaseMapper<TusexzqhDTO> {
 
     Integer getAllVillageNumByUseId(@Param("useIds") List<String> useIds);
 
-    // 上报数
-    Integer getTownReportNum(String pid);
-    // 未上报村
-    List<String> getTownUnReportVillage(String pid);
+    // 上报到市
+//    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

@@ -233,8 +233,12 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
         //组织乡镇数据
         List<TreeAnalyse> townTreeList = new ArrayList<>();
         for (TusexzqhDTO tusexzqhDTO : townList) {
+            if(tusexzqhDTO.getTownship().contains("魏家")){
+                System.out.println("魏家");
+            }
+
             Integer villageNum = tuseXzqhMapper.getAllVillageNumByPid(tusexzqhDTO.getCode());
-            Integer townReportNum = tuseXzqhMapper.getTownReportNum(tusexzqhDTO.getCode());//上报数
+//            Integer townReportNum = tuseXzqhMapper.getTownReportNum(tusexzqhDTO.getCode());//上报数
             Integer townReportAllNum = tuseXzqhMapper.getTownReportAllNum(tusexzqhDTO.getCode());//颖备案数
 
             TreeAnalyse treeAnalyse = new TreeAnalyse();
@@ -242,12 +246,17 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
             treeAnalyse.setId(tusexzqhDTO.getCode());
             treeAnalyse.setXzqh(tusexzqhDTO.getTownship());//行政区划
             treeAnalyse.setXzczs(villageNum);//行政村总数
-            treeAnalyse.setQxysbczs(townReportNum);//旗县已上报的村庄数
+//            treeAnalyse.setQxysbczs(townReportNum);//旗县已上报的村庄数
             treeAnalyse.setYbaczs(townReportAllNum);//应备案村庄数
-            //上报到省厅村庄数
+            // 未上报村庄
+
+            treeAnalyse.setQxwsbczs(treeAnalyse.getYbaczs());//默认是全部数量
             if (townCountMap.containsKey(tusexzqhDTO.getCode())) {
                 Integer reportNum = tuseXzqhMapper.getAllVillageNumByUseId(townCountMap.get(tusexzqhDTO.getCode()));
-                treeAnalyse.setSbdstczs(reportNum);
+                treeAnalyse.setSbdstczs(reportNum);//上报到省厅村庄数
+
+                List<String> unReportVillages = tuseXzqhMapper.getTownUnReportVillage(tusexzqhDTO.getCode(),townCountMap.get(tusexzqhDTO.getCode()));
+                treeAnalyse.setWsbczs(unReportVillages);
             }
             //补正，机审，用地审查节点
             if (townNodeMap.containsKey(tusexzqhDTO.getCode())) {
@@ -272,10 +281,8 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
             float bal = (float) treeAnalyse.getYbas() / (float) treeAnalyse.getYbaczs();
             DecimalFormat df = new DecimalFormat("0.0%");
             treeAnalyse.setBal(df.format(bal));
-            // 未上报村庄
-            List<String> unReportVillages = tuseXzqhMapper.getTownUnReportVillage(tusexzqhDTO.getCode());
-            treeAnalyse.setQxwsbczs(unReportVillages.size());
-            treeAnalyse.setWsbczs(unReportVillages);
+
+
             townTreeList.add(treeAnalyse);
         }
         //按照区县编码组织成map结构
@@ -308,8 +315,8 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
                 for (TreeAnalyse analyse : listCounty) {
                     //行政村总数
                     treeAnalyse.setXzczs(analyse.getXzczs() + treeAnalyse.getXzczs());
-                    //旗县已上报的村庄数
-                    treeAnalyse.setQxysbczs(analyse.getQxysbczs() + treeAnalyse.getQxysbczs());
+//                    //旗县已上报的村庄数
+//                    treeAnalyse.setQxysbczs(analyse.getQxysbczs() + treeAnalyse.getQxysbczs());
                     //上报到省厅村庄数
                     treeAnalyse.setSbdstczs(analyse.getSbdstczs() + treeAnalyse.getSbdstczs());
                     //应备案村庄数
@@ -339,8 +346,8 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
             for (TreeAnalyse analyse : countyTreeList) {
                 //行政村总数
                 treeAnalyse.setXzczs(analyse.getXzczs() + treeAnalyse.getXzczs());
-                //旗县已上报的村庄数
-                treeAnalyse.setQxysbczs(analyse.getQxysbczs() + treeAnalyse.getQxysbczs());
+//                //旗县已上报的村庄数
+//                treeAnalyse.setQxysbczs(analyse.getQxysbczs() + treeAnalyse.getQxysbczs());
                 //上报到省厅村庄数
                 treeAnalyse.setSbdstczs(analyse.getSbdstczs() + treeAnalyse.getSbdstczs());
                 //应备案村庄数

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

@@ -39,23 +39,23 @@
         </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="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
         WHERE "pid" = #{pid}
-          and "use_id" not IN (SELECT DISTINCT XZQ_CODE
-                               FROM T_XZCZGHCGSB
-                               WHERE LENGTH(XZQ_CODE) = 12
-                                 AND "XZQ_CODE" LIKE #{pid} || '%')
+        and "use_id" NOT IN
+        <foreach collection="useIds" item="useId" open="(" separator="," close=")">
+            #{useId}
+        </foreach>
     </select>
 
     <select id="getTownReportAllNum" resultType="java.lang.Integer">