From c06b2f5b2aa6d8910664b30ab4f74ff3895ebbeb Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Fri, 20 Sep 2024 10:27:45 +0800
Subject: [PATCH] Merge branch 'master' into gzdyh_test
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoUnfoldService.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 47 insertions(+), 11 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoUnfoldService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoUnfoldService.java
index 090f220..24c7c05 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoUnfoldService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoUnfoldService.java
@@ -4,8 +4,11 @@
import cn.huge.base.common.utils.DateUtils;
import cn.huge.base.common.utils.IdUtils;
import cn.huge.base.common.utils.ObjectUtils;
+import cn.huge.module.cases.consts.CaseTaskConsts;
import cn.huge.module.cases.domain.po.CaseAssistApply;
import cn.huge.module.cases.domain.dto.TransactResultDTO;
+import cn.huge.module.cases.domain.po.CaseAssistInfo;
+import cn.huge.module.cases.domain.po.CaseTask;
import cn.huge.module.client.api.impl.CustClientImpl;
import cn.huge.module.client.api.impl.SysClientImpl;
import cn.huge.module.client.api.impl.UtilsClientImpl;
@@ -62,6 +65,12 @@
@Autowired
private SysClientImpl sysClient;
+
+ @Autowired
+ private CaseTaskService caseTaskService;
+
+ @Autowired
+ private CaseAssistInfoService caseAssistInfoService;
/**
* 更新对象
@@ -155,19 +164,47 @@
/**
* PC端-选择经办人
- * @param caseId 对象
+ * @param caseId 纠纷编号
+ * @param caseTaskId 办理反馈任务编号
* @param userId 条件
*/
- public void choosePrincipal(String caseId, String userId){
+ public void choosePrincipal(String caseId, String caseTaskId, String userId){
try{
- // 获取当前登录用户
- CtUserDTO loginUser = custClient.clientGetUserAll(userId);
- CaseInfoUnfold CaseInfoUnfold = new CaseInfoUnfold();
- CaseInfoUnfold.setId(caseId);
- CaseInfoUnfold.setMediatorId(loginUser.getId());
- CaseInfoUnfold.setMediator(loginUser.getTrueName());
- CaseInfoUnfold.setMediatorMobile(loginUser.getMobile());
- mapper.updateCaseInfoUnfold(CaseInfoUnfold);
+ Date nowDate = DateUtils.getNowDate();
+ // 获取经办人信息
+ CtUserDTO ctUserDTO = custClient.clientGetUser(userId);
+ CaseTask caseTask = caseTaskService.getById(caseTaskId);
+ // 承办部门，更新扩展表
+ if (CaseTaskConsts.CASE_TASK_TYPE_1 == caseTask.getCaseTaskType()) {
+ CaseInfoUnfold CaseInfoUnfold = new CaseInfoUnfold();
+ CaseInfoUnfold.setId(caseId);
+ CaseInfoUnfold.setMediatorId(ctUserDTO.getId());
+ CaseInfoUnfold.setMediator(ctUserDTO.getTrueName());
+ CaseInfoUnfold.setMediatorMobile(ctUserDTO.getMobile());
+ CaseInfoUnfold.setUpdateTime(nowDate);
+ mapper.updateCaseInfoUnfold(CaseInfoUnfold);
+ }else {
+ // 配合部门，更新联合处置信息表
+ CaseAssistInfo caseAssistInfo = caseAssistInfoService.getByCaseTaskId(caseTaskId);
+ caseAssistInfo.setAssistUserId(ctUserDTO.getId());
+ caseAssistInfo.setAssistUserName(ctUserDTO.getTrueName());
+ caseAssistInfo.setUpdateTime(nowDate);
+ caseAssistInfoService.updateCaseAssistInfo(caseAssistInfo);
+
+ }
+ }catch (Exception e){
+ log.error("[CaseInfoUnfoldService.choosePrincipal]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseInfoUnfoldService.choosePrincipal", e);
+ }
+ }
+
+ /**
+ * PC端-删除经办人
+ * @param caseId 对象
+ */
+ public void deletePrincipal(String caseId){
+ try{
+ mapper.deletePrincipal(caseId);
}catch (Exception e){
log.error("[CaseInfoUnfoldService.choosePrincipal]调用失败，异常信息："+e, e);
throw new ServiceException("CaseInfoUnfoldService.choosePrincipal", e);
@@ -193,7 +230,6 @@
}
Map<String, Object> terms = new HashMap<>();
terms.put("mainId", caseId);
- terms.put("ownerIds", "'" + caseId + "'");
terms.put("types", "'" + FileOwnerTypeBaseEnum.OWNER_TYPE_302.getIndex() + "'");
List<FileIdInfoBaseDTO> fileIdInfoBaseDTOList = sysClient.listIdInfoByOwnerIdList(terms);
if (ObjectUtils.isNotEmpty(fileIdInfoBaseDTOList)) {
--
Gitblit v1.8.0