2024.7.26 ①产品文档收集-项目信息进一步优化

②代办事宜功能第一版

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;
-
     /**
      * 文件名
      */

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;

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>

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>