|
@@ -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());
|
|
|
//应备案村庄数
|