From f4e5da604604308b9f754de7e863c180fcedd8c9 Mon Sep 17 00:00:00 2001
From: xusd <330628789@qq.com>
Date: Tue, 24 Jun 2025 21:03:12 +0800
Subject: [PATCH] fix:超时办件优化

---
 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseEvaluateService.java |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 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 c9329ce..460b21e 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
@@ -266,7 +266,7 @@
             Date nowDate = DateUtils.getNowDate();
             // 查询当事人评价任务
             QueryWrapper<CaseTask> caseTaskQueryWrapper = new QueryWrapper<>();
-            caseTaskQueryWrapper.in("case_id", idList).eq("node_id", FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex());
+            caseTaskQueryWrapper.in("case_id", idList).eq("node_id", FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex()).orderByDesc("create_time");
             List<CaseTask> dsrpjCaseTaskList = caseTaskService.list(caseTaskQueryWrapper);
             for(CaseTask dsrpjCaseTask: dsrpjCaseTaskList){
                 // 完成当前当事人评价节点任务
@@ -285,14 +285,19 @@
                 CaseTask jagdCaseTask = new CaseTask();
                 jagdCaseTask.setId(utilsClient.getNewTimeId());
                 jagdCaseTask.setCaseId(dsrpjCaseTask.getCaseId());
-                jagdCaseTask.setFlowableId(jagdFlowNode.getFlowableId());
-                jagdCaseTask.setProcessInstanceId(jagdFlowNode.getProcessInstanceId());
-                jagdCaseTask.setProcessTaskId(jagdFlowNode.getProcessTaskId());
-                jagdCaseTask.setNodeType(jagdFlowNode.getNodeType());
-                jagdCaseTask.setNodeId(jagdFlowNode.getNodeId());
-                jagdCaseTask.setNodeName(jagdFlowNode.getNodeName());
-                jagdCaseTask.setFlowId(jagdFlowNode.getFlowId());
-                jagdCaseTask.setNodeShowName(jagdFlowNode.getNodeShowName());
+                if(jagdFlowNode!=null){
+                    jagdCaseTask.setFlowableId(jagdFlowNode.getFlowableId());
+                    jagdCaseTask.setProcessInstanceId(jagdFlowNode.getProcessInstanceId());
+                    jagdCaseTask.setProcessTaskId(jagdFlowNode.getProcessTaskId());
+                    jagdCaseTask.setNodeType(jagdFlowNode.getNodeType());
+                    jagdCaseTask.setNodeId(jagdFlowNode.getNodeId());
+                    jagdCaseTask.setNodeName(jagdFlowNode.getNodeName());
+                    jagdCaseTask.setFlowId(jagdFlowNode.getFlowId());
+                    jagdCaseTask.setNodeShowName(jagdFlowNode.getNodeShowName());
+                    if (jagdFlowNode.getExpire() != 0) {
+                        jagdCaseTask.setExpireTime(syHolidayService.getExpiryDay(nowDate, jagdFlowNode.getExpire()));
+                    }
+                }
                 jagdCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_1);
                 // 任务所属单位:结案申请组织
                 caseTaskQueryWrapper.clear();
@@ -306,9 +311,6 @@
                 jagdCaseTask.setReadStatus(CaseTaskConsts.READ_STATUS_0);
                 jagdCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_2);
                 // 任务处理时限
-                if (jagdFlowNode.getExpire() != 0) {
-                    jagdCaseTask.setExpireTime(syHolidayService.getExpiryDay(nowDate, jagdFlowNode.getExpire()));
-                }
                 jagdCaseTask.setHandleUnitId(jasqCaseTaskList.get(0).getHandleUnitId());
                 jagdCaseTask.setHandleUnitName(jasqCaseTaskList.get(0).getHandleUnitName());
                 jagdCaseTask.setHandleDeptId(jasqCaseTaskList.get(0).getHandleDeptId());

--
Gitblit v1.8.0