From 77bd7b9e79a01a31c0eb26e4978dcbdf3b4debe2 Mon Sep 17 00:00:00 2001
From: zhouxiantao <1026371446@qq.com>
Date: Tue, 22 Oct 2024 00:10:52 +0800
Subject: [PATCH] fix:解纷态势，镇街显示区问题修改
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 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 dc1a238..023b39d 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
@@ -1009,6 +1009,7 @@
String areaCode = null;
//目前没有村居数据，所以单位等级是4的也归集到3里面
List<Integer> unitGrades = new ArrayList<>();
+
if(ctUnitDTO.getUnitGrade().equals(1)){
terms.put("queCity", ctUnitDTO.getCity());
areaCode = ctUnitDTO.getCity();
@@ -1023,9 +1024,19 @@
unitGrades.add(3);
unitGrades.add(4);
}
+
//目前没有村居，所以区和街道进来都是按街道展示
- if(ObjectUtils.isNotEmpty(terms.get("queRoad")) || ObjectUtils.isNotEmpty(terms.get("queArea"))){
+ String areaType = null;//兼容白云数据
+ if(ObjectUtils.isNotEmpty(terms.get("queRoad"))){
terms.put("areaType","2");
+ areaType = "2";
+ areaCode = terms.get("queRoad")+"";
+ }else if(ObjectUtils.isNotEmpty(terms.get("queArea"))){
+ terms.put("areaType","2");
+ areaType = "2";
+ areaCode = terms.get("queArea")+"";
+ }else{
+ areaType = "1";
}
//基础数据统计
CaseStatisticsBaseDTO caseStatisticsBaseDTO = mapper.statisticsBase(terms);
@@ -1062,15 +1073,18 @@
}
}
areaList.add(allArea);
- 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);
+ 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) {
--
Gitblit v1.8.0