From 6fa45cfc4603f30deff2d7e148d6ed9119f994ba Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Fri, 13 Sep 2024 19:37:59 +0800
Subject: [PATCH] 1、回退申请bug 2、当事人评价加结束流程
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java | 116 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 71 insertions(+), 45 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
index c769b23..9243828 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
@@ -896,7 +896,7 @@
*/
public void webStartFlowZXSL(CaseInfo caseInfo, CtUserDTO loginUser){
try{
- // 启动自行手里工作流
+ // 启动自行受理工作流
FlowNode firstFlowNode = flowInfoService.startFlow(FlowableConsts.FLOWABLE_ID_ZXSL, caseInfo.getId());
// 进入第1个节点-办理反馈
CaseTask blfkCaseTask = new CaseTask();
@@ -1124,32 +1124,31 @@
CtUserDTO loginUser = custClient.clientGetUserAll(userId);
List<String> taskIdList = new ArrayList<>();
List<String> caseIdList = new ArrayList<>();
-
- // 更新纠纷任务信息
- CaseTask caseTaskPO = new CaseTask();
- caseTaskPO.setSignStatus(CaseTaskConsts.SIGN_STATUS_2);
- caseTaskPO.setSignTime(nowDate);
- caseTaskPO.setSignUserId(loginUser.getId());
- caseTaskPO.setSignUserName(loginUser.getTrueName());
- caseTaskPO.setHandleIllust("已签收");
- caseTaskPO.setUpdateTime(nowDate);
-
- // 更新纠纷信息
- CaseInfo caseInfoPO = new CaseInfo();
- caseInfoPO.setStatus(CaseStatusBaseConstsEnum.CASE_STATUS_3.getIndex());
- caseInfoPO.setStatusName(CaseStatusBaseConstsEnum.CASE_STATUS_3.getDes());
- caseInfoPO.setProcess(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getIndex());
- caseInfoPO.setProcessName(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getDes());
- caseInfoPO.setInfoProcess(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getIndex());
- caseInfoPO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getDes());
- caseInfoPO.setUpdateTime(nowDate);
-
- for(SignTaskDTO signTaskDTO: signTaskDTOList){
- taskIdList.add(signTaskDTO.getCaseTaskId());
- caseIdList.add(signTaskDTO.getCaseId());
+ for (SignTaskDTO signTaskDTO: signTaskDTOList){
+ CaseTask qsCaseTask = mapper.selectById(signTaskDTO.getCaseId());
+ // 更新纠纷任务信息
+ CaseTask caseTaskPO = new CaseTask();
+ caseTaskPO.setSignStatus(CaseTaskConsts.SIGN_STATUS_2);
+ caseTaskPO.setSignTime(nowDate);
+ caseTaskPO.setSignUserId(loginUser.getId());
+ caseTaskPO.setSignUserName(loginUser.getTrueName());
+ caseTaskPO.setHandleIllust("已签收");
+ caseTaskPO.setUpdateTime(nowDate);
+ mapper.updateCaseTask(caseTaskPO);
+ // 承办部门签收才更新纠纷信息
+ if (CaseTaskConsts.CASE_TASK_TYPE_1 == qsCaseTask.getCaseTaskType()) {
+ // 更新纠纷信息
+ CaseInfo caseInfoPO = new CaseInfo();
+ caseInfoPO.setStatus(CaseStatusBaseConstsEnum.CASE_STATUS_3.getIndex());
+ caseInfoPO.setStatusName(CaseStatusBaseConstsEnum.CASE_STATUS_3.getDes());
+ caseInfoPO.setProcess(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getIndex());
+ caseInfoPO.setProcessName(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getDes());
+ caseInfoPO.setInfoProcess(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getIndex());
+ caseInfoPO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getDes());
+ caseInfoPO.setUpdateTime(nowDate);
+ caseInfoService.updateCaseInfo(caseInfoPO);
+ }
}
- mapper.updateCaseTaskList(caseTaskPO, taskIdList);
- caseInfoService.updateCaseInfoList(caseInfoPO, caseIdList);
}catch (Exception e){
log.error("[CaseTaskService.webSign]调用失败，异常信息："+e, e);
throw new ServiceException("CaseTaskService.webSign", e);
@@ -1197,7 +1196,7 @@
blfkCaseTask.setNodeName(newFlowNode.getNodeName());
blfkCaseTask.setFlowId(newFlowNode.getFlowId());
blfkCaseTask.setNodeShowName(newFlowNode.getNodeShowName());
- blfkCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_1);
+ blfkCaseTask.setCaseTaskType(dslCaseTask.getCaseTaskType());
// 受理任务，任务候选执行者类型是上一步骤选择
blfkCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
blfkCaseTask.setCandeUnitId(loginUser.getUnitId());
@@ -1214,23 +1213,26 @@
blfkCaseTask.setCreateTime(nowDate);
blfkCaseTask.setUpdateTime(nowDate);
mapper.insert(blfkCaseTask);
- // 更新纠纷信息
- CaseInfo caseInfoPO = new CaseInfo();
- caseInfoPO.setId(blfkCaseTask.getCaseId());
- caseInfoPO.setStatus(CaseStatusBaseConstsEnum.CASE_STATUS_4.getIndex());
- caseInfoPO.setStatusName(CaseStatusBaseConstsEnum.CASE_STATUS_4.getDes());
- caseInfoPO.setProcess(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getIndex());
- caseInfoPO.setProcessName(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getDes());
- caseInfoPO.setInfoProcess(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getIndex());
- caseInfoPO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getDes());
- caseInfoService.updateCaseInfo(caseInfoPO);
- // 更新纠纷扩展信息
- CaseInfoUnfold caseInfoUnfoldPO = new CaseInfoUnfold();
- caseInfoUnfoldPO.setId(blfkCaseTask.getCaseId());
- caseInfoUnfoldPO.setAcceptTime(nowDate);
- caseInfoUnfoldPO.setMediateUnitId(blfkCaseTask.getCandeUnitId());
- caseInfoUnfoldPO.setMediateUnitName(blfkCaseTask.getCandeUnitName());
- caseInfoUnfoldService.updateCaseInfoUnfold(caseInfoUnfoldPO);
+ // 承办部门签收才更新纠纷信息
+ if (CaseTaskConsts.CASE_TASK_TYPE_1 == dslCaseTask.getCaseTaskType()) {
+ // 更新纠纷信息
+ CaseInfo caseInfoPO = new CaseInfo();
+ caseInfoPO.setId(blfkCaseTask.getCaseId());
+ caseInfoPO.setStatus(CaseStatusBaseConstsEnum.CASE_STATUS_4.getIndex());
+ caseInfoPO.setStatusName(CaseStatusBaseConstsEnum.CASE_STATUS_4.getDes());
+ caseInfoPO.setProcess(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getIndex());
+ caseInfoPO.setProcessName(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getDes());
+ caseInfoPO.setInfoProcess(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getIndex());
+ caseInfoPO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getDes());
+ caseInfoService.updateCaseInfo(caseInfoPO);
+ // 更新纠纷扩展信息
+ CaseInfoUnfold caseInfoUnfoldPO = new CaseInfoUnfold();
+ caseInfoUnfoldPO.setId(blfkCaseTask.getCaseId());
+ caseInfoUnfoldPO.setAcceptTime(nowDate);
+ caseInfoUnfoldPO.setMediateUnitId(blfkCaseTask.getCandeUnitId());
+ caseInfoUnfoldPO.setMediateUnitName(blfkCaseTask.getCandeUnitName());
+ caseInfoUnfoldService.updateCaseInfoUnfold(caseInfoUnfoldPO);
+ }
}catch (Exception e){
log.error("[CaseTaskService.webAccept]调用失败，异常信息："+e, e);
throw new ServiceException("CaseTaskService.webAccept", e);
@@ -1475,6 +1477,27 @@
caseInfoUnfoldPO.setUpdateTime(nowDate);
caseInfoUnfoldService.updateCaseInfoUnfold(caseInfoUnfoldPO);
}
+ // 查询配合部门的任务，全部结束流程
+ QueryWrapper<CaseTask> caseTaskQueryWrapper = new QueryWrapper<>();
+ caseTaskQueryWrapper.eq("case_task_id", CaseTaskConsts.CASE_TASK_TYPE_2).eq("case_id", jasqCaseTask.getCaseId());
+ List<CaseTask> assistCaseTaskList = mapper.selectList(caseTaskQueryWrapper);
+ for (CaseTask assistCaseTask: assistCaseTaskList){
+ // 完成配合部门当前办理反馈任务
+ assistCaseTask.setId(caseWindupApply.getCaseTaskId());
+ assistCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_2);
+ assistCaseTask.setHandleUnitId(loginUser.getUnitId());
+ assistCaseTask.setHandleUnitName(loginUser.getUnitName());
+ assistCaseTask.setHandleUserId(loginUser.getId());
+ assistCaseTask.setHandleUserName(loginUser.getTrueName());
+ assistCaseTask.setHandleResult(CaseTaskConsts.HANDLE_RESULT_1);
+ assistCaseTask.setHandleTime(nowDate);
+ assistCaseTask.setUpdateTime(nowDate);
+ mapper.updateCaseTask(assistCaseTask);
+ // 完成当前配合部门办理反馈工作流任务
+ flowInfoService.completeTask(assistCaseTask.getFlowableId(), assistCaseTask.getProcessTaskId(),
+ FlowableConsts.OPERATION_forward, userId);
+
+ }
}catch (Exception e){
log.error("[CaseTaskService.webWindupApply]调用失败，异常信息："+e, e);
throw new ServiceException("CaseTaskService.webWindupApply", e);
@@ -1652,7 +1675,7 @@
}
/**
- * web端任务处理-上报
+ * web端任务处理-回退申请
* @param caseReturn 回退申请表单
* @param userId 当前登录用户
*/
@@ -1667,6 +1690,9 @@
caseReturn.setReturnUserId(loginUser.getId());
caseReturn.setReturnUserName(loginUser.getTrueName());
caseReturn.setReturnTime(nowDate);
+ CtUnitDTO zzzxUnit = custClient.getParentZzzxUnit(loginUser.getUnitId());
+ caseReturn.setAuditUnitId(zzzxUnit.getId());
+ caseReturn.setAuditUnitName(zzzxUnit.getUnitName());
caseReturn.setReturnStatus(AuditBaseConsts.AUDIT_STATUS_0);
caseReturn.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
caseReturn.setCustId(loginUser.getCustId());
--
Gitblit v1.8.0