应备案数添加

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

@@ -12,6 +12,7 @@ public class TreeAnalyse {
     String xzqh; //行政区划
     int xzczs; //行政村总数
     int qxysbczs; //旗县已上报的村庄数
+    int ybaczs; //应备案村庄数
     int sbdstczs; //上报到省厅村庄数
     int wbscjd; //文本审查节点(补正)
     int slsjbz; //矢量数据审查节点(机审)

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

@@ -19,7 +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 getTownReportAllNum(String pid);
 }

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

@@ -233,13 +233,16 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
         List<TreeAnalyse> townTreeList = new ArrayList<>();
         for (TusexzqhDTO tusexzqhDTO : townList) {
             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();
             treeAnalyse.setLevel(2);
             treeAnalyse.setId(tusexzqhDTO.getCode());
             treeAnalyse.setXzqh(tusexzqhDTO.getTownship());//行政区划
             treeAnalyse.setXzczs(villageNum);//行政村总数
             treeAnalyse.setQxysbczs(townReportNum);//旗县已上报的村庄数
+            treeAnalyse.setYbaczs(townReportAllNum);//应备案村庄数
             //上报到省厅村庄数
             if (townCountMap.containsKey(tusexzqhDTO.getCode())) {
                 Integer reportNum = tuseXzqhMapper.getAllVillageNumByUseId(townCountMap.get(tusexzqhDTO.getCode()));
@@ -248,7 +251,7 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
             //补正，机审，用地审查节点
             if (townNodeMap.containsKey(tusexzqhDTO.getCode())) {
                 Map<String, List<String>> nodeMap = townNodeMap.get(tusexzqhDTO.getCode());
-                if (nodeMap.containsKey("补正")) {
+                if (nodeMap.containsKey("补正") || nodeMap.containsKey("文本审核")) {// 文本审核+补正
                     List<String> bzList = nodeMap.get("补正");
                     Integer bzNum = tuseXzqhMapper.getAllVillageNumByUseId(bzList);
                     treeAnalyse.setWbscjd(bzNum);
@@ -265,7 +268,7 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
                 }
             }
             // 备案率
-            float bal = (float) treeAnalyse.getYbas() / (float) treeAnalyse.getXzczs();
+            float bal = (float) treeAnalyse.getYbas() / (float) treeAnalyse.getYbaczs();
             DecimalFormat df = new DecimalFormat("0.0%");
             treeAnalyse.setBal(df.format(bal));
             // 未上报村庄
@@ -308,6 +311,8 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
                     treeAnalyse.setQxysbczs(analyse.getQxysbczs() + treeAnalyse.getQxysbczs());
                     //上报到省厅村庄数
                     treeAnalyse.setSbdstczs(analyse.getSbdstczs() + treeAnalyse.getSbdstczs());
+                    //应备案村庄数
+                    treeAnalyse.setYbaczs(analyse.getYbaczs() + treeAnalyse.getYbaczs());
                     //补正，机审，用地审查节点
                     treeAnalyse.setWbscjd(analyse.getWbscjd() + treeAnalyse.getWbscjd());
                     treeAnalyse.setSlsjbz(analyse.getSlsjbz() + treeAnalyse.getSlsjbz());
@@ -316,7 +321,7 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
                     treeAnalyse.setQxwsbczs(analyse.getQxwsbczs() + treeAnalyse.getQxwsbczs());
                 }
                 // 备案率
-                float bal = (float) treeAnalyse.getYbas() / (float) treeAnalyse.getXzczs();
+                float bal = (float) treeAnalyse.getYbas() / (float) treeAnalyse.getYbaczs();
                 DecimalFormat df = new DecimalFormat("0.0%");
                 treeAnalyse.setBal(df.format(bal));
             }
@@ -337,6 +342,8 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
                 treeAnalyse.setQxysbczs(analyse.getQxysbczs() + treeAnalyse.getQxysbczs());
                 //上报到省厅村庄数
                 treeAnalyse.setSbdstczs(analyse.getSbdstczs() + treeAnalyse.getSbdstczs());
+                //应备案村庄数
+                treeAnalyse.setYbaczs(analyse.getYbaczs() + treeAnalyse.getYbaczs());
                 //补正，机审，用地审查节点
                 treeAnalyse.setWbscjd(analyse.getWbscjd() + treeAnalyse.getWbscjd());
                 treeAnalyse.setSlsjbz(analyse.getSlsjbz() + treeAnalyse.getSlsjbz());
@@ -345,7 +352,7 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
                 treeAnalyse.setQxwsbczs(analyse.getQxwsbczs() + treeAnalyse.getQxwsbczs());
             }
             // 备案率
-            float bal = (float) treeAnalyse.getYbas() / (float) treeAnalyse.getXzczs();
+            float bal = (float) treeAnalyse.getYbas() / (float) treeAnalyse.getYbaczs();
             DecimalFormat df = new DecimalFormat("0.0%");
             treeAnalyse.setBal(df.format(bal));
 

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

@@ -57,4 +57,10 @@
                                WHERE LENGTH(XZQ_CODE) = 12
                                  AND "XZQ_CODE" LIKE #{pid} || '%')
     </select>
+
+    <select id="getTownReportAllNum" resultType="java.lang.Integer">
+        SELECT COALESCE(COUNT(*), 0)
+        FROM T_USE_XZQH_REPORT
+        WHERE "use_id" T_USE_XZQH_REPORT WHERE LENGTH("code")=12 AND "pid" = #{pid}
+    </select>
 </mapper>