From 5fd3bce4707cbd8307d1d15242501ccaf6b91e09 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 29 May 2025 11:22:06 +0800
Subject: [PATCH] 666

---
 .../spring/modules/change/vo/ProcessFormVo.java  |  4 ++++
 .../request/mapper/RequestManageMapper.java      |  4 ++++
 .../service/impl/RequestManageServiceImpl.java   | 16 ++++++++++++++--
 .../mapper/request/RequestManageMapper.xml       |  4 ++++
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/spring/modules/change/vo/ProcessFormVo.java b/src/main/java/com/spring/modules/change/vo/ProcessFormVo.java
index 64474e91..7ab77831 100644
--- a/src/main/java/com/spring/modules/change/vo/ProcessFormVo.java
+++ b/src/main/java/com/spring/modules/change/vo/ProcessFormVo.java
@@ -33,4 +33,8 @@ public class ProcessFormVo extends ProcessFormEntity {
     private String revisionNo;
 
     private String displayNo;
+
+    private Long countQty;
+
+    private String documentTypeDesc;
 }
diff --git a/src/main/java/com/spring/modules/request/mapper/RequestManageMapper.java b/src/main/java/com/spring/modules/request/mapper/RequestManageMapper.java
index 2a2aba7c..70ff5cc6 100644
--- a/src/main/java/com/spring/modules/request/mapper/RequestManageMapper.java
+++ b/src/main/java/com/spring/modules/request/mapper/RequestManageMapper.java
@@ -172,4 +172,8 @@ public interface RequestManageMapper extends BaseMapper<PlmRequestHeaderEntity>
     void updateIsRemarkToZero(@Param("id") Integer id);
 
     List<PlmProcessControllBaseData> getProcessSelect2(PlmProcessControllBaseData cData);
+
+    List<ProcessFormVo> getProcessFlowInformation2(@Param("site") String site, @Param("workflowId") String workflowId, @Param("documentNo") String documentNo, @Param("workflowName") String workflowName,
+                                                   @Param("nodeId") String nodeId, @Param("nodeName") String nodeName, @Param("createBy") String createBy, @Param("updateBy") String updateBy,
+                                                   @Param("documentType") String documentType, @Param("documentStatus") String documentStatus, @Param("page") int page, @Param("limit") int limit);
 }
diff --git a/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java b/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java
index 933f1c41..20bfeb9d 100644
--- a/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java
+++ b/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.spring.common.utils.Constant;
 import com.spring.common.utils.PageUtils;
+import com.spring.common.utils.SqlParamReplacer;
 import com.spring.modules.Tooling.service.impl.ProjectToolingApplyServiceImpl;
 import com.spring.modules.base.data.OaUserData;
 import com.spring.modules.base.entity.PlmProcessControllBaseData;
@@ -34,6 +35,7 @@ import com.spring.modules.request.service.RequestManageService;
 import com.spring.modules.request.vo.PlmRequestDetailVo;
 import com.spring.modules.request.vo.PlmRequestHeaderVo;
 import com.spring.modules.request.vo.TableDataVo;
+import com.spring.modules.sampleManagement.dao.TechnicalSpecificationMapper;
 import com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationSheetData;
 import com.spring.modules.sampleManagement.service.Impl.TechnicalSpecificationServiceImpl;
 import com.spring.modules.sys.dao.SysUserDao;
@@ -336,8 +338,18 @@ public class RequestManageServiceImpl extends ServiceImpl<RequestManageMapper, P
      */
     @Override
     public PageUtils getProcessFlowInformation(ProcessFormVo data) {
-        IPage<ProcessFormVo> resultList = this.requestManageMapper.getProcessFlowInformation(new Page<ProcessFormVo>(data.getPage(), data.getLimit()), data);
-        return new PageUtils(resultList);
+//        IPage<ProcessFormVo> resultList = this.requestManageMapper.getProcessFlowInformation(new Page<ProcessFormVo>(data.getPage(), data.getLimit()), data);
+//        return new PageUtils(resultList);
+
+        Long count = 0L;
+        // 通过存储过程获取查询结果
+        List<ProcessFormVo> list = this.requestManageMapper.getProcessFlowInformation2(data.getSite(), data.getWorkflowId(), data.getDocumentNo(),
+                data.getWorkflowName(), data.getNodeId(), data.getNodeName(), data.getCreateBy(), data.getUpdateBy(), data.getDocumentType(), data.getDocumentStatus(), data.getPage(), data.getLimit());
+        // 总条数
+        if (!list.isEmpty()) {
+            count = list.get(0).getCountQty();
+        }
+        return new PageUtils(list, count.intValue(), data.getPage(), data.getLimit());
     }
 
     /**
diff --git a/src/main/resources/mapper/request/RequestManageMapper.xml b/src/main/resources/mapper/request/RequestManageMapper.xml
index 80095f8f..37b5081d 100644
--- a/src/main/resources/mapper/request/RequestManageMapper.xml
+++ b/src/main/resources/mapper/request/RequestManageMapper.xml
@@ -493,4 +493,8 @@
         where b.remark is not null
         and a.site = #{site} and a.workflow_id = #{workflowId} and a.node_id = #{nodeId} and a.role_id = #{roleId}
     </select>
+
+    <select id="getProcessFlowInformation2" resultType="com.spring.modules.change.vo.ProcessFormVo">
+        EXEC dbo.get_process_form_infor #{site}, #{workflowId}, #{documentNo}, #{workflowName}, #{nodeId}, #{nodeName}, #{createBy}, #{updateBy}, #{documentType}, #{documentStatus}, #{page}, #{limit}
+    </select>
 </mapper>