From 4102e0706ca52421f2776905c6e0b72d9a71ed4b Mon Sep 17 00:00:00 2001
From: xusd <330628789@qq.com>
Date: Fri, 27 Jun 2025 22:21:47 +0800
Subject: [PATCH] Merge branch 'gzdyh_prod'
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 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 aa55dba..1d5bb69 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
@@ -1,5 +1,6 @@
package cn.huge.module.cases.service;
+import cn.huge.base.common.bo.R;
import cn.huge.base.common.exception.ServiceException;
import cn.huge.base.common.utils.*;
import cn.huge.module.casebook.consts.ByCaseTypeEnum;
@@ -119,6 +120,8 @@
private CaseWindupApplyService caseWindupApplyService;
@Autowired
private CasePersonService casePersonService;
+ @Autowired
+ private ThGridCitizenEventService thGridCitizenEventService;
/**
@@ -311,13 +314,13 @@
generateQrCodeRequestVo.setBusinessSource("02");
generateQrCodeRequestVo.setGenerateUnifiedCode(true);
generateQrCodeRequestVo.setInfoSource("03");
- log.info("xsdgridCode:{}",registerSaveDTO.getQueArea());
+ log.info("xsdgridCode:{}", registerSaveDTO.getQueArea());
String area = this.formatGridCode(registerSaveDTO.getQueArea());
- log.info("xsdgridCode:{}",area);
+ log.info("xsdgridCode:{}", area);
generateQrCodeRequestVo.setGridCode(area);
caseInfo.setCaseRef(sysClient.getCaseRefByGenerateQrCode(generateQrCodeRequestVo));
// 获取调解案号
- caseInfo.setCaseNo(utilsClient.createCaseNo(ctUnitDTO.getArea()));
+// 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())) {
@@ -607,6 +610,10 @@
caseInfoDTO.setIsRisk(caseInfoUnfold.getIsRisk());
caseInfoDTO.setTcqk(caseInfoUnfold.getTcqk());
}
+ ThGridCitizenEvent thGridCitizenEvent = thGridCitizenEventService.getByCaseId(caseId);
+ if (thGridCitizenEvent != null) {
+ caseInfoDTO.setCityCode(thGridCitizenEvent.getCitizenEventCode());
+ }
} else {
CasebookInfo casebookInfo = casebookInfoService.getById(caseId);
if (ObjectUtils.isNotEmpty(casebookInfo)) {
@@ -824,7 +831,7 @@
generateQrCodeRequestVo.setGridCode(area);
caseInfo.setCaseRef(sysClient.getCaseRefByGenerateQrCode(generateQrCodeRequestVo));
// 生产调解案号
- caseInfo.setCaseNo(utilsClient.createCaseNo(caseInfo.getQueArea()));
+// caseInfo.setCaseNo(utilsClient.createCaseNo(caseInfo.getQueArea()));
log.info("xsdcaseInfo:{}", caseInfo);
caseInfoUnfold.setId(caseInfo.getId());
caseInfoUnfold.setCreateTime(nowDate);
@@ -2271,7 +2278,7 @@
return caseOverviewDetailDTOs;
}
- public CaseStatisticsBaseDTO ledger(Map<String, Object> terms, String userId,String ledgerType) throws IOException {
+ public CaseStatisticsBaseDTO ledger(Map<String, Object> terms, String userId, String ledgerType) throws IOException {
terms.put("statistics", "1");
CtUnitDTO ctUnitDTO = null;
@@ -2355,7 +2362,7 @@
List<CaseStatisticsAreaDTO> areaList = new ArrayList<>();
//本系统或者全部的时候才去查询数据
- if(ObjectUtils.isEmpty(ledgerType) || "1".equals(ledgerType)){
+ if (ObjectUtils.isEmpty(ledgerType) || "1".equals(ledgerType)) {
caseStatisticsBaseDTO = statisticsProcess(terms);
//区域数据统计
@@ -2695,7 +2702,7 @@
}
// 获取调解案号
- caseInfo.setCaseNo(utilsClient.createCaseNo(ctUnitDTO.getArea()));
+// caseInfo.setCaseNo(utilsClient.createCaseNo(ctUnitDTO.getArea()));
caseInfo.setVisitWay(CaseBaseConstsEnum.VISIT_WAY_4.getIndex());
caseInfo.setVisitWayName(CaseBaseConstsEnum.VISIT_WAY_4.getDes());
if (StringUtils.isEmpty(caseInfo.getCanal())) {
@@ -2770,4 +2777,9 @@
.insert(5, "-")
.toString();
}
+
+ public R<String> createCaseNo(String userId) {
+ CtUnitDTO unitByUserId = custClient.getUnitByUserId(userId);
+ return R.ok(utilsClient.createCaseNo(unitByUserId.getArea()));
+ }
}
--
Gitblit v1.8.0