2025.0210 文档收集优化

1 year ago · d1be691048
6 changed files with 77 additions and 8 deletions
--- a/src/main/java/com/xujie/sys/modules/pms/data/ProofDocumentData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/ProofDocumentData.java
@ -90,6 +90,9 @@ public class ProofDocumentData extends ProofingInformationData {
    @TableField(exist = false)
    private Integer emailInfoType;

+    @TableField(exist = false)
+    private String overdueFlag;
+
    public Integer getUserId() {
        return userId;
    }
--- a/src/main/java/com/xujie/sys/modules/pms/data/ProofingInformationData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/ProofingInformationData.java
@ -99,6 +99,9 @@ public class ProofingInformationData extends EamProjectPartInfoData {
    private Date createDate;
    private String projectPhase;

+    @TableField(exist = false)
+    private String overdueFlag;
+
    public String getProjectDesc() {
        return projectDesc;
    }
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java
@ -1028,6 +1028,7 @@ public class EamProjectServiceImpl implements EamProjectService {
        s.append("<th style='border: 1px solid #dddddd; text-align: center; padding: 8px;'>样品单号</th>");
        s.append("<th style='border: 1px solid #dddddd; text-align: center; padding: 8px;'>预计完成日期</th>");
        s.append("<th style='border: 1px solid #dddddd; text-align: center; padding: 8px;'>待上传文档</th>");
+        s.append("<th style='border: 1px solid #dddddd; text-align: center; padding: 8px;'>文档状态</th>");
        s.append("</tr>");
        // 遍历 emailAddress
        Integer lastProjectId = null;
@ -1073,6 +1074,7 @@ public class EamProjectServiceImpl implements EamProjectService {
                    s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(proofingInformationData.getProofingNo()).append("</td>");
                    s.append("<td style='border: 1px solid #dddddd; text-align: center; padding: 8px;'>").append(formatter.format(proofingInformationData.getDueDate())).append("</td>");
                    s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(projectPartLink).append("</td>");
+                    s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(proofingInformationData.getOverdueFlag()).append("</td>");
                    s.append("</tr>");
                } else if (!Objects.equals(lastProofingNo, proofingInformationData.getProofingNo())) {   // 判断如果与上一个ProofingNo不同
                    lastProofingNo = proofingInformationData.getProofingNo();
@ -1099,6 +1101,7 @@ public class EamProjectServiceImpl implements EamProjectService {
                        s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(proofingInformationData.getProofingNo()).append("</td>");
                    s.append("<td style='border: 1px solid #dddddd; text-align: center; padding: 8px;'>").append(formatter.format(proofingInformationData.getDueDate())).append("</td>");
                    s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(projectPartLink).append("</td>");
+                    s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(proofingInformationData.getOverdueFlag()).append("</td>");
                    s.append("</tr>");
                } else {
                    s.append("<tr>");
@ -1123,6 +1126,7 @@ public class EamProjectServiceImpl implements EamProjectService {
                    s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(proofingInformationData.getProofingNo()).append("</td>");
                    s.append("<td style='border: 1px solid #dddddd; text-align: center; padding: 8px;'>").append(formatter.format(proofingInformationData.getDueDate())).append("</td>");
                    s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(projectPartLink).append("</td>");
+                    s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(proofingInformationData.getOverdueFlag()).append("</td>");
                    s.append("</tr>");
                }
            } else {
@ -1151,6 +1155,7 @@ public class EamProjectServiceImpl implements EamProjectService {
                    s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(proofingInformationData.getProofingNo()).append("</td>");
                    s.append("<td style='border: 1px solid #dddddd; text-align: center; padding: 8px;'>").append(formatter.format(proofingInformationData.getDueDate())).append("</td>");
                    s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(projectPartLink).append("</td>");
+                    s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(proofingInformationData.getOverdueFlag()).append("</td>");
                    s.append("</tr>");
                } else if (!Objects.equals(lastProofingNo, proofingInformationData.getProofingNo())) {  // 判断这条数据的打样单号与上一条数据的打样单号是否相同
                    lastProofingNo = proofingInformationData.getProofingNo();
@ -1238,6 +1243,7 @@ public class EamProjectServiceImpl implements EamProjectService {
                        s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(proofingInformationData.getProofingNo()).append("</td>");
                    s.append("<td style='border: 1px solid #dddddd; text-align: center; padding: 8px;'>").append(formatter.format(proofingInformationData.getDueDate())).append("</td>");
                    s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(projectPartLink).append("</td>");
+                    s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(proofingInformationData.getOverdueFlag()).append("</td>");
                    s.append("</tr>");
                } else {
                    s.append("<tr>");
@ -1284,6 +1290,7 @@ public class EamProjectServiceImpl implements EamProjectService {
                        }
                    }
                    s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(projectPartLink).append("</td>");
+                    s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(proofingInformationData.getOverdueFlag()).append("</td>");
                    s.append("</tr>");
                }
            }
--- 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
@ -333,18 +333,33 @@ public class ProofingInformationServiceImpl implements ProofingInformationServic

    @Override
    public PageUtils getPendingUploads(String userId,ProofDocumentData data) {
+        if (data.getUploadedFlag().equals("Y")){
+            data.setUploadedFlag("已上传");
+        } else if (data.getUploadedFlag().equals("N")){
+            data.setUploadedFlag("未上传");
+        }
        IPage<ProofDocumentData> pendingUploads = proofingInformationMapper.getPendingUploads(new Page<>(data.getPage(), data.getLimit()),userId,data);
        return new PageUtils(pendingUploads);
    }

    @Override
    public PageUtils getOverdueUploads(String userId,ProofDocumentData data) {
+        if (data.getUploadedFlag().equals("Y")){
+            data.setUploadedFlag("已上传");
+        } else if (data.getUploadedFlag().equals("N")){
+            data.setUploadedFlag("未上传");
+        }
        IPage<ProofDocumentData> overdueUploads = proofingInformationMapper.getOverdueUploads(new Page<>(data.getPage(), data.getLimit()),userId,data);
        return new PageUtils(overdueUploads);
    }

    @Override
    public PageUtils getAllUploads(String userId, ProofDocumentData data) {
+        if (data.getUploadedFlag().equals("Y")){
+            data.setUploadedFlag("已上传");
+        } else if (data.getUploadedFlag().equals("N")){
+            data.setUploadedFlag("未上传");
+        }
        IPage<ProofDocumentData> allUploads = proofingInformationMapper.getAllUploads(new Page<>(data.getPage(), data.getLimit()), userId,data);
        return new PageUtils(allUploads);
    }
--- a/src/main/resources/mapper/pms/AgencyMatterMapper.xml
+++ b/src/main/resources/mapper/pms/AgencyMatterMapper.xml
@ -18,13 +18,13 @@
    <select id="getPendingUploads" resultType="com.xujie.sys.modules.pms.data.EamProjectPartInfoData">
        <![CDATA[
        SELECT * FROM view_plm_toupload_list_byUser
-        WHERE status != '草稿' AND uploaded_flag = 'N' AND RelatedPerson = #{userId}
+        WHERE status != '草稿' AND uploaded_flag != '已上传' AND RelatedPerson = #{userId}
        ]]>
    </select>
    <select id="getOverdueUploads" resultType="com.xujie.sys.modules.pms.data.EamProjectPartInfoData">
        <![CDATA[
        SELECT * FROM view_plm_toupload_list_byUser
-        WHERE status != '草稿' AND uploaded_flag = 'N' AND Request_date < GETDATE() AND RelatedPerson = #{userId}
+        WHERE status != '草稿' AND uploaded_flag != '已上传' AND Request_date < GETDATE() AND RelatedPerson = #{userId}
        ]]>
    </select>
    <select id="getPendingConfirmations" resultType="com.xujie.sys.modules.pms.data.EamProjectPartInfoData">
--- a/src/main/resources/mapper/pms/ProofingInformationMapper.xml
+++ b/src/main/resources/mapper/pms/ProofingInformationMapper.xml
@ -13,6 +13,7 @@
    <update id="updateProofingInfoById">
        UPDATE plm_proofing_information
        SET
+            proofing_no = #{proofingNo},
            proofing_number = #{proofingNumber},
            plan_start_date = #{planStartDate},
            required_delivery_date = #{requiredDeliveryDate},
@ -137,7 +138,7 @@
        DELETE FROM plm_document_list_definition WHERE id = #{documentDefinitionListId}
    </delete>
    <select id="selecProofingOne" resultType="com.xujie.sys.modules.pms.data.ProofingInformationData">
-        SELECT * FROM plm_proofing_information WHERE id = #{proofingId}
+        SELECT *,id as proofing_id FROM plm_proofing_information WHERE id = #{proofingId}
    </select>

    <!-- 查询documentTypeId列表 -->
@ -265,7 +266,23 @@
                and project_desc like #{query.projectDesc}
            </if>
            <if test="query.uploadedFlag != null and query.uploadedFlag != ''">
-            and uploaded_flag = #{query.uploadedFlag}
+                <choose>
+                    <when test="query.uploadedFlag == '已上传'">
+                        <![CDATA[
+                    AND uploaded_flag = '已上传'
+                            ]]>
+                    </when>
+                    <when test="query.uploadedFlag == '未上传'">
+                        <![CDATA[
+                    AND uploaded_flag != '已上传'
+                            ]]>
+                    </when>
+                    <otherwise>
+                        <![CDATA[
+                    AND uploaded_flag = #{query.uploadedFlag, jdbcType=VARCHAR}
+                            ]]>
+                    </otherwise>
+                </choose>
            </if>
            <if test="query.testPartNo != null and query.testPartNo != ''">
                AND (
@ -346,9 +363,23 @@
        ]]>
        </if>
        <if test="query.uploadedFlag != null and query.uploadedFlag != ''">
-            <![CDATA[
-            and uploaded_flag = #{query.uploadedFlag}
-                    ]]>
+            <choose>
+                <when test="query.uploadedFlag == '已上传'">
+                    <![CDATA[
+                    AND uploaded_flag = '已上传'
+                            ]]>
+                </when>
+                <when test="query.uploadedFlag == '未上传'">
+                    <![CDATA[
+                    AND uploaded_flag != '已上传'
+                            ]]>
+                </when>
+                <otherwise>
+                        <![CDATA[
+                    AND uploaded_flag = #{query.uploadedFlag, jdbcType=VARCHAR}
+                            ]]>
+                </otherwise>
+            </choose>
        </if>
        <if test="query.testPartNo != null and query.testPartNo != ''">
            <![CDATA[
@ -447,7 +478,17 @@
                )
            </if>
            <if test="query.uploadedFlag != null and query.uploadedFlag != ''">
-                and uploaded_flag = #{query.uploadedFlag}
+                <choose>
+                    <when test="query.uploadedFlag == '已上传'">
+                        AND uploaded_flag = '已上传'
+                    </when>
+                    <when test="query.uploadedFlag == '未上传'">
+                        AND uploaded_flag != '已上传'
+                    </when>
+                    <otherwise>
+                        AND uploaded_flag = #{query.uploadedFlag, jdbcType=VARCHAR}
+                    </otherwise>
+                </choose>
            </if>
            <if test="query.projectDesc != null and query.projectDesc != ''">
                and project_desc like #{query.projectDesc}