From c8d390cd2762f3d4d6e7c66abaa5c41f9a6eb8fa Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Thu, 21 Nov 2024 11:44:25 +0800
Subject: [PATCH] 1127

---
 .../TechnicalSpecificationController.java     |  4 ++--
 .../dao/TechnicalSpecificationMapper.java     |  2 +-
 .../TechnicalSpecificationServiceImpl.java    |  8 +++++--
 .../TechnicalSpecificationService.java        |  2 +-
 .../TechnicalSpecificationMapper.xml          | 22 +++++++++----------
 5 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java b/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java
index b50af236..d6da22a2 100644
--- a/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java
+++ b/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java
@@ -1188,8 +1188,8 @@ public class TechnicalSpecificationController {
     @PostMapping(value="/getFinalPartData")
     @ResponseBody
     public R getFinalPartData(@RequestBody PlmProjectPartData data) {
-        List<PlmProjectPartData> rows= technicalSpecificationService.getFinalPartData(data);
-        return R.ok().put("rows",rows);
+        PageUtils page  = technicalSpecificationService.getFinalPartData(data);
+        return R.ok().put("page", page);
     }
 
 
diff --git a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java b/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java
index f29d9538..7faf0052 100644
--- a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java
+++ b/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java
@@ -1148,7 +1148,7 @@ public interface TechnicalSpecificationMapper {
 
     PlmTechnicalSpecificationSheetData getBMStatusDesc(@Param("site") String site, @Param("codeNo") String codeNo);
 
-    List<PlmProjectPartData> getFinalPartData(PlmProjectPartData data);
+    IPage<PlmProjectPartData> getFinalPartData(Page<PlmProjectPartData> page, @Param("query") PlmProjectPartData inData);
 
     PlmTechnicalSpecificationSheetData getOADetailForBM(PlmTechnicalSpecificationSheetData data);
 
diff --git a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java
index 69ff9aeb..3f4f58b4 100644
--- a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java
+++ b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java
@@ -1386,8 +1386,12 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
         }
     }
     @Override
-    public List<PlmProjectPartData> getFinalPartData(PlmProjectPartData data){
-       return technicalSpecificationMapper.getFinalPartData(data);
+    public PageUtils getFinalPartData(PlmProjectPartData inData){
+
+        IPage<PlmProjectPartData> resultList = technicalSpecificationMapper.getFinalPartData(
+                new Page<PlmProjectPartData>(inData.getPage(), inData.getLimit()), inData);
+        return new PageUtils(resultList);
+
     }
 
     @Override
diff --git a/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java b/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java
index cf840ffe..1db1743e 100644
--- a/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java
+++ b/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java
@@ -966,7 +966,7 @@ public interface TechnicalSpecificationService {
 
     String getBMStatusDesc(PlmTechnicalSpecificationSheetData data);
 
-    List<PlmProjectPartData> getFinalPartData(PlmProjectPartData data);
+    PageUtils getFinalPartData(PlmProjectPartData data);
 
 
     PlmTechnicalSpecificationSheetData getOADetailForBM(PlmTechnicalSpecificationSheetData data);
diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
index cab03160..cc94b83e 100644
--- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
+++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
@@ -1066,22 +1066,22 @@ step_id,reject_flag,reject_step_id,mpOperator,pod
          left join plm_project_info c on a.site = c.site and a.project_id = c.project_id
          left join plm_customer_part_info pcpi on a.site = pcpi.site and a.test_part_no = pcpi.part_no and c.customer_id = pcpi.customer_no
         <where>
-            and a.site=#{site}
+            and a.site=#{query.site}
 
-            <if test="projectId!= null and projectId != ''">
-                AND a.project_id like #{projectId}
+            <if test="query.projectId!= null and query.projectId != ''">
+                AND a.project_id like #{query.projectId}
             </if>
-            <if test="finalPartNo!= null and finalPartNo != ''">
-                AND a.Final_Part_No like #{finalPartNo}
+            <if test="query.finalPartNo!= null and query.finalPartNo != ''">
+                AND a.Final_Part_No like #{query.finalPartNo}
             </if>
-            <if test="customerPartNo!= null and customerPartNo != ''">
-                AND pcpi.customer_part_no like #{customerPartNo}
+            <if test="query.customerPartNo!= null and query.customerPartNo != ''">
+                AND pcpi.customer_part_no like #{query.customerPartNo}
             </if>
-            <if test="testPartNo!= null and testPartNo != ''">
-                AND a.Test_part_no like #{testPartNo}
+            <if test="query.testPartNo!= null and query.testPartNo != ''">
+                AND a.Test_part_no like #{query.testPartNo}
             </if>
-            <if test="partDesc!= null and partDesc != ''">
-                AND a.Part_desc like #{partDesc}
+            <if test="query.partDesc!= null and query.partDesc != ''">
+                AND a.Part_desc like #{query.partDesc}
             </if>
             and a.RealFlag='Y'
         </where>