From 592c8a2dcc33fd6eb32dbcfbaed4a16aab31d28d Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Mon, 14 Oct 2024 18:02:15 +0800
Subject: [PATCH] 1、线上来访、来访登记、自行排查流程优化 2、任务新增处理耗时、是否超时、超时小时记录

---
 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAssistApplyService.java |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAssistApplyService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAssistApplyService.java
index 1385ee0..013fddc 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAssistApplyService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAssistApplyService.java
@@ -213,32 +213,33 @@
                     String unitId = unitIdList[i];
                     String unitName = unitNameList[i];
                     // 启动联合处置工作流
-                    FlowNode dfpFlowNode = flowInfoService.startFlow(FlowableConsts.FLOWABLE_ID_LHCZ, caseAssistApplyPO.getCaseId());
-                    // 新建并完成配合部门待分派任务
+                    FlowNode dfpFlowNode = flowInfoService.startFlow(FlowableConsts.GZDYH_LHCZ_V1, caseAssistApplyPO.getCaseId());
+                    // 新建并完成配合组织待分派节点任务
                     CaseTask dfpCaseTask = new CaseTask();
                     dfpCaseTask.setId(utilsClient.getNewTimeId());
                     dfpCaseTask.setCaseId(caseAssistApplyPO.getCaseId());
                     dfpCaseTask.setFlowableId(dfpFlowNode.getFlowableId());
                     dfpCaseTask.setProcessInstanceId(dfpFlowNode.getProcessInstanceId());
                     dfpCaseTask.setProcessTaskId(dfpFlowNode.getProcessTaskId());
-                    dfpCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1);
                     dfpCaseTask.setNodeType(dfpFlowNode.getNodeType());
                     dfpCaseTask.setNodeId(dfpFlowNode.getNodeId());
                     dfpCaseTask.setNodeName(dfpFlowNode.getNodeName());
                     dfpCaseTask.setFlowId(dfpFlowNode.getFlowId());
                     dfpCaseTask.setNodeShowName(dfpFlowNode.getNodeShowName());
                     dfpCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_2);
-                    // 通过调度的,任务候选执行者类型是上一步骤选择
-                    dfpCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
-                    dfpCaseTask.setCandeUnitId(unitId);
-                    dfpCaseTask.setCandeUnitName(unitName);
-                    // 不需要签收
+                    // 任务所属单位:联合处置审核组织
+                    dfpCaseTask.setCandeUnitId(loginUser.getUnitId());
+                    dfpCaseTask.setCandeUnitName(loginUser.getUnitName());
+                    // 联合处置审核任务,不需要签收
                     dfpCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0);
                     dfpCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_2);
                     dfpCaseTask.setHandleUnitId(loginUser.getUnitId());
                     dfpCaseTask.setHandleUnitName(loginUser.getUnitName());
+                    dfpCaseTask.setHandleDeptId(loginUser.getDeptId());
+                    dfpCaseTask.setHandleDeptName(loginUser.getDeptName());
                     dfpCaseTask.setHandleUserId(loginUser.getId());
                     dfpCaseTask.setHandleUserName(loginUser.getTrueName());
+                    dfpCaseTask.setHandleResult(CaseTaskConsts.HANDLE_RESULT_1);
                     dfpCaseTask.setHandleContent(caseAssistApplyPO.getAuditContent());
                     dfpCaseTask.setHandleIllust("交办至:"+caseAssistApplyPO.getApplyAssistUnitName());
                     // 任务处理时限
@@ -250,35 +251,33 @@
                     dfpCaseTask.setCreateTime(now);
                     dfpCaseTask.setUpdateTime(now);
                     caseTaskService.save(dfpCaseTask);
-                    // 完成待分派任务
+                    // 完成待分派节点任务,进入待受理节点
                     FlowNode dslFlowNode = flowInfoService.completeTask(dfpCaseTask.getFlowableId(), dfpCaseTask.getProcessTaskId(),
                             FlowableConsts.OPERATION_forward, loginUser.getId());
-                    // 创建配合部门待受理任务
+                    // 创建待受理节点任务
                     CaseTask dslCaseTask = new CaseTask();
                     dslCaseTask.setId(utilsClient.getNewTimeId());
                     dslCaseTask.setCaseId(caseAssistApplyPO.getCaseId());
                     dslCaseTask.setFlowableId(dslFlowNode.getFlowableId());
                     dslCaseTask.setProcessInstanceId(dslFlowNode.getProcessInstanceId());
                     dslCaseTask.setProcessTaskId(dslFlowNode.getProcessTaskId());
-                    dslCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1);
                     dslCaseTask.setNodeType(dslFlowNode.getNodeType());
                     dslCaseTask.setNodeId(dslFlowNode.getNodeId());
                     dslCaseTask.setNodeName(dslFlowNode.getNodeName());
                     dslCaseTask.setFlowId(dslFlowNode.getFlowId());
                     dslCaseTask.setNodeShowName(dslFlowNode.getNodeShowName());
                     dslCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_2);
-                    // 通过调度的,任务候选执行者类型是上一步骤选择
-                    dslCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
+                    // 任务所属组织:联合处置组织
                     CtUnitDTO ctUnitDTO = custClient.getUnitById(unitId);
                     dslCaseTask.setCandeUnitId(ctUnitDTO.getId());
                     dslCaseTask.setCandeUnitName(ctUnitDTO.getUnitName());
-                    // 需要签收
+                    // 待受理任务,需要签收
                     dslCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_1);
-                    dslCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_1);
                     // 任务处理时限
                     if (dslFlowNode.getExpire() != 0) {
                         dslCaseTask.setExpireTime(DateUtils.addDay(now, dslFlowNode.getExpire()));
                     }
+                    dslCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_1);
                     dslCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
                     dslCaseTask.setCustId(caseAssistApplyPO.getCustId());
                     dslCaseTask.setCreateTime(now);
@@ -288,6 +287,7 @@
                     CaseAssistInfo caseAssistInfoPO = new CaseAssistInfo();
                     caseAssistInfoPO.setId(utilsClient.getNewTimeId());
                     caseAssistInfoPO.setCaseId(dslCaseTask.getCaseId());
+                    caseAssistInfoPO.setProcessInstanceId(dslCaseTask.getProcessInstanceId());
                     caseAssistInfoPO.setAssistUnitId(unitId);
                     caseAssistInfoPO.setAssistUnitName(unitName);
                     caseAssistInfoPO.setAssistStatus(CaseTaskConsts.ASSIST_STATUS_0);

--
Gitblit v1.8.0