|
@@ -191,16 +191,14 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
|
|
|
// 根据divisionCode的前9位进行divisionCode分组数量
|
|
|
Map<String, List<String>> townCountMap = new HashMap<>();
|
|
|
// 根据divisionCode的前9位进行divisionCode分组节点类别
|
|
|
-
|
|
|
Map<String, Map<String, List<String>>> townNodeMap = new HashMap<>();
|
|
|
for (LandMyAttend.RecordsDTO recordsDTO : list) {
|
|
|
String xzqhcode = recordsDTO.getDivisionCode();
|
|
|
- if(xzqhcode.length() < 9){
|
|
|
+ if (xzqhcode.length() < 9) {
|
|
|
System.out.println(" xzqhcode.length() < 9 ");
|
|
|
continue;
|
|
|
}
|
|
|
String townCode = recordsDTO.getDivisionCode().substring(0, 9);
|
|
|
-
|
|
|
// 根据乡镇数量分组
|
|
|
if (townCountMap.containsKey(townCode)) {
|
|
|
townCountMap.get(townCode).add(recordsDTO.getDivisionCode());
|
|
@@ -209,7 +207,6 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
|
|
|
townList.add(recordsDTO.getDivisionCode());
|
|
|
townCountMap.put(townCode, townList);
|
|
|
}
|
|
|
-
|
|
|
// 根据乡镇节点类别分组
|
|
|
if (townNodeMap.containsKey(townCode)) {
|
|
|
Map<String, List<String>> nodeMap = townNodeMap.get(townCode);
|
|
@@ -228,33 +225,26 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
|
|
|
townNodeMap.put(townCode, nodeMap);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
// 查询t_use_xzqh表中的数据
|
|
|
List<TusexzqhDTO> townList = tuseXzqhMapper.getAllTownship();
|
|
|
List<TusexzqhDTO> countyList = tuseXzqhMapper.getAllCounty();
|
|
|
List<TusexzqhDTO> cityList = tuseXzqhMapper.getAllCity();
|
|
|
-
|
|
|
//组织乡镇数据
|
|
|
List<TreeAnalyse> townTreeList = new ArrayList<>();
|
|
|
for (TusexzqhDTO tusexzqhDTO : townList) {
|
|
|
Integer villageNum = tuseXzqhMapper.getAllVillageNumByPid(tusexzqhDTO.getCode());
|
|
|
Integer townReportNum = tuseXzqhMapper.getTownReportNum(tusexzqhDTO.getCode());
|
|
|
-
|
|
|
-
|
|
|
TreeAnalyse treeAnalyse = new TreeAnalyse();
|
|
|
treeAnalyse.setLevel(2);
|
|
|
treeAnalyse.setId(tusexzqhDTO.getCode());
|
|
|
treeAnalyse.setXzqh(tusexzqhDTO.getTownship());//行政区划
|
|
|
treeAnalyse.setXzczs(villageNum);//行政村总数
|
|
|
treeAnalyse.setQxysbczs(townReportNum);//旗县已上报的村庄数
|
|
|
-
|
|
|
//上报到省厅村庄数
|
|
|
if (townCountMap.containsKey(tusexzqhDTO.getCode())) {
|
|
|
Integer reportNum = tuseXzqhMapper.getAllVillageNumByUseId(townCountMap.get(tusexzqhDTO.getCode()));
|
|
|
treeAnalyse.setSbdstczs(reportNum);
|
|
|
}
|
|
|
-
|
|
|
//补正,机审,用地审查节点
|
|
|
if (townNodeMap.containsKey(tusexzqhDTO.getCode())) {
|
|
|
Map<String, List<String>> nodeMap = townNodeMap.get(tusexzqhDTO.getCode());
|
|
@@ -268,23 +258,20 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
|
|
|
Integer jsNum = tuseXzqhMapper.getAllVillageNumByUseId(jsList);
|
|
|
treeAnalyse.setSlsjbz(jsNum);
|
|
|
}
|
|
|
- if (nodeMap.containsKey("用地审查节点")) {
|
|
|
- List<String> ydscList = nodeMap.get("用地审查节点");
|
|
|
+ if (nodeMap.containsKey("用地审查")) {
|
|
|
+ List<String> ydscList = nodeMap.get("用地审查");
|
|
|
Integer ydscNum = tuseXzqhMapper.getAllVillageNumByUseId(ydscList);
|
|
|
treeAnalyse.setYbas(ydscNum);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
// 备案率
|
|
|
float bal = (float) treeAnalyse.getYbas() / (float) treeAnalyse.getXzczs();
|
|
|
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结构
|
|
@@ -301,13 +288,12 @@ public class XzczghcgsbServiceImpl implements XzczghcgsbService {
|
|
|
townMap.put(key, treeAnalyses);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
//组织区县数据
|
|
|
List<TreeAnalyse> countyTreeList = new ArrayList<>();
|
|
|
for (TusexzqhDTO tusexzqhDTO : countyList) {
|
|
|
- if (tusexzqhDTO.getCounty().equals("市辖区")) continue;
|
|
|
-
|
|
|
+ if (tusexzqhDTO.getCounty().equals("市辖区")) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
TreeAnalyse treeAnalyse = new TreeAnalyse();
|
|
|
treeAnalyse.setLevel(1);
|
|
|
treeAnalyse.setId(tusexzqhDTO.getCode());
|