From a1fb5bae10f344d719b499bea409fec3cc75ceb8 Mon Sep 17 00:00:00 2001 From: liyj <15602261488@163.com> Date: Thu, 19 Sep 2024 10:13:34 +0800 Subject: [PATCH] 当事人评价后流程显示不对修复 --- dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseEvaluateService.java | 43 +++++++++++++++++++++++++++++++++++++++---- 1 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseEvaluateService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseEvaluateService.java index aaa46dd..ab9dd93 100644 --- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseEvaluateService.java +++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseEvaluateService.java @@ -172,7 +172,7 @@ caseEvaluate.setCustId(loginUser.getCustId()); caseEvaluate.setUpdateTime(nowDate); this.saveOrUpdate(caseEvaluate); - // 结束流程 + // 查询当事人评价任务 QueryWrapper<CaseTask> caseTaskQueryWrapper = new QueryWrapper<>(); caseTaskQueryWrapper.eq("case_id", caseEvaluate.getCaseId()).eq("node_id", FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex()); CaseTask dsrpjCaseTask = caseTaskService.getOne(caseTaskQueryWrapper); @@ -180,15 +180,50 @@ dsrpjCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_2); dsrpjCaseTask.setHandleUserId(loginUser.getId()); dsrpjCaseTask.setHandleUserName(loginUser.getTrueName()); - dsrpjCaseTask.setHandleIllust("已受理"); dsrpjCaseTask.setHandleUserName(loginUser.getTrueName()); dsrpjCaseTask.setHandleResult(CaseTaskConsts.HANDLE_RESULT_1); dsrpjCaseTask.setHandleTime(nowDate); dsrpjCaseTask.setUpdateTime(nowDate); caseTaskService.updateCaseTask(dsrpjCaseTask); - // 完成当前待受理工作流任务 - flowInfoService.completeTask(dsrpjCaseTask.getFlowableId(), dsrpjCaseTask.getProcessTaskId(), + // 完成当前当事人评价工作流任务 + FlowNode dsrpjFlowNode = flowInfoService.completeTask(dsrpjCaseTask.getFlowableId(), dsrpjCaseTask.getProcessTaskId(), FlowableConsts.OPERATION_forward, userId); + // 默认完成结案归档任务 + CaseTask jagdCaseTask = new CaseTask(); + jagdCaseTask.setId(utilsClient.getNewTimeId()); + jagdCaseTask.setCaseId(caseEvaluate.getCaseId()); + jagdCaseTask.setFlowableId(dsrpjFlowNode.getFlowableId()); + jagdCaseTask.setProcessInstanceId(dsrpjFlowNode.getProcessInstanceId()); + jagdCaseTask.setProcessTaskId(dsrpjFlowNode.getProcessTaskId()); + jagdCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1); + jagdCaseTask.setNodeType(dsrpjFlowNode.getNodeType()); + jagdCaseTask.setNodeId(dsrpjFlowNode.getNodeId()); + jagdCaseTask.setNodeName(dsrpjFlowNode.getNodeName()); + jagdCaseTask.setFlowId(dsrpjFlowNode.getFlowId()); + jagdCaseTask.setNodeShowName(dsrpjFlowNode.getNodeShowName()); + jagdCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_1); + // 通过调度的,任务候选执行者类型是上一步骤选择 + jagdCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1); + jagdCaseTask.setCandeUnitId(dsrpjCaseTask.getCandeUnitId()); + jagdCaseTask.setCandeUnitName(dsrpjCaseTask.getCandeUnitName()); + // 系不需要签收 + jagdCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0); + jagdCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_2); + // 任务处理时限 + if (dsrpjFlowNode.getExpire() != 0) { + jagdCaseTask.setExpireTime(DateUtils.addDay(nowDate, dsrpjFlowNode.getExpire())); + } + jagdCaseTask.setHandleUnitName("系统自动"); + jagdCaseTask.setHandleResult(CaseTaskConsts.HANDLE_RESULT_1); + jagdCaseTask.setHandleTime(nowDate); + jagdCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0); + jagdCaseTask.setCustId(dsrpjCaseTask.getCustId()); + jagdCaseTask.setCreateTime(nowDate); + jagdCaseTask.setUpdateTime(nowDate); + caseTaskService.save(jagdCaseTask); + // 结束工作流流程 + flowInfoService.completeTask(jagdCaseTask.getFlowableId(), jagdCaseTask.getProcessTaskId(), + FlowableConsts.OPERATION_jb_zszz, "系统自动"); // 更新纠纷信息 CaseInfo caseInfoPO = new CaseInfo(); caseInfoPO.setId(dsrpjCaseTask.getCaseId()); -- Gitblit v1.8.0