文档增加属性

inet-doc-expand-common/src/main/java/com/yonde/dcs/document/expand/entity/DxDocumentVOExpand.java

@@ -41,6 +41,7 @@ import com.inet.dcs.document.common.vo.ExtReviewDocComLinkVO;
 import com.inet.dcs.document.common.vo.ExtObsoleteDocLinkVO;
 import com.inet.dcs.document.common.vo.ExtRefDesignInputLinkVO;
 import com.inet.dcs.document.common.vo.ExtTechStandardLinkVO;
+import com.yonde.dex.user.common.vo.DxUserInfoVO;
 import com.inet.dcs.document.common.vo.ExtObjectDocLinkVO;
 import com.inet.dcs.document.common.vo.ExtRefContractDocVO;
 import com.inet.dcs.document.common.vo.ExtInterfaceInfoLinkVO;
@@ -49,7 +50,7 @@ import com.inet.dcs.document.common.vo.ExtInterfaceInfoLinkVO;
 * @description: DxDocument-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-30 9:36:21
+* @date: 2024-11-7 10:51:28
 **/
 @EqualsAndHashCode
 @Data
@@ -61,6 +62,9 @@ public class DxDocumentVOExpand<V extends DxDocumentVOPluginExpand> implements S
     public static final String CHECK_CONTENT_PROP_NAME = "checkContent";
     public static final String CHECK_STANDARD_REVIEW_PROP_NAME = "checkStandardReview";
     public static final String DRAWING_CODE_PROP_NAME = "drawingCode";
+    public static final String DX_REFUND_PERSON_USER_PROP_NAME = "dxRefundPersonUser";
+    public static final String DX_REFUND_PERSON_USER_ID_PROP_NAME = "dxRefundPersonUserId";
+    public static final String DX_REFUND_PERSON_USER_ID_TYPE_PROP_NAME = "dxRefundPersonUserIdType";
     public static final String EXT_AUDIT_RECORD_CARD_LINKS_PROP_NAME = "extAuditRecordCardLinks";
     public static final String EXT_COM_DOC_LINKS_PROP_NAME = "extComDocLinks";
     public static final String EXT_INTERFACE_DOC_LINKS_PROP_NAME = "extInterfaceDocLinks";
@@ -125,8 +129,10 @@ public class DxDocumentVOExpand<V extends DxDocumentVOPluginExpand> implements S
     public static final String TARGET_EXT_SEND_FORM_LINK_PROP_NAME = "targetExtSendFormLink";
     public static final String TARGET_EXT_TECH_STANDARD_LINK_PROP_NAME = "targetExtTechStandardLink";
     public static final String THREE_LEV_CATEGORY_PROP_NAME = "threeLevCategory";
+    public static final String TRANSFER_DOCUMENT_ID_PROP_NAME = "transferDocumentId";
     public static final String TWO_LEV_CATEGORY_PROP_NAME = "twoLevCategory";
     public static final String VERIFY_CONTENT_PROP_NAME = "verifyContent";
+    public static final String WITHDRAWAL_TIME_PROP_NAME = "withdrawalTime";
 
     /**
     * 归档状态
@@ -158,6 +164,23 @@ public class DxDocumentVOExpand<V extends DxDocumentVOPluginExpand> implements S
     */
     private String drawingCode;
 
+    /**
+    * 退档人信息
+    */
+    @ReferenceProperty(baseProperty = "dxRefundPersonUserId")
+    @VersionProperty(curVersion = VersionRelationType.ITERATION, refVersion = VersionRelationType.NONE)
+    private DxUserInfoVO dxRefundPersonUser;
+
+    /**
+    * 退档人信息
+    */
+    private Long dxRefundPersonUserId;
+
+    /**
+    * 退档人信息
+    */
+    private String dxRefundPersonUserIdType;
+
     /**
     * 校审记录卡Link模型集合
     */
@@ -580,6 +603,11 @@ public class DxDocumentVOExpand<V extends DxDocumentVOPluginExpand> implements S
     */
     private String threeLevCategory;
 
+    /**
+    * 移交单编号
+    */
+    private String transferDocumentId;
+
     /**
     * 二级分类
     */
@@ -590,6 +618,11 @@ public class DxDocumentVOExpand<V extends DxDocumentVOPluginExpand> implements S
     */
     private String verifyContent;
 
+    /**
+    * 退档时间
+    */
+    private LocalDateTime withdrawalTime;
+
 }
 
 

inet-doc-expand-common/src/main/java/com/yonde/dcs/document/expand/plugin/DxDocumentVOPluginExpand.java

@@ -33,6 +33,7 @@ import com.inet.dcs.document.common.vo.ExtReviewDocComLinkVO;
 import com.inet.dcs.document.common.vo.ExtObsoleteDocLinkVO;
 import com.inet.dcs.document.common.vo.ExtRefDesignInputLinkVO;
 import com.inet.dcs.document.common.vo.ExtTechStandardLinkVO;
+import com.yonde.dex.user.common.vo.DxUserInfoVO;
 import com.inet.dcs.document.common.vo.ExtObjectDocLinkVO;
 import com.inet.dcs.document.common.vo.ExtRefContractDocVO;
 import com.inet.dcs.document.common.vo.ExtInterfaceInfoLinkVO;
@@ -40,7 +41,7 @@ import com.inet.dcs.document.common.vo.ExtInterfaceInfoLinkVO;
 * @description: DxDocument-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-30 9:36:21
+* @date: 2024-11-7 10:51:28
 **/
 public interface DxDocumentVOPluginExpand<V extends DxDocumentVOPluginExpand> {
 
@@ -48,6 +49,9 @@ public interface DxDocumentVOPluginExpand<V extends DxDocumentVOPluginExpand> {
 
     void setDxDocumentExpand(DxDocumentVOExpand<V> dxDocumentExpand);
 
+    default void setDxRefundPersonUserIdType(String dxRefundPersonUserIdType) {
+        DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).setDxRefundPersonUserIdType(dxRefundPersonUserIdType);
+    }
     default void setTargetExtRelatedDrawingLink(List<ExtRelatedDrawingLinkVO> targetExtRelatedDrawingLink) {
         DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).setTargetExtRelatedDrawingLink(targetExtRelatedDrawingLink);
     }
@@ -183,6 +187,9 @@ public interface DxDocumentVOPluginExpand<V extends DxDocumentVOPluginExpand> {
     default List<ExtObjectDocLinkVO> getExtObjectDocLinks() {
         return DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).getExtObjectDocLinks();
     }
+    default void setDxRefundPersonUser(DxUserInfoVO dxRefundPersonUser) {
+        DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).setDxRefundPersonUser(dxRefundPersonUser);
+    }
     default void setSourceExtTechStandardLink(List<ExtTechStandardLinkVO> sourceExtTechStandardLink) {
         DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).setSourceExtTechStandardLink(sourceExtTechStandardLink);
     }
@@ -216,6 +223,9 @@ public interface DxDocumentVOPluginExpand<V extends DxDocumentVOPluginExpand> {
     default void setTargetExtObsoleteDocLink(List<ExtObsoleteDocLinkVO> targetExtObsoleteDocLink) {
         DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).setTargetExtObsoleteDocLink(targetExtObsoleteDocLink);
     }
+    default String getDxRefundPersonUserIdType() {
+        return DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).getDxRefundPersonUserIdType();
+    }
     default List<ExtRefDesignInputLinkVO> getSourceExtRefDesignInputLink() {
         return DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).getSourceExtRefDesignInputLink();
     }
@@ -258,6 +268,12 @@ public interface DxDocumentVOPluginExpand<V extends DxDocumentVOPluginExpand> {
     default List<ExtReplyDocVO> getSourceExtReplyDoc() {
         return DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).getSourceExtReplyDoc();
     }
+    default String getTransferDocumentId() {
+        return DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).getTransferDocumentId();
+    }
+    default LocalDateTime getWithdrawalTime() {
+        return DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).getWithdrawalTime();
+    }
     default String getOwnSubSystem() {
         return DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).getOwnSubSystem();
     }
@@ -321,9 +337,15 @@ public interface DxDocumentVOPluginExpand<V extends DxDocumentVOPluginExpand> {
     default void setExtReviewDocComLinks(List<ExtReviewDocComLinkVO> extReviewDocComLinks) {
         DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).setExtReviewDocComLinks(extReviewDocComLinks);
     }
+    default void setDxRefundPersonUserId(Long dxRefundPersonUserId) {
+        DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).setDxRefundPersonUserId(dxRefundPersonUserId);
+    }
     default void setSourceExtDenDescriptLink(List<ExtDenDescriptLinkVO> sourceExtDenDescriptLink) {
         DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).setSourceExtDenDescriptLink(sourceExtDenDescriptLink);
     }
+    default void setTransferDocumentId(String transferDocumentId) {
+        DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).setTransferDocumentId(transferDocumentId);
+    }
     default String getDrawingCode() {
         return DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).getDrawingCode();
     }
@@ -387,6 +409,15 @@ public interface DxDocumentVOPluginExpand<V extends DxDocumentVOPluginExpand> {
     default void setThreeLevCategory(String threeLevCategory) {
         DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).setThreeLevCategory(threeLevCategory);
     }
+    default void setBorrowingStatus(String borrowingStatus) {
+        DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).setBorrowingStatus(borrowingStatus);
+    }
+    default Long getDxRefundPersonUserId() {
+        return DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).getDxRefundPersonUserId();
+    }
+    default void setWithdrawalTime(LocalDateTime withdrawalTime) {
+        DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).setWithdrawalTime(withdrawalTime);
+    }
     default void setExtObjectDocLinks(List<ExtObjectDocLinkVO> extObjectDocLinks) {
         DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).setExtObjectDocLinks(extObjectDocLinks);
     }
@@ -435,6 +466,9 @@ public interface DxDocumentVOPluginExpand<V extends DxDocumentVOPluginExpand> {
     default void setOneLevCategory(String oneLevCategory) {
         DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).setOneLevCategory(oneLevCategory);
     }
+    default DxUserInfoVO getDxRefundPersonUser() {
+        return DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).getDxRefundPersonUser();
+    }
     default List<ExtSendFormLinkVO> getTargetExtSendFormLink() {
         return DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).getTargetExtSendFormLink();
     }
@@ -453,9 +487,6 @@ public interface DxDocumentVOPluginExpand<V extends DxDocumentVOPluginExpand> {
     default void setExtComDocLinks(List<ExtComDocLinkVO> extComDocLinks) {
         DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).setExtComDocLinks(extComDocLinks);
     }
-    default void setBorrowingStatus(String borrowingStatus) {
-        DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).setBorrowingStatus(borrowingStatus);
-    }
     default void setSourceExtCheckedFileLink(List<ExtCheckedFileLinkVO> sourceExtCheckedFileLink) {
         DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).setSourceExtCheckedFileLink(sourceExtCheckedFileLink);
     }

inet-doc-expand-entity/src/main/java/com/yonde/dcs/document/expand/entity/DxDocumentExpand.java

@@ -17,7 +17,7 @@ import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
 * @description: DxDocument-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-30 9:36:20
+* @date: 2024-11-7 10:51:28
 **/
 @ToString
 @Embeddable
@@ -50,6 +50,14 @@ public class DxDocumentExpand implements Serializable{
     */
     private String drawingCode;
     /**
+    * 退档人信息的id
+    */
+    private Long dxRefundPersonUserId;
+    /**
+    * 退档人信息的类型
+    */
+    private String dxRefundPersonUserIdType;
+    /**
     * 五级分类
     */
     private String fiveLevCategory;
@@ -102,6 +110,10 @@ public class DxDocumentExpand implements Serializable{
     */
     private String threeLevCategory;
     /**
+    * 移交单编号
+    */
+    private String transferDocumentId;
+    /**
     * 二级分类
     */
     private String twoLevCategory;
@@ -109,6 +121,10 @@ public class DxDocumentExpand implements Serializable{
     * 审定内容
     */
     private String verifyContent;
+    /**
+    * 退档时间
+    */
+    private LocalDateTime withdrawalTime;
 }