From de9369d2c8056e2bb723247b0e877fe9d96f8def Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Sun, 15 Sep 2024 15:20:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 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 64316b4..1feada6 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
@@ -96,6 +96,20 @@
}
/**
+ * 批量更新对象
+ * @param entity 对象
+ * @param caseIdList
+ */
+ public void updateCaseInfoList(CaseInfo entity, List<String> caseIdList){
+ try{
+ mapper.updateCaseInfoList(entity, caseIdList);
+ }catch (Exception e){
+ log.error("[CaseInfoService.updateCaseInfoList]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseInfoService.updateCaseInfoList", e);
+ }
+ }
+
+ /**
* 条件更新对象
* @param entity 对象
* @param terms 条件
@@ -213,6 +227,11 @@
caseInfo.setInputWay(CaseBaseConsts.INPUT_WAY_1);
caseInfo.setCreateTime(nowDate);
caseInfo.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
+ //默认添加省市
+ caseInfo.setQueProv("19");
+ caseInfo.setQueProvName("广东省");
+ caseInfo.setQueCity("1601");
+ caseInfo.setQueCityName("广州市");
// 删除草稿案件
if(1 == registerSaveDTO.getIsDraft() ){
draftInfoService.removeDraftInfo(registerSaveDTO.getId());
@@ -229,7 +248,7 @@
// 判断是否自行受理
if(1 == registerSaveDTO.getIsSelfAccept()){
// 自行受理流程
- caseTaskService.webStartFlowZXSL(caseInfo, loginUser);
+ return caseTaskService.webStartFlowZXSL(caseInfo, loginUser);
}else {
// 自动调度流程
caseTaskService.webStartFlowLFDJ(caseInfo);
@@ -547,6 +566,12 @@
caseInfo.setInputUserId(loginUser.getId());
caseInfo.setInputUserName(loginUser.getTrueName());
caseInfo.setInputWay(CaseBaseConsts.INPUT_WAY_1);
+ //默认添加省市
+ caseInfo.setQueProv("19");
+ caseInfo.setQueProvName("广东省");
+ caseInfo.setQueCity("1601");
+ caseInfo.setQueCityName("广州市");
+
caseInfo.setCreateTime(nowDate);
caseInfo.setUpdateTime(nowDate);
caseInfo.setVisitTime(nowDate);
@@ -790,8 +815,11 @@
if(ObjectUtils.isNotEmpty(caseInfoUnfold)){
caseInfoWeChatDTO.setMediResult(caseInfoUnfold.getMediResult());
caseInfoWeChatDTO.setMediResultName(caseInfoUnfold.getMediResultName());
- caseInfoWeChatDTO.setMediateDeptId(caseInfoUnfold.getMediateDeptId());
- caseInfoWeChatDTO.setMediateDeptName(caseInfoUnfold.getMediateDeptName());
+ caseInfoWeChatDTO.setMediateDeptId(caseInfoUnfold.getMediateUnitId());
+ caseInfoWeChatDTO.setMediateDeptName(caseInfoUnfold.getMediateUnitName());
+ caseInfoWeChatDTO.setAgreeType(caseInfoUnfold.getAgreeType());
+ caseInfoWeChatDTO.setAgreeTypeName(caseInfoUnfold.getAgreeTypeName());
+ caseInfoWeChatDTO.setAgreeContent(caseInfoUnfold.getAgreeContent());
}
QueryWrapper<CasePerson> personWrapper1 = new QueryWrapper<>();
--
Gitblit v1.8.0