文档增加两个状态属性

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

 package com.yonde.dcs.document.expand.entity;
 
-import com.inet.dcs.document.common.vo.*;
-import com.yonde.dcs.document.expand.plugin.DxDocumentVOPluginExpand;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import java.io.Serializable;
-import java.util.List;
-
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import java.util.Date;
 import com.yonde.dex.basedata.entity.annotation.*;
 import com.yonde.dex.basedata.entity.data.VersionRelationType;
-
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.lang.TypeReference;
+import java.util.List;
+import com.yonde.dcs.document.expand.plugin.DxDocumentVOPluginExpand;
+import com.inet.dcs.document.common.vo.ExtRelatedDcrLinkVO;
+import com.inet.dcs.document.common.vo.ExtRelatedInterfaceLinkVO;
+import com.inet.dcs.document.common.vo.ExtSendFormLinkVO;
+import com.inet.dcs.document.common.vo.ExtRefOutsideDocVO;
+import com.inet.dcs.document.common.vo.ExtRelatedDrawingLinkVO;
+import com.inet.dcs.document.common.vo.ExtRelatedNcrLinkVO;
+import com.inet.dcs.document.common.vo.ExtComDocLinkVO;
+import com.inet.dcs.document.common.vo.ExtReplyDocVO;
+import com.inet.dcs.document.common.vo.ExtReviewDocLinkVO;
+import com.inet.dcs.document.common.vo.ExtApplyDocVO;
+import com.inet.dcs.document.common.vo.ExtRelatedDenLinkVO;
+import com.inet.dcs.document.common.vo.ExtDenDescriptLinkVO;
+import com.inet.dcs.document.common.vo.ExtDocumentReferentLinkVO;
+import com.inet.dcs.document.common.vo.ExtCheckedFileLinkVO;
+import com.inet.dcs.document.common.vo.ExtChangeReasonLinkVO;
+import com.inet.dcs.document.common.vo.ExtReplenishLinkVO;
+import com.inet.dcs.document.common.vo.ExtRefJobContractDocVO;
+import com.inet.dcs.document.common.vo.ExtReviewChangeLinkVO;
+import com.inet.dcs.document.common.vo.ExtAuditRecordCardLinkVO;
+import com.inet.dcs.document.common.vo.ExtInterfaceReplaceLinkVO;
+import com.inet.dcs.document.common.vo.ExtInterfaceDocLinkVO;
+import com.inet.dcs.document.common.vo.ExtAtlasDrawingLinkVO;
+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.inet.dcs.document.common.vo.ExtObjectDocLinkVO;
+import com.inet.dcs.document.common.vo.ExtRefContractDocVO;
+import com.inet.dcs.document.common.vo.ExtInterfaceInfoLinkVO;
 
 /**
- * @description: DxDocument-VOExpand扩展实体
- * @author: dexadmin
- * @version: V
- * @date: 2024-8-23 9:38:30
- **/
+* @description: DxDocument-VOExpand扩展实体
+* @author: dexadmin
+* @version: V
+* @date: 2024-10-30 9:36:21
+**/
 @EqualsAndHashCode
 @Data
 @ToString(callSuper = true)
 public class DxDocumentVOExpand<V extends DxDocumentVOPluginExpand> implements Serializable{
+    public static final String ARCHIVING_STATUS_PROP_NAME = "archivingStatus";
     public static final String ATTACH_PAGES_PROP_NAME = "attachPages";
+    public static final String BORROWING_STATUS_PROP_NAME = "borrowingStatus";
     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";
@@ -93,11 +128,21 @@ public class DxDocumentVOExpand<V extends DxDocumentVOPluginExpand> implements S
     public static final String TWO_LEV_CATEGORY_PROP_NAME = "twoLevCategory";
     public static final String VERIFY_CONTENT_PROP_NAME = "verifyContent";
 
+    /**
+    * 归档状态
+    */
+    private String archivingStatus;
+
     /**
     * 附件页数
     */
     private String attachPages;
 
+    /**
+    * 借阅状态
+    */
+    private Integer borrowingStatus;
+
     /**
     * 校核内容
     */
@@ -124,7 +169,7 @@ public class DxDocumentVOExpand<V extends DxDocumentVOPluginExpand> implements S
     * 专家意见升版文档关联模型集合
     */
     @RelationProperty(refProperty = "target")
-    @VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
+    @VersionProperty(curVersion = VersionRelationType.ITERATION, refVersion = VersionRelationType.NONE)
     private List<ExtComDocLinkVO> extComDocLinks;
 
     /**

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

 package com.yonde.dcs.document.expand.plugin;
+import com.yonde.dex.basedata.entity.vo.IdVO;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
 import java.util.List;
-
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dcs.document.expand.entity.DxDocumentVOExpand;
 import com.inet.dcs.document.common.vo.ExtRelatedDcrLinkVO;
 import com.inet.dcs.document.common.vo.ExtRelatedInterfaceLinkVO;
@@ -36,7 +40,7 @@ import com.inet.dcs.document.common.vo.ExtInterfaceInfoLinkVO;
 * @description: DxDocument-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-16 13:50:28
+* @date: 2024-10-30 9:36:21
 **/
 public interface DxDocumentVOPluginExpand<V extends DxDocumentVOPluginExpand> {
 
@@ -158,6 +162,9 @@ public interface DxDocumentVOPluginExpand<V extends DxDocumentVOPluginExpand> {
     default void setDrawingCode(String drawingCode) {
         DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).setDrawingCode(drawingCode);
     }
+    default void setArchivingStatus(String archivingStatus) {
+        DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).setArchivingStatus(archivingStatus);
+    }
     default List<ExtRelatedInterfaceLinkVO> getTargetExtRelatedInterfaceLink() {
         return DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).getTargetExtRelatedInterfaceLink();
     }
@@ -236,6 +243,9 @@ public interface DxDocumentVOPluginExpand<V extends DxDocumentVOPluginExpand> {
     default void setTargetExtDocumentReferentLink(List<ExtDocumentReferentLinkVO> targetExtDocumentReferentLink) {
         DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).setTargetExtDocumentReferentLink(targetExtDocumentReferentLink);
     }
+    default Integer getBorrowingStatus() {
+        return DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).getBorrowingStatus();
+    }
     default List<ExtInterfaceReplaceLinkVO> getSourceExtInterfaceReplaceLink() {
         return DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).getSourceExtInterfaceReplaceLink();
     }
@@ -389,6 +399,9 @@ public interface DxDocumentVOPluginExpand<V extends DxDocumentVOPluginExpand> {
     default List<ExtDenDescriptLinkVO> getSourceExtDenDescriptLink() {
         return DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).getSourceExtDenDescriptLink();
     }
+    default String getArchivingStatus() {
+        return DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).getArchivingStatus();
+    }
     default List<ExtRelatedDrawingLinkVO> getSourceExtRelatedDrawingLink() {
         return DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentVOExpand<>()).getSourceExtRelatedDrawingLink();
     }
@@ -440,6 +453,9 @@ 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(Integer 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-8-2 15:26:32
+* @date: 2024-10-30 9:36:20
 **/
 @ToString
 @Embeddable
@@ -25,11 +25,19 @@ import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
 @EqualsAndHashCode
 public class DxDocumentExpand implements Serializable{
 
+    /**
+    * 归档状态
+    */
+    private String archivingStatus;
     /**
     * 附件页数
     */
     private String attachPages;
     /**
+    * 借阅状态
+    */
+    private Integer borrowingStatus;
+    /**
     * 校核内容
     */
     private String checkContent;

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

 package com.yonde.dcs.document.expand.plugin;
-
-import com.yonde.dcs.document.expand.entity.DxDocumentExpand;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import com.yonde.dcs.document.expand.entity.DxDocumentExpand;
 /**
 * @description: DxDocument-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-20 10:08:27
+* @date: 2024-10-30 9:36:20
 **/
 public interface DxDocumentPluginExpand {
 
@@ -53,6 +57,9 @@ public interface DxDocumentPluginExpand {
     default void setFourLevCategory(String fourLevCategory) {
         DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentExpand()).setFourLevCategory(fourLevCategory);
     }
+    default String getArchivingStatus() {
+        return DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentExpand()).getArchivingStatus();
+    }
     default void setCheckStandardReview(String checkStandardReview) {
         DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentExpand()).setCheckStandardReview(checkStandardReview);
     }
@@ -101,6 +108,9 @@ public interface DxDocumentPluginExpand {
     default String getDrawingCode() {
         return DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentExpand()).getDrawingCode();
     }
+    default Integer getBorrowingStatus() {
+        return DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentExpand()).getBorrowingStatus();
+    }
     default String getSubject() {
         return DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentExpand()).getSubject();
     }
@@ -113,12 +123,18 @@ public interface DxDocumentPluginExpand {
     default String getProjectCode() {
         return DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentExpand()).getProjectCode();
     }
+    default void setBorrowingStatus(Integer borrowingStatus) {
+        DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentExpand()).setBorrowingStatus(borrowingStatus);
+    }
     default void setTwoLevCategory(String twoLevCategory) {
         DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentExpand()).setTwoLevCategory(twoLevCategory);
     }
     default void setDrawingCode(String drawingCode) {
         DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentExpand()).setDrawingCode(drawingCode);
     }
+    default void setArchivingStatus(String archivingStatus) {
+        DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentExpand()).setArchivingStatus(archivingStatus);
+    }
     default String getOwnSubSystem() {
         return DxExpandUtils.getNotNullObject(this::getDxDocumentExpand,this::setDxDocumentExpand,new DxDocumentExpand()).getOwnSubSystem();
     }