Merge remote-tracking branch 'origin/master'

inet-doc-expand-common/src/main/java/com/inet/dcs/document/common/vo/ExtTransferDocLinkVO.java

@@ -34,7 +34,9 @@ import com.yonde.dex.basedata.entity.vo.DxIdVOEmbeddable;
 import com.yonde.dex.basedata.entity.vo.IdVO;
 import com.yonde.dex.linkdata.plugin.common.DxLinkDataVOHolder;
 import com.yonde.dex.linkdata.plugin.common.DxLinkDataVOEmbeddable;
+import com.yonde.dex.user.common.vo.DxOrganizationVO;
 import com.inet.dcs.document.common.vo.ExtTransferDocumentVO;
+import com.yonde.dex.user.common.vo.DxUserInfoVO;
 import com.yonde.dcs.document.common.entity.vo.DxDocumentVO;
 import com.yonde.dex.basedata.entity.users.DxUserVO;
 
@@ -42,7 +44,7 @@ import com.yonde.dex.basedata.entity.users.DxUserVO;
 * @description: ExtTransferDocLink-VO
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-29 10:30:50
+* @date: 2024-10-30 9:28:26
 **/
 @JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtTransferDocLinkVO.class)
 @EqualsAndHashCode(callSuper = true)
@@ -54,6 +56,25 @@ public class ExtTransferDocLinkVO extends IdOnlyVO implements IdVO ,DxLinkDataVO
 
     public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
     public static final String DX_LINK_DATA_EMBEDDABLE_PROP_NAME = "dxLinkDataEmbeddable";
+    public static final String ARCHIVE_NUMBER_PROP_NAME = "archiveNumber";
+    public static final String ARCHIVING_INSTRUCTIONS_PROP_NAME = "archivingInstructions";
+    public static final String BELONGING_CASE_FILE_PROP_NAME = "belongingCaseFile";
+    public static final String DX_RECIPIENT_USER_INFO_PROP_NAME = "dxRecipientUserInfo";
+    public static final String DX_RECIPIENT_USER_INFO_ID_PROP_NAME = "dxRecipientUserInfoId";
+    public static final String DX_RECIPIENT_USER_INFO_ID_TYPE_PROP_NAME = "dxRecipientUserInfoIdType";
+    public static final String DX_TRANSFER_DOC_ORG_PROP_NAME = "dxTransferDocOrg";
+    public static final String DX_TRANSFER_DOC_ORG_ID_PROP_NAME = "dxTransferDocOrgId";
+    public static final String DX_TRANSFER_DOC_ORG_ID_TYPE_PROP_NAME = "dxTransferDocOrgIdType";
+    public static final String DX_TRANSFER_USER_INFO_PROP_NAME = "dxTransferUserInfo";
+    public static final String DX_TRANSFER_USER_INFO_ID_PROP_NAME = "dxTransferUserInfoId";
+    public static final String DX_TRANSFER_USER_INFO_ID_TYPE_PROP_NAME = "dxTransferUserInfoIdType";
+    public static final String HANDOVER_TIME_PROP_NAME = "handoverTime";
+    public static final String PAGE_NUMBER_PROP_NAME = "pageNumber";
+    public static final String PROJECT_CODE_PROP_NAME = "projectCode";
+    public static final String PROJECT_NAME_PROP_NAME = "projectName";
+    public static final String STORAGE_PERIOD_PROP_NAME = "storagePeriod";
+    public static final String TOPIC_TITLE_PROP_NAME = "topicTitle";
+    public static final String VOLUME_NUMBER_PROP_NAME = "volumeNumber";
 
     /**
     * dao扩展对象
@@ -69,6 +90,107 @@ public class ExtTransferDocLinkVO extends IdOnlyVO implements IdVO ,DxLinkDataVO
     @JsonIgnore
     private DxLinkDataVOEmbeddable<DxDocumentVO, ExtTransferDocumentVO> dxLinkDataEmbeddable;
 
+    /**
+    * 归档号
+    */
+    private String archiveNumber;
+
+    /**
+    * 归档说明
+    */
+    private String archivingInstructions;
+
+    /**
+    * 所属案卷
+    */
+    private String belongingCaseFile;
+
+    /**
+    * 用户信息
+    */
+    @ReferenceProperty(baseProperty = "dxRecipientUserInfoId")
+    @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
+    private DxUserInfoVO dxRecipientUserInfo;
+
+    /**
+    * 用户信息
+    */
+    private Long dxRecipientUserInfoId;
+
+    /**
+    * 用户信息
+    */
+    private String dxRecipientUserInfoIdType;
+
+    /**
+    * 组织
+    */
+    @ReferenceProperty(baseProperty = "dxTransferDocOrgId")
+    @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
+    private DxOrganizationVO dxTransferDocOrg;
+
+    /**
+    * 组织
+    */
+    private Long dxTransferDocOrgId;
+
+    /**
+    * 组织
+    */
+    private String dxTransferDocOrgIdType;
+
+    /**
+    * 用户信息
+    */
+    @ReferenceProperty(baseProperty = "dxTransferUserInfoId")
+    @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
+    private DxUserInfoVO dxTransferUserInfo;
+
+    /**
+    * 用户信息
+    */
+    private Long dxTransferUserInfoId;
+
+    /**
+    * 用户信息
+    */
+    private String dxTransferUserInfoIdType;
+
+    /**
+    * 移交时间
+    */
+    private LocalDateTime handoverTime;
+
+    /**
+    * 页数
+    */
+    private Integer pageNumber;
+
+    /**
+    * 项目代号
+    */
+    private String projectCode;
+
+    /**
+    * 项目名称
+    */
+    private String projectName;
+
+    /**
+    * 保管年限
+    */
+    private String storagePeriod;
+
+    /**
+    * 课题题名
+    */
+    private String topicTitle;
+
+    /**
+    * 卷内序号
+    */
+    private String volumeNumber;
+
 }
 
 

inet-doc-expand-entity/src/main/java/com/inet/dcs/document/entity/po/ExtTransferDocLink.java

@@ -33,7 +33,7 @@ import com.yonde.dex.linkdata.plugin.entities.DxLinkDataEmbeddable;
 * @description: ExtTransferDocLink-PO实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-10-29 10:30:50
+* @date: 2024-10-30 9:28:26
 **/
 @Entity
 @EqualsAndHashCode(callSuper = true)
@@ -54,6 +54,70 @@ public class ExtTransferDocLink extends IdOnlyEntity implements IdEntity ,DxLink
     @DexEmbedded()
     @Embedded()
     private DxLinkDataEmbeddable dxLinkDataEmbeddable;
+    /**
+    * 归档号
+    */
+    private String archiveNumber;
+    /**
+    * 归档说明
+    */
+    private String archivingInstructions;
+    /**
+    * 所属案卷
+    */
+    private String belongingCaseFile;
+    /**
+    * 用户信息的id
+    */
+    private Long dxRecipientUserInfoId;
+    /**
+    * 用户信息的类型
+    */
+    private String dxRecipientUserInfoIdType;
+    /**
+    * 组织的id
+    */
+    private Long dxTransferDocOrgId;
+    /**
+    * 组织的类型
+    */
+    private String dxTransferDocOrgIdType;
+    /**
+    * 用户信息的id
+    */
+    private Long dxTransferUserInfoId;
+    /**
+    * 用户信息的类型
+    */
+    private String dxTransferUserInfoIdType;
+    /**
+    * 移交时间
+    */
+    private LocalDateTime handoverTime;
+    /**
+    * 页数
+    */
+    private Integer pageNumber;
+    /**
+    * 项目代号
+    */
+    private String projectCode;
+    /**
+    * 项目名称
+    */
+    private String projectName;
+    /**
+    * 保管年限的类型
+    */
+    private String storagePeriod;
+    /**
+    * 课题题名
+    */
+    private String topicTitle;
+    /**
+    * 卷内序号
+    */
+    private String volumeNumber;
 }