From ae21be349a291c3313e8975578e114f4524bf12f Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Fri, 26 Jul 2024 13:16:15 +0800
Subject: [PATCH] =?UTF-8?q?2024.7.26=20=E2=91=A0=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=94=B6=E9=9B=86-=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=BF=9B=E4=B8=80=E6=AD=A5=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=20=E2=91=A1=E4=BB=A3=E5=8A=9E=E4=BA=8B=E5=AE=9C=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E7=AC=AC=E4=B8=80=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectProductionValidationDocumentData.java   | 14 +-------------
 .../modules/pms/data/ProofingInformationData.java  |  2 +-
 .../resources/mapper/pms/AgencyMatterMapper.xml    |  4 ++--
 .../mapper/pms/ProofingInformationMapper.xml       | 10 +++++++---
 4 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/data/ProjectProductionValidationDocumentData.java b/src/main/java/com/xujie/sys/modules/pms/data/ProjectProductionValidationDocumentData.java
index 2d4bab07..c9121e64 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/ProjectProductionValidationDocumentData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/ProjectProductionValidationDocumentData.java
@@ -15,7 +15,7 @@ import java.util.List;
  * @return:
  */
 @Data
-public class ProjectProductionValidationDocumentData extends QueryPage {
+public class ProjectProductionValidationDocumentData extends EamProjectInfoData {
 
     private String site;
 
@@ -65,18 +65,6 @@ public class ProjectProductionValidationDocumentData extends QueryPage {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private String confirmedDate;
 
-    /**
-     * 推送日期
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private String createDate;
-
-    /**
-     * 推送人
-     */
-    private String createBy;
-
     /**
      * 文件名
      */
diff --git a/src/main/java/com/xujie/sys/modules/pms/data/ProofingInformationData.java b/src/main/java/com/xujie/sys/modules/pms/data/ProofingInformationData.java
index 34b3e958..c43c54db 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/ProofingInformationData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/ProofingInformationData.java
@@ -19,7 +19,7 @@ import java.util.List;
  * @return:
  */
 @Data
-public class ProofingInformationData extends QueryPage {
+public class ProofingInformationData extends EamProjectInfoData {
     private Integer id;
         private String site;
         private String buNo;
diff --git a/src/main/resources/mapper/pms/AgencyMatterMapper.xml b/src/main/resources/mapper/pms/AgencyMatterMapper.xml
index c984f319..6c0140aa 100644
--- a/src/main/resources/mapper/pms/AgencyMatterMapper.xml
+++ b/src/main/resources/mapper/pms/AgencyMatterMapper.xml
@@ -5,13 +5,13 @@
 
     <select id="getUnfinishedProjects" resultType="com.xujie.sys.modules.pms.data.EamProjectInfoData">
         <![CDATA[
-        SELECT * FROM view_plm_project_byUser
+        SELECT DISTINCT  * FROM view_plm_project_byUser
         WHERE status != '草稿' AND status != '已结案' AND RelatedPerson = #{userId}
         ]]>
     </select>
     <select id="getAllProjects" resultType="com.xujie.sys.modules.pms.data.EamProjectInfoData">
         <![CDATA[
-        SELECT * FROM view_plm_project_byUser
+        SELECT DISTINCT * FROM view_plm_project_byUser
         WHERE status != '草稿' AND RelatedPerson = #{userId}
         ]]>
     </select>
diff --git a/src/main/resources/mapper/pms/ProofingInformationMapper.xml b/src/main/resources/mapper/pms/ProofingInformationMapper.xml
index 67888c47..cbeecae9 100644
--- a/src/main/resources/mapper/pms/ProofingInformationMapper.xml
+++ b/src/main/resources/mapper/pms/ProofingInformationMapper.xml
@@ -176,7 +176,7 @@
         SELECT
             a.document_type_id,
             a.document_type,
-            a.responsible_department,
+            (SELECT role_desc FROM business_role WHERE role_no = a.responsible_department) AS responsible_department,
             a.estimated_completion_days
         FROM document_type_definition as a
         where
@@ -241,21 +241,25 @@
     <select id="getPendingUploads" resultType="com.xujie.sys.modules.pms.data.ProofDocumentData">
         SELECT * FROM view_plm_toupload_list_byUser
         WHERE status != '草稿' AND uploaded_flag = 'N' AND RelatedPerson = #{userId}
+        order by project_id
     </select>
     <select id="getOverdueUploads" resultType="com.xujie.sys.modules.pms.data.ProofDocumentData">
     <![CDATA[
         SELECT * FROM view_plm_toupload_list_byUser
         WHERE status != '草稿' AND uploaded_flag = 'N' AND Request_date < GETDATE() AND RelatedPerson = #{userId}
+        order by project_id
         ]]>
     </select>
     <select id="getPendingConfirmations" resultType="com.xujie.sys.modules.pms.data.ProjectProductionValidationDocumentData">
         SELECT * FROM view_plm_toproconfirm_list_byUser
-        WHERE confirm_flag = 'N' AND RelatedPerson = #{userId}
+        WHERE status != '草稿' AND confirm_flag = 'N' AND RelatedPerson = #{userId}
+        order by project_id
     </select>
     <select id="getOverdueConfirmations" resultType="com.xujie.sys.modules.pms.data.ProjectProductionValidationDocumentData">
         <![CDATA[
         SELECT * FROM view_plm_toproconfirm_list_byUser
-        WHERE confirm_flag = 'N' AND wanted_confirm_date < GETDATE() AND RelatedPerson = #{userId}
+        WHERE status != '草稿' AND confirm_flag = 'N' AND wanted_confirm_date < GETDATE() AND RelatedPerson = #{userId}
+        order by project_id
         ]]>
     </select>