From a0d8bc14edfc7a49f8fe050dadec22a173247504 Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Tue, 22 Oct 2024 20:04:55 +0800
Subject: [PATCH] fix:本地环境能提交到亿迅环境兼容
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java | 54 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 11 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 9ad7cdd..6ce9368 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
@@ -1008,20 +1008,32 @@
CtUnitDTO ctUnitDTO = custClient.getUnitByUserId(userId);
String areaCode = null;
//目前没有村居数据，所以单位等级是4的也归集到3里面
- List<Integer> unitGrades = new ArrayList<>();
- if(ctUnitDTO.getUnitGrade().equals(2)){
+ if(ctUnitDTO.getUnitGrade().equals(1)){
+ terms.put("queCity", ctUnitDTO.getCity());
+ }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();
+ }
+
+ //目前没有村居，所以区和街道进来都是按街道展示
+ String areaType = null;//兼容白云数据
+ List<Integer> unitGrades = new ArrayList<>();
+ if(ObjectUtils.isNotEmpty(terms.get("queRoad"))){
+ terms.put("areaType","2");
+ areaType = "2";
+ areaCode = terms.get("queRoad")+"";
unitGrades.add(3);
unitGrades.add(4);
- }
- //目前没有村居，所以区和街道进来都是按街道展示
- if(ObjectUtils.isNotEmpty(terms.get("queRoad")) || ObjectUtils.isNotEmpty(terms.get("queArea"))){
+ }else if(ObjectUtils.isNotEmpty(terms.get("queArea"))){
terms.put("areaType","2");
+ areaType = "2";
+ areaCode = terms.get("queArea")+"";
+ unitGrades.add(2);
+ }else{
+ areaType = "1";
+ unitGrades.add(1);
+ areaCode = ctUnitDTO.getCity();
}
//基础数据统计
CaseStatisticsBaseDTO caseStatisticsBaseDTO = mapper.statisticsBase(terms);
@@ -1043,7 +1055,9 @@
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()) || unitGrades.contains(caseStatisticsAreaDTO.getUnitGrade())){
allArea.setCaseNum(dellNull(caseStatisticsAreaDTO.getCaseNum()) + dellNull(allArea.getCaseNum()));
@@ -1056,6 +1070,18 @@
}
}
areaList.add(allArea);
+ 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) {
@@ -1181,7 +1207,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");
@@ -1194,14 +1220,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