From ea456d377ef0fee31887616a42d0dc8aebee3cb0 Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Mon, 9 Sep 2024 19:20:36 +0800
Subject: [PATCH] =?UTF-8?q?2024.9.9=20=E4=BA=A7=E5=93=81=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E6=94=B6=E9=9B=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProofingInformationController.java        |  3 +-
 .../pms/mapper/ProofingInformationMapper.java |  2 +
 .../Impl/ProofingInformationServiceImpl.java  |  5 ++
 .../service/ProofingInformationService.java   |  2 +
 .../mapper/pms/ProofingInformationMapper.xml  | 47 +++++++++++++++++++
 5 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/ProofingInformationController.java b/src/main/java/com/xujie/sys/modules/pms/controller/ProofingInformationController.java
index 7af0b21f..a3f36e68 100644
--- a/src/main/java/com/xujie/sys/modules/pms/controller/ProofingInformationController.java
+++ b/src/main/java/com/xujie/sys/modules/pms/controller/ProofingInformationController.java
@@ -199,7 +199,8 @@ public class ProofingInformationController {
     public R searchAllConfirmProgressList(@RequestBody ProjectProductionValidationDocumentData inData) {
         String userId = String.valueOf(((SysUserEntity) SecurityUtils.getSubject().getPrincipal()).getUserId());
         PageUtils page = proofingInformationService.getAllConfirmations(userId,inData);
-        return R.ok().put("page", page);
+        List<ProjectProductionValidationDocumentData> list = proofingInformationService.getAllConfirmationsList(userId,inData);
+        return R.ok().put("page", page).put("list", list);
     }
 
     @PostMapping(value = "/searchOverConfirmProgressList")
diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/ProofingInformationMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/ProofingInformationMapper.java
index c25ab51c..02f6324d 100644
--- a/src/main/java/com/xujie/sys/modules/pms/mapper/ProofingInformationMapper.java
+++ b/src/main/java/com/xujie/sys/modules/pms/mapper/ProofingInformationMapper.java
@@ -90,4 +90,6 @@ public interface ProofingInformationMapper extends BaseMapper<ProofingInformatio
     void getDocumentOwnerEmail(ProofDocumentData data);
 
     List<ProofDocumentData> getAllUploadsList(String userId,@Param("query")  ProofDocumentData data);
+
+    List<ProjectProductionValidationDocumentData> getAllConfirmationsList(String userId,@Param("query") ProjectProductionValidationDocumentData inData);
 }
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/ProofingInformationServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/ProofingInformationServiceImpl.java
index 6d7b2ede..b2dda20b 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/ProofingInformationServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/ProofingInformationServiceImpl.java
@@ -373,6 +373,11 @@ public class ProofingInformationServiceImpl implements ProofingInformationServic
         return new PageUtils(allConfirmations);
     }
 
+    @Override
+    public List<ProjectProductionValidationDocumentData> getAllConfirmationsList(String userId, ProjectProductionValidationDocumentData inData) {
+        return proofingInformationMapper.getAllConfirmationsList(userId, inData);
+    }
+
     @Override
     public boolean saveBatch(Collection<ProofingInformationData> entityList, int batchSize) {
         return false;
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/ProofingInformationService.java b/src/main/java/com/xujie/sys/modules/pms/service/ProofingInformationService.java
index 8d16670e..6f6f602c 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/ProofingInformationService.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/ProofingInformationService.java
@@ -54,5 +54,7 @@ public interface ProofingInformationService extends IService<ProofingInformation
 
     PageUtils getAllConfirmations(String userId, ProjectProductionValidationDocumentData inData);
 
+    List<ProjectProductionValidationDocumentData> getAllConfirmationsList(String userId, ProjectProductionValidationDocumentData inData);
+
     List<ProofDocumentData> getAllUploadsList(String userId, ProofDocumentData data);
 }
diff --git a/src/main/resources/mapper/pms/ProofingInformationMapper.xml b/src/main/resources/mapper/pms/ProofingInformationMapper.xml
index 63d88d2d..dff6c579 100644
--- a/src/main/resources/mapper/pms/ProofingInformationMapper.xml
+++ b/src/main/resources/mapper/pms/ProofingInformationMapper.xml
@@ -637,6 +637,53 @@
         </where>
         order by project_id
     </select>
+    <select id="getAllConfirmationsList"
+            resultType="com.xujie.sys.modules.pms.data.ProjectProductionValidationDocumentData">
+        SELECT * FROM view_plm_toproconfirm_list_byUser
+        <where>
+            status != '草稿'
+            <if test="query.projectNo != null and query.projectNo != ''">
+                AND (
+                project_no = #{query.projectNo}
+                OR project_no IN (
+                SELECT Value FROM CKT_MES_II_REAL.dbo.SplitString(#{query.projectNo}, ',')
+                )
+                )
+            </if>
+            <if test="query.projectDesc != null and query.projectDesc != ''">
+                and project_desc like #{query.projectDesc}
+            </if>
+            <if test="query.testPartNo != null and query.testPartNo != ''">
+                AND (
+                test_part_no = #{query.testPartNo}
+                OR test_part_no IN (
+                SELECT Value FROM CKT_MES_II_REAL.dbo.SplitString(#{query.testPartNo}, ',')
+                )
+                )
+            </if>
+            <if test="query.customerNo != null and query.customerNo != ''">
+                and customer_no = like #{query.customerNo}
+            </if>
+            <if test="query.customerDesc != null and query.customerDesc != ''">
+                and customer_desc = like #{query.customerDesc}
+            </if>
+            <if test="query.buDesc != null and query.buDesc != ''">
+                AND dbo.get_bu_desc ( site, bu_no ) = #{query.buDesc}
+            </if>
+            <if test="query.projectCategory != null and query.projectCategory != ''">
+                and project_category = #{query.projectCategory}
+            </if>
+            <if test="query.status != null and query.status != ''">
+                and status = #{query.status}
+            </if>
+            <if test="query.startDate != null ">
+                AND build_date >= #{query.startDate}
+            </if>
+            <if test="query.endDate != null ">
+                AND #{query.endDate} >= build_date
+            </if>
+        </where>
+    </select>
 
     <!-- 插入文档 -->
     <insert id="insertDocument" parameterType="map">