From e9de6064cc94d6bc63685c5e62046ff810b96dab Mon Sep 17 00:00:00 2001
From: xusd <330628789@qq.com>
Date: Sat, 05 Jul 2025 17:17:52 +0800
Subject: [PATCH] Merge branch 'gzdyh_prod'
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/analysis/controller/AnalysisWebController.java | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/analysis/controller/AnalysisWebController.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/analysis/controller/AnalysisWebController.java
index b15d77a..a47be43 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/analysis/controller/AnalysisWebController.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/analysis/controller/AnalysisWebController.java
@@ -13,6 +13,7 @@
import cn.huge.module.cust.dto.CtUserDTO;
import com.google.common.collect.Maps;
import dm.jdbc.util.StringUtil;
+import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,10 +23,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -573,12 +571,32 @@
terms.put("caseStatus", caseStatus);
}
if(StringUtils.isNotBlank(regionCode) && StringUtils.isNotBlank(regionName)){
- if(regionName.matches(".*市")){
- terms.put("queCity", regionCode);
+ if(regionName.matches(".*社区") || regionName.matches(".*村")){
+ terms.put("queVillage", regionCode);
+ }else if(regionName.matches(".*街道") || regionName.matches(".*街") || regionName.matches(".*镇")){
+ terms.put("queRoad", regionCode);
}else if(regionName.matches(".*区")){
terms.put("queArea", regionCode);
- }else if(regionName.contains("街道") || regionName.matches(".*街") || regionName.matches(".*镇")){
- terms.put("queRoad", regionCode);
+ }else if(regionName.matches(".*市")){
+ terms.put("queCity", regionCode);
+ }else if(regionName.matches("本级")){
+ //把regionCode根据#分割成数组
+ String[] regionCodeArr = regionCode.split("#");
+ if(CollectionUtils.isNotEmpty(Arrays.asList(regionCodeArr))){
+ terms.put(regionCodeArr[0], regionCodeArr[1]);
+ if(StringUtils.isNotBlank(regionName)){
+ if(terms.containsKey("queRoad")){
+ terms.put("unitGrade", "3");
+ }else if(terms.containsKey("queArea")){
+ terms.put("unitGrade", "2");
+ }else if(terms.containsKey("queCity")){
+ terms.put("unitGrade", "1");
+ }
+
+ }
+ }
+
+
}
}
Sort sort = Sort.by(Sort.Direction.DESC, "t3.create_time");
--
Gitblit v1.8.0