|
@@ -233,6 +233,11 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
|
|
|
//组织乡镇数据
|
|
|
List<TreeAnalyse> townTreeList = new ArrayList<>();
|
|
|
for (TusexzqhDTO tusexzqhDTO : townList) {
|
|
|
+ if(tusexzqhDTO.getTownship().equals("大路镇")){
|
|
|
+ System.out.println("大路镇");
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
Integer villageNum = tuseXzqhMapper.getAllVillageNumByPid(tusexzqhDTO.getCode());
|
|
|
// Integer townReportNum = tuseXzqhMapper.getTownReportNum(tusexzqhDTO.getCode());//上报数
|
|
|
Integer townReportAllNum = tuseXzqhMapper.getTownReportAllNum(tusexzqhDTO.getCode());//颖备案数
|
|
@@ -245,15 +250,17 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
|
|
|
// treeAnalyse.setQxysbczs(townReportNum);//旗县已上报的村庄数
|
|
|
treeAnalyse.setYbaczs(townReportAllNum);//应备案村庄数
|
|
|
// 未上报村庄
|
|
|
-
|
|
|
- treeAnalyse.setQxwsbczs(treeAnalyse.getYbaczs());//默认是全部数量
|
|
|
- if (townCountMap.containsKey(tusexzqhDTO.getCode())) {
|
|
|
+ if (townCountMap.containsKey(tusexzqhDTO.getCode())) {//省厅有的
|
|
|
Integer reportNum = tuseXzqhMapper.getTownReportVillage(townCountMap.get(tusexzqhDTO.getCode()));
|
|
|
treeAnalyse.setSbdstczs(reportNum);//上报到省厅村庄数
|
|
|
|
|
|
List<String> unReportVillages = tuseXzqhMapper.getTownUnReportVillage(tusexzqhDTO.getCode(),townCountMap.get(tusexzqhDTO.getCode()));
|
|
|
treeAnalyse.setQxwsbczs(unReportVillages.size());//默认是全部数量
|
|
|
treeAnalyse.setWsbczs(unReportVillages);
|
|
|
+ }else{
|
|
|
+ treeAnalyse.setQxwsbczs(treeAnalyse.getYbaczs());//默认是全部数量
|
|
|
+ List<String> unReportVillages = tuseXzqhMapper.getTownUnReportVillage(tusexzqhDTO.getCode(),new ArrayList<>());
|
|
|
+ treeAnalyse.setWsbczs(unReportVillages);
|
|
|
}
|
|
|
//补正,机审,用地审查节点
|
|
|
if (townNodeMap.containsKey(tusexzqhDTO.getCode())) {
|