From a87a33847a94994191832d9110c5679ba52f3990 Mon Sep 17 00:00:00 2001
From: zhouxiantao <1026371446@qq.com>
Date: Tue, 24 Sep 2024 19:34:50 +0800
Subject: [PATCH] 综合查询-等级
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java | 72 +++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 25 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 ebd4fec..e427dca 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
@@ -19,6 +19,7 @@
import cn.huge.module.mediate.dto.WechatBindCaseDTO;
import cn.huge.module.sys.dto.FileIdTypeInfoBaseDTO;
import cn.huge.module.sys.dto.QueAddrBaseDTO;
+import cn.huge.module.sys.dto.QueAreaDTO;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -84,9 +85,6 @@
@Autowired
private CaseEvaluateService caseEvaluateService;
-
- @Autowired
- private CaseAreaService caseAreaService;
/**
@@ -243,8 +241,6 @@
caseInfo.setDefendants(defendants.toString());
caseInfo.setDagents(dagents.toString());
caseInfo.setCaseRef(utilsClient.createCaseRef());
- caseInfo.setCanal(CaseBaseConstsEnum.CASE_CANAL_1.getIndex());
- caseInfo.setCanalName(CaseBaseConstsEnum.CASE_CANAL_1.getDes());
caseInfo.setVisitWay(CaseBaseConstsEnum.VISIT_WAY_1.getIndex());
caseInfo.setVisitWayName(CaseBaseConstsEnum.VISIT_WAY_1.getDes());
//todo case_title生成、经纬度转换
@@ -913,6 +909,26 @@
List<CasePageDTO> content = mapper.pageTermsAll(page, terms);
if (ObjectUtils.isNotEmpty(content)) {
for (CasePageDTO casePageDTO : content) {
+ if(ObjectUtils.isNotEmpty(casePageDTO.getQueRoadName())){
+ casePageDTO.setAreaName(casePageDTO.getQueRoadName());
+ }else if(ObjectUtils.isNotEmpty(casePageDTO.getAreaName())){
+ casePageDTO.setAreaName(casePageDTO.getAreaName());
+ }else if(ObjectUtils.isNotEmpty(casePageDTO.getQueCityName())){
+ casePageDTO.setAreaName(casePageDTO.getQueCityName());
+ }
+ if(ObjectUtils.isNotEmpty(casePageDTO.getCaseLevel())){
+ switch (casePageDTO.getCaseLevel()){
+ case "1":
+ casePageDTO.setCaseLevel("一级");
+ break;
+ case "2":
+ casePageDTO.setCaseLevel("二级");
+ break;
+ case "3":
+ casePageDTO.setCaseLevel("三级");
+ break;
+ }
+ }
QueryWrapper<CasePerson> personWrapper1 = new QueryWrapper<>();
personWrapper1.eq("case_id", casePageDTO.getId());
List<CasePerson> casePersonList1 = personService.list(personWrapper1);
@@ -965,9 +981,9 @@
areaCodeList.add(caseStatisticsAreaDTO.getAreaCode());
}
caseStatisticsAreaDTOS.add(allArea);
- List<CaseArea> queArea = listAreaByType(terms.get("areaType"), terms.get("queArea"));
+ List<QueAreaDTO> queArea = listAreaByType(terms.get("queArea"));
log.info("listAreaByType {}", JSON.toJSONString(queArea));
- for (CaseArea caseAreaDTO : queArea) {
+ for (QueAreaDTO caseAreaDTO : queArea) {
if (!areaCodeList.contains(caseAreaDTO.getAreaCode())) {
CaseStatisticsAreaDTO areaChild = new CaseStatisticsAreaDTO();
areaChild.setAreaCode(caseAreaDTO.getAreaCode());
@@ -1073,8 +1089,24 @@
}
public List<CaseStatisticsAreaDTO> sortArea(List<CaseStatisticsAreaDTO> caseStatisticsAreaDTOS) {
+ Map<String, String> map = new HashMap<>();
+ map.put("越秀区","2");
+ map.put("海珠区","3");
+ map.put("荔湾区","4");
+ map.put("天河区","5");
+ map.put("白云区","6");
+ map.put("黄埔区","7");
+ map.put("花都区","8");
+ map.put("番禺区","9");
+ map.put("南沙区","10");
+ map.put("从化区","11");
+ map.put("增城区","12");
+ for (CaseStatisticsAreaDTO caseStatisticsAreaDTO : caseStatisticsAreaDTOS) {
+ if(map.containsKey(caseStatisticsAreaDTO.getAreaName())){
+ caseStatisticsAreaDTO.setAreaCode(map.get(caseStatisticsAreaDTO.getAreaName()));
+ }
+ }
caseStatisticsAreaDTOS.sort((o1, o2) -> {
- log.info("xsd:{},{}",o1,o2);
Integer totalScore1 = Integer.valueOf(o1.getAreaCode());
Integer totalScore2 = Integer.valueOf(o2.getAreaCode());
if (totalScore1 > totalScore2) {
@@ -1098,24 +1130,14 @@
/**
* 根据不同的等级获取不同区域子集合
- *
- * @param areaType 1-市级 2-区
*/
- public List<CaseArea> listAreaByType(Object areaType, Object areaCode) throws IOException {
- log.info("listAreaByType {},{}", areaType, areaCode);
- if (ObjectUtils.isEmpty(areaType) || areaType.equals("") || areaType.equals("1")) {
- QueryWrapper<CaseArea> caseAreaWrapper = new QueryWrapper<>();
- caseAreaWrapper.eq("parent_code","1601");
- List<CaseArea> list = caseAreaService.list(caseAreaWrapper);
- return list;
+ public List<QueAreaDTO> listAreaByType(Object areaCode) {
+ log.info("listAreaByType {},{}", areaCode);
+ String parentId = "1601";
+ if (ObjectUtils.isNotEmpty(areaCode)) {
+ parentId = String.valueOf(areaCode);
}
- if (areaType.equals("2")) {
-
- QueryWrapper<CaseArea> caseAreaWrapper = new QueryWrapper<>();
- caseAreaWrapper.eq("parent_code",areaCode);
- List<CaseArea> list = caseAreaService.list(caseAreaWrapper);
- return list;
- }
- return new ArrayList<>();
+ List<QueAreaDTO> queAreaDTOS = sysClient.listByParentId(parentId);
+ return queAreaDTOS;
}
}
--
Gitblit v1.8.0