From cbceb95bdd6713acfc2ce560055170ccfa5b7e89 Mon Sep 17 00:00:00 2001
From: xusd <330628789@qq.com>
Date: Fri, 20 Jun 2025 17:31:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature/gzdyh_ctiy_bugfix' into feature/gzdyh_ctiy_bugfix
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 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 fe1e6ae..109bdd0 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
@@ -317,6 +317,10 @@
caseInfo.setCaseNo(utilsClient.createCaseNo(ctUnitDTO.getArea()));
caseInfo.setVisitWay(CaseBaseConstsEnum.getVisitWayByCanal(caseInfo.getCanal()).getIndex());
caseInfo.setVisitWayName(CaseBaseConstsEnum.getVisitWayByCanal(caseInfo.getCanal()).getDes());
+ if (caseInfo.getCanal().equals(CaseBaseConstsEnum.CASE_CANAL_3.getIndex())) {
+ caseInfo.setCanalSecond(CaseBaseConstsEnum.CASE_CANAL_SECOND_8.getIndex());
+ caseInfo.setCanalSecondName(CaseBaseConstsEnum.CASE_CANAL_SECOND_8.getDes());
+ }
//默认小程序可见
if (ObjectUtils.isNotEmpty(caseInfo.getCanal())) {
if (CaseBaseConstsEnum.CASE_CANAL_1.getIndex().equals(caseInfo.getCanal())) {
@@ -1134,7 +1138,7 @@
}
if (ObjectUtils.isNotEmpty(content)) {
for (CasePageDTO casePageDTO : content) {
- if (CaseBaseConstsEnum.CASE_CANAL_4.getIndex().equals(casePageDTO.getCanal())) {
+ if (StringUtils.isNotEmpty(casePageDTO.getCanalSecondName())) {
casePageDTO.setCanalName(casePageDTO.getCanalName() + "-" + casePageDTO.getCanalSecondName());
}
StringBuffer sb = new StringBuffer();
@@ -1307,10 +1311,10 @@
return new PageImpl<CasePageDTO>(content, page, total);
}
- /**
+ /**
* 统计调解过程
* 计算案件的调解过程相关统计数据，包括不予受理率、化解中率、化解成功率、化解不成功率等
- *
+ *
* @param terms 统计条件
* @return 包含调解过程统计数据的DTO对象
*/
@@ -1323,15 +1327,15 @@
caseStatisticsBaseDTO.setFailRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsBaseDTO.getFailNum() * 100, baseTotalNum, 1));
// 如果 baseTotalNum为0 设置 总数为0
caseStatisticsBaseDTO.setTotalNum(baseTotalNum);
-
+
Integer levelTotalNum = caseStatisticsBaseDTO.getOneLevelNum() + caseStatisticsBaseDTO.getTwoLevelNum() + caseStatisticsBaseDTO.getThreeLevelNum();
caseStatisticsBaseDTO.setOneLevelRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsBaseDTO.getOneLevelNum() * 100, levelTotalNum, 1));
caseStatisticsBaseDTO.setTwoLevelRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsBaseDTO.getTwoLevelNum() * 100, levelTotalNum, 1));
caseStatisticsBaseDTO.setThreeLevelRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsBaseDTO.getThreeLevelNum() * 100, levelTotalNum, 1));
-
+
return caseStatisticsBaseDTO;
}
-
+
/**
* 纠纷态势
@@ -2216,10 +2220,10 @@
for (String key : originalTypeTerms.keySet()) {
terms.put(key, originalTypeTerms.get(key));
}
-
+
// 调用统计调解过程的方法
CaseStatisticsBaseDTO processStats = statisticsProcess(terms);
-
+
// 将调解过程统计数据合并到统计结果中
statistics.setTotalNum(processStats.getTotalNum());
statistics.setRejectNum(processStats.getRejectNum());
@@ -2545,9 +2549,9 @@
} else {
terms.put("queryType", 3);
}
- log.info("xsd:{}",terms);
+ log.info("xsd:{}", terms);
CtUnitDTO ctUnitDTO = mapper.getUnitByGridCode(terms);
- log.info("xsd:ctUnitDTO{}",ctUnitDTO);
+ log.info("xsd:ctUnitDTO{}", ctUnitDTO);
if (ObjectUtils.isNotEmpty(ctUnitDTO)) {
if (StringUtils.isNotBlank(ctUnitDTO.getCity()) && StringUtils.isNotBlank(ctUnitDTO.getCityName())) {
registerSaveDTO.setQueCity(ctUnitDTO.getCity());
@@ -2635,11 +2639,12 @@
// 获取调解案号
caseInfo.setCaseNo(utilsClient.createCaseNo(ctUnitDTO.getArea()));
- caseInfo.setVisitWay(CaseBaseConstsEnum.VISIT_WAY_3.getIndex());
- caseInfo.setVisitWayName(CaseBaseConstsEnum.VISIT_WAY_3.getDes());
- caseInfo.setCanal(CaseBaseConstsEnum.CASE_CANAL_4.getIndex());
- caseInfo.setCanalName(CaseBaseConstsEnum.CASE_CANAL_4.getDes());
-
+ caseInfo.setVisitWay(CaseBaseConstsEnum.VISIT_WAY_4.getIndex());
+ caseInfo.setVisitWayName(CaseBaseConstsEnum.VISIT_WAY_4.getDes());
+ if (StringUtils.isEmpty(caseInfo.getCanal())) {
+ caseInfo.setCanal(CaseBaseConstsEnum.CASE_CANAL_4.getIndex());
+ caseInfo.setCanalName(CaseBaseConstsEnum.CASE_CANAL_4.getDes());
+ }
caseInfo.setCaseLevel(3);
// //获取一级类型
// SyCause syCause = sysClient.getParentCaseTypeById(caseInfo.getCaseType());
@@ -2655,9 +2660,9 @@
}
//todo case_title生成、经纬度转换
caseInfo.setInputWay(CaseBaseConsts.INPUT_WAY_1);
- if(registerSaveDTO.getCreateTime()!=null){
+ if (registerSaveDTO.getCreateTime() != null) {
caseInfo.setCreateTime(registerSaveDTO.getCreateTime());
- }else {
+ } else {
caseInfo.setCreateTime(nowDate);
}
--
Gitblit v1.8.0