2024.6.27 产品文档收集优化

src/main/java/com/xujie/sys/modules/base/service/Impl/BaseServiceImpl.java

@@ -124,6 +124,7 @@ public class BaseServiceImpl implements BaseService {
         proofDocumentData.setOrderRef2(inData.getOrderRef2());
         proofDocumentData.setOrderRef3(inData.getOrderRef3());
         proofDocumentData.setOrderRef4(inData.getOrderRef4());
+        proofDocumentData.setCreatedBy(user.getUsername());
         //根据OrderRef1、OrderRef2、OrderRef3、OrderRef4查询是否已存在
         List<ProofDocumentData> proofDocumentDataList = baseMapper.queryProofDocument(proofDocumentData);
         //如果存在则更新

src/main/java/com/xujie/sys/modules/pms/data/EamDocumentTypeData.java

@@ -27,6 +27,8 @@ public class EamDocumentTypeData extends QueryPage {
      */
     private String documentType;
 
+    private String documentDesc;
+
     /**
      * 责任部门
      */
@@ -180,6 +182,14 @@ public class EamDocumentTypeData extends QueryPage {
         this.estimatedCompletionDays = estimatedCompletionDays;
     }
 
+    public String getDocumentDesc() {
+        return documentDesc;
+    }
+
+    public void setDocumentDesc(String documentDesc) {
+        this.documentDesc = documentDesc;
+    }
+
 //    public String getActive() {
 //        return active;
 //    }

src/main/resources/mapper/base/BaseMapper.xml

@@ -64,7 +64,7 @@
         values (#{site}, #{roleNo}, #{username})
     </insert>
     <insert id="saveProofDocument">
-        insert into plm_document_list_definition (site, proofing_id, document_type_id, project_id, manual_flag)
-        values (#{orderRef1}, #{orderRef2}, #{orderRef3}, #{orderRef4}, 'N')
+        insert into plm_document_list_definition (site, proofing_id, document_type_id, project_id, manual_flag,create_date,created_by)
+        values (#{orderRef1}, #{orderRef2}, #{orderRef3}, #{orderRef4}, 'N',getdate(),#{createdBy})
     </insert>
 </mapper>

src/main/resources/mapper/pms/ProofingInformationMapper.xml

@@ -111,10 +111,12 @@
             a.project_id,
             a.document_type_id,
             b.document_type,
+            c.document_desc,
             b.responsible_department,
             b.estimated_completion_days
         FROM plm_document_list_definition as a
                  LEFT JOIN document_type_definition as b ON a.document_type_id = b.document_type_id and a.site = b.site
+        left join CKT_MES_II_REAL.dbo.sys_oss as c on c.order_ref3 = a.document_type_id and c.order_ref2 = a.proofing_id and c.order_ref1 = a.site
         where a.proofing_id = #{query.proofingNo}
     </select>
     <delete id="deleteDocumentType">