From 7d1c6e902de71861706d1933b59882592d889301 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 27 二月 2025 09:51:52 +0800
Subject: [PATCH] 审批流

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java
index 72b02f5..9714146 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java
@@ -30,6 +30,7 @@
 import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.system.bo.*;
 import com.ruoyi.system.mapper.StateProcessTemplateMapper;
+import com.ruoyi.system.mapper.TContractMapper;
 import com.ruoyi.system.model.*;
 import com.ruoyi.system.service.*;
 import com.ruoyi.system.vo.ProcessDetailVO;
@@ -74,7 +75,7 @@
     @Autowired
     private ISysUserService sysUserService;
     @Autowired
-    private TContractService contractService;
+    private TContractMapper contractMapper;
 
     /**
      * 流程模版分页
@@ -361,7 +362,7 @@
         // 查询合同信息
         for (ProcessTaskListVO processTaskListVO : processTaskListVOS) {
             // 查询合同信息
-            TContract contract = contractService.getById(JSONObject.parseObject(processTaskListVO.getVariable()).getString("projectId"));
+            TContract contract = contractMapper.selectById(JSONObject.parseObject(processTaskListVO.getVariable()).getString("projectId"));
             processTaskListVO.setContract(contract);
         }
 
@@ -484,6 +485,9 @@
         if (ObjectUtil.isNotEmpty(startTime) && ObjectUtil.isNotEmpty(endTime)) {
             stateTaskQuery.between(StateTaskCenter::getCreateTime, startTime, endTime);
         }
+        if(Objects.isNull(processTaskListBO.getSortBy())){
+            processTaskListBO.setSortBy(2);
+        }
         if (processTaskListBO.getSortBy() == 1) {
             stateTaskQuery.orderByAsc(BaseModel::getCreateTime);
         }
@@ -500,7 +504,7 @@
         // 查询合同信息
         for (ProcessTaskListVO processTaskListVO : processTaskListVOS) {
             // 查询合同信息
-            TContract contract = contractService.getById(JSONObject.parseObject(processTaskListVO.getVariable()).getString("projectId"));
+            TContract contract = contractMapper.selectById(JSONObject.parseObject(processTaskListVO.getVariable()).getString("projectId"));
             processTaskListVO.setContract(contract);
         }
 
@@ -595,7 +599,7 @@
         // 查询合同信息
         for (ProcessTaskListVO processTaskListVO : processTaskListVOS) {
             // 查询合同信息
-            TContract contract = contractService.getById(JSONObject.parseObject(processTaskListVO.getVariable()).getString("projectId"));
+            TContract contract = contractMapper.selectById(JSONObject.parseObject(processTaskListVO.getVariable()).getString("projectId"));
             processTaskListVO.setContract(contract);
         }
 
@@ -715,6 +719,9 @@
         if (ObjectUtil.isNotEmpty(startTime) && ObjectUtil.isNotEmpty(endTime)) {
             stateTaskQuery.between(StateTaskCenter::getCreateTime, startTime, endTime);
         }
+        if(Objects.isNull(processTaskListBO.getSortBy())){
+            processTaskListBO.setSortBy(2);
+        }
         if (processTaskListBO.getSortBy() == 1) {
             stateTaskQuery.orderByAsc(BaseModel::getCreateTime);
         }
@@ -730,7 +737,7 @@
         // 查询合同信息
         for (ProcessTaskListVO processTaskListVO : processTaskListVOS) {
             // 查询合同信息
-            TContract contract = contractService.getById(JSONObject.parseObject(processTaskListVO.getVariable()).getString("projectId"));
+            TContract contract = contractMapper.selectById(JSONObject.parseObject(processTaskListVO.getVariable()).getString("projectId"));
             processTaskListVO.setContract(contract);
         }
 
@@ -1174,14 +1181,14 @@
         if(Objects.nonNull(flwTask)){
             instanceId = flwTask.getInstanceId();
             // 查询合同信息
-            contract = contractService.getById(JSONObject.parseObject(flwTask.getVariable()).getString("projectId"));
+            contract = contractMapper.selectById(JSONObject.parseObject(flwTask.getVariable()).getString("projectId"));
         }else {
             FlwHisTask flwHisTask = flwHisTaskMapper.selectById(Long.valueOf(taskId));
             if(Objects.isNull(flwHisTask)){
                 throw new GlobalException("流程不存在");
             }
             instanceId = flwHisTask.getInstanceId();
-            contract = contractService.getById(Objects.requireNonNull(JSONObject.parseObject(flwHisTask.getVariable())).getString("projectId"));
+            contract = contractMapper.selectById(Objects.requireNonNull(JSONObject.parseObject(flwHisTask.getVariable())).getString("projectId"));
         }
         BeanUtil.copyProperties(contract, processDetailVO);
 
@@ -1230,6 +1237,9 @@
         if (ObjectUtil.isNotEmpty(startTime) && ObjectUtil.isNotEmpty(endTime)) {
             stateTaskQuery.between(FlwHisTask::getCreateTime, startTime, endTime);
         }
+        if(Objects.isNull(processTaskListBO.getSortBy())){
+            processTaskListBO.setSortBy(2);
+        }
         if (processTaskListBO.getSortBy() == 1) {
             stateTaskQuery.orderByAsc(FlwHisTask::getCreateTime);
         }
@@ -1246,7 +1256,7 @@
         // 查询合同信息
         for (ProcessTaskListVO processTaskListVO : processTaskListVOS) {
             // 查询合同信息
-            TContract contract = contractService.getById(JSONObject.parseObject(processTaskListVO.getVariable()).getString("projectId"));
+            TContract contract = contractMapper.selectById(JSONObject.parseObject(processTaskListVO.getVariable()).getString("projectId"));
             processTaskListVO.setContract(contract);
         }
 

--
Gitblit v1.7.1