From 193c672bd2ed10387f3fec7aa1e1d9ddc7160980 Mon Sep 17 00:00:00 2001
From: zhouxiantao <1026371446@qq.com>
Date: Mon, 21 Oct 2024 23:51:07 +0800
Subject: [PATCH] fix:解纷态势-区域筛选修复
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java | 49 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 43 insertions(+), 6 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 c6aff30..cfba1a1 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
@@ -1006,14 +1006,31 @@
terms.put("statistics", "1");
//根据用户筛选区域范围
CtUnitDTO ctUnitDTO = custClient.getUnitByUserId(userId);
- if(ctUnitDTO.getUnitGrade().equals(2)){
+ String areaCode = null;
+ //目前没有村居数据，所以单位等级是4的也归集到3里面
+ List<Integer> unitGrades = new ArrayList<>();
+
+ if(ctUnitDTO.getUnitGrade().equals(1)){
+ terms.put("queCity", ctUnitDTO.getCity());
+ areaCode = ctUnitDTO.getCity();
+ unitGrades.add(ctUnitDTO.getUnitGrade());
+ }else if(ctUnitDTO.getUnitGrade().equals(2)){
terms.put("queArea", ctUnitDTO.getArea());
+ areaCode = ctUnitDTO.getArea();
+ unitGrades.add(ctUnitDTO.getUnitGrade());
}else if(ctUnitDTO.getUnitGrade().equals(3) || ctUnitDTO.getUnitGrade().equals(4)){
terms.put("queRoad", ctUnitDTO.getRoad());
+ areaCode = ctUnitDTO.getRoad();
+ unitGrades.add(3);
+ unitGrades.add(4);
}
//目前没有村居，所以区和街道进来都是按街道展示
+ String areaType = null;//兼容白云数据
if(ObjectUtils.isNotEmpty(terms.get("queRoad")) || ObjectUtils.isNotEmpty(terms.get("queArea"))){
terms.put("areaType","2");
+ areaType = "2";
+ }else{
+ areaType = "1";
}
//基础数据统计
CaseStatisticsBaseDTO caseStatisticsBaseDTO = mapper.statisticsBase(terms);
@@ -1035,9 +1052,11 @@
allArea.setAreaCode("1");
List<String> areaCodeList = new ArrayList<>();
List<CaseStatisticsAreaDTO> areaList = new ArrayList<>();
+ List<String> areaNames = new ArrayList<>();//为兼容白云区数据
for (CaseStatisticsAreaDTO caseStatisticsAreaDTO : caseStatisticsAreaDTOS) {
+ areaNames.add(caseStatisticsAreaDTO.getAreaName());
//本及：承办单位是本及和没有承办单位并且没有下级区域编码
- if(ObjectUtils.isEmpty(caseStatisticsAreaDTO.getAreaCode()) || ctUnitDTO.getUnitGrade().equals(caseStatisticsAreaDTO.getUnitGrade())){
+ 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()));
@@ -1048,7 +1067,19 @@
}
}
areaList.add(allArea);
- List<QueAreaDTO> queArea = listAreaByType(terms.get("queArea"));
+ if("1".equals(areaType)){
+ Map<String, String> area = getArea();
+ for (String areaName : area.keySet()) {
+ if(!areaNames.contains(areaName)){
+ CaseStatisticsAreaDTO areaChild = new CaseStatisticsAreaDTO();
+ areaChild.setAreaCode(area.get(areaName));
+ areaChild.setAreaName(areaName);
+ areaList.add(areaChild);
+ }
+ }
+ }
+
+ List<QueAreaDTO> queArea = listAreaByType(areaCode);
log.info("listAreaByType {}", JSON.toJSONString(queArea));
for (QueAreaDTO caseAreaDTO : queArea) {
if (!areaCodeList.contains(caseAreaDTO.getAreaCode())) {
@@ -1173,7 +1204,7 @@
return caseStatisticsTypeDTOS;
}
- public List<CaseStatisticsAreaDTO> sortArea(List<CaseStatisticsAreaDTO> caseStatisticsAreaDTOS) {
+ public Map<String, String> getArea(){
Map<String, String> map = new HashMap<>();
map.put("越秀区","2");
map.put("海珠区","3");
@@ -1186,14 +1217,20 @@
map.put("南沙区","10");
map.put("从化区","11");
map.put("增城区","12");
+ return map;
+ }
+
+ public List<CaseStatisticsAreaDTO> sortArea(List<CaseStatisticsAreaDTO> caseStatisticsAreaDTOS) {
+ Map<String, String> map = getArea();
for (CaseStatisticsAreaDTO caseStatisticsAreaDTO : caseStatisticsAreaDTOS) {
+ caseStatisticsAreaDTO.setAreaCode(caseStatisticsAreaDTO.getAreaCode().replace("-",""));
if(map.containsKey(caseStatisticsAreaDTO.getAreaName())){
caseStatisticsAreaDTO.setAreaCode(map.get(caseStatisticsAreaDTO.getAreaName()));
}
}
caseStatisticsAreaDTOS.sort((o1, o2) -> {
- Integer totalScore1 = Integer.valueOf(o1.getAreaCode());
- Integer totalScore2 = Integer.valueOf(o2.getAreaCode());
+ Long totalScore1 = Long.valueOf(o1.getAreaCode());
+ Long totalScore2 = Long.valueOf(o2.getAreaCode());
if (totalScore1 > totalScore2) {
return 1;
} else if (totalScore1.equals(totalScore2)) {
--
Gitblit v1.8.0