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 a822c34c..16a5b924 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 @@ -1,5 +1,6 @@ package com.xujie.sys.modules.pms.data; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.xujie.sys.common.utils.QueryPage; import lombok.Data; @@ -24,6 +25,8 @@ public class ProjectProductionValidationDocumentData extends EamProjectPartInfoD private String OrderRef2; + private String OrderRef3; + /** * sys_oss表中的id */ @@ -83,4 +86,10 @@ public class ProjectProductionValidationDocumentData extends EamProjectPartInfoD private List selectedDocumentItems; private List projectAllDocumentConfirmatorList; + + @TableField(exist = false) + private String documentDefinitionListId; + + @TableField(exist = false) + private String createdBy; } diff --git 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 index a3ddc4e5..8e962b8a 100644 --- 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 @@ -362,6 +362,7 @@ public class EamProjectServiceImpl implements EamProjectService { for (ProjectProductionValidationDocumentData item : selectedDocumentItems) { item.setOrderRef1(String.valueOf(list.get(0).getProjectId())); item.setOrderRef2(String.valueOf(list.get(0).getProjectPartId())); + item.setOrderRef3(item.getDocumentDefinitionListId()); int maxItemNo = EamProjectMapper.getMaxItemNo2(item); item.setItemNo(maxItemNo + 1); EamProjectMapper.saveProductionValidationDocument(item); diff --git a/src/main/resources/mapper/pms/EamProjectMapper.xml b/src/main/resources/mapper/pms/EamProjectMapper.xml index 25cec637..10e75756 100644 --- a/src/main/resources/mapper/pms/EamProjectMapper.xml +++ b/src/main/resources/mapper/pms/EamProjectMapper.xml @@ -11,9 +11,9 @@ INSERT INTO plm_project_document_confirm_file_list - (site,Order_Ref1,Order_Ref2,Item_No,document_type,document_id) + (site,Order_Ref1,Order_Ref2,Item_No,document_type,document_id,Order_Ref3) VALUES - (#{site},#{orderRef1},#{orderRef2},#{itemNo},#{documentType},#{documentId}) + (#{site},#{orderRef1},#{orderRef2},#{itemNo},#{documentType},#{documentId},#{orderRef3}) INSERT INTO plm_project_document_confirm @@ -244,9 +244,18 @@