From e79d8c8f9679839bf983341fe2cf3212e1bb3001 Mon Sep 17 00:00:00 2001
From: wangwh <2397901735@qq.com>
Date: Mon, 28 Oct 2024 14:44:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java | 68 +++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 17 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
index e154e08..e64388e 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
@@ -1017,22 +1017,37 @@
}
//目前没有村居，所以区和街道进来都是按街道展示
- String areaType = null;//兼容白云数据
+ String areaType = null;
+ String childAreaType = null;
List<Integer> unitGrades = new ArrayList<>();
+ List<Integer> childUnitGrades = new ArrayList<>();
+ Boolean isLast = false;
if(ObjectUtils.isNotEmpty(terms.get("queRoad"))){
- terms.put("areaType","2");
- areaType = "2";
+ terms.remove("queArea");
+ terms.remove("queCity");
+ areaType = "3";
+ childAreaType = "4";
areaCode = terms.get("queRoad")+"";
unitGrades.add(3);
unitGrades.add(4);
+ childUnitGrades.add(3);
+ childUnitGrades.add(4);
+ isLast = true;
}else if(ObjectUtils.isNotEmpty(terms.get("queArea"))){
- terms.put("areaType","2");
+ terms.remove("queCity");
areaType = "2";
+ childAreaType = "3";
areaCode = terms.get("queArea")+"";
unitGrades.add(2);
+ childUnitGrades.add(3);
+ childUnitGrades.add(4);
}else{
areaType = "1";
+ childAreaType = "2";
unitGrades.add(1);
+ childUnitGrades.add(2);
+ childUnitGrades.add(3);
+ childUnitGrades.add(4);
areaCode = ctUnitDTO.getCity();
}
//基础数据统计
@@ -1047,28 +1062,47 @@
caseStatisticsBaseDTO.setTwoLevelRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsBaseDTO.getTwoLevelNum() * 100, levelTotalNum, 1));
caseStatisticsBaseDTO.setThreeLevelRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsBaseDTO.getThreeLevelNum() * 100, levelTotalNum, 1));
//区域数据统计
- List<CaseStatisticsAreaDTO> caseStatisticsAreaDTOS = mapper.statisticsArea(terms);
- if (ObjectUtils.isEmpty(caseStatisticsAreaDTOS)) {
- caseStatisticsAreaDTOS = new ArrayList<>();
+ List<CaseStatisticsAreaDTO> caseStatisticsAreaDTOS = new ArrayList<>();
+ if(!isLast){
+ terms.put("areaType",childAreaType);
+ terms.put("unitGrades",childUnitGrades);
+ caseStatisticsAreaDTOS = mapper.statisticsArea(terms);
+ if (ObjectUtils.isEmpty(caseStatisticsAreaDTOS)) {
+ caseStatisticsAreaDTOS = new ArrayList<>();
+ }
}
+
+ //本级区数据
+ terms.put("areaType",areaType);
+ terms.put("unitGrades",unitGrades);
+ List<CaseStatisticsAreaDTO> allAreas = mapper.statisticsArea(terms);
CaseStatisticsAreaDTO allArea = new CaseStatisticsAreaDTO();
+ if (ObjectUtils.isNotEmpty(allAreas)) {
+ allArea = allAreas.get(0);
+ }
+ terms.remove("unitGrades");
allArea.setAreaName("本级");
- allArea.setAreaCode("1");
+ allArea.setAreaCode("0");
List<String> areaCodeList = new ArrayList<>();
List<CaseStatisticsAreaDTO> areaList = new ArrayList<>();
List<String> areaNames = new ArrayList<>();//为兼容白云区数据
+ Integer areaTotal = allArea.getCaseNum();
for (CaseStatisticsAreaDTO caseStatisticsAreaDTO : caseStatisticsAreaDTOS) {
areaNames.add(caseStatisticsAreaDTO.getAreaName());
+ areaList.add(caseStatisticsAreaDTO);
+ areaCodeList.add(caseStatisticsAreaDTO.getAreaCode());
+ areaTotal = areaTotal + caseStatisticsAreaDTO.getCaseNum();
+
//本及：承办单位是本及和没有承办单位并且没有下级区域编码
- if(ObjectUtils.isEmpty(caseStatisticsAreaDTO.getAreaCode()) || unitGrades.contains(caseStatisticsAreaDTO.getUnitGrade())){
- allArea.setCaseNum(dellNull(caseStatisticsAreaDTO.getCaseNum()) + dellNull(allArea.getCaseNum()));
- allArea.setResolveNum(dellNull(caseStatisticsAreaDTO.getResolveNum()) + dellNull(allArea.getResolveNum()));
- allArea.setUnResolveNum(dellNull(caseStatisticsAreaDTO.getUnResolveNum()) + dellNull(allArea.getUnResolveNum()));
- allArea.setResolveingNum(dellNull(caseStatisticsAreaDTO.getResolveingNum()) + dellNull(allArea.getResolveingNum()));
- }else{
- areaList.add(caseStatisticsAreaDTO);
- areaCodeList.add(caseStatisticsAreaDTO.getAreaCode());
- }
+// if(ObjectUtils.isEmpty(caseStatisticsAreaDTO.getAreaCode()) || unitGrades.contains(caseStatisticsAreaDTO.getUnitGrade())){
+// allArea.setCaseNum(dellNull(caseStatisticsAreaDTO.getCaseNum()) + dellNull(allArea.getCaseNum()));
+// allArea.setResolveNum(dellNull(caseStatisticsAreaDTO.getResolveNum()) + dellNull(allArea.getResolveNum()));
+// allArea.setUnResolveNum(dellNull(caseStatisticsAreaDTO.getUnResolveNum()) + dellNull(allArea.getUnResolveNum()));
+// allArea.setResolveingNum(dellNull(caseStatisticsAreaDTO.getResolveingNum()) + dellNull(allArea.getResolveingNum()));
+// }else{
+// areaList.add(caseStatisticsAreaDTO);
+// areaCodeList.add(caseStatisticsAreaDTO.getAreaCode());
+// }
}
areaList.add(allArea);
if("1".equals(areaType)){
--
Gitblit v1.8.0