供应商管理

dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtSupplierManageVO.java

 package com.yonde.dcs.plan.common.vo;
 
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import cn.hutool.core.convert.Convert;
+import com.yonde.dex.basedata.entity.annotation.XmlElementProperty;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.annotation.JsonUnwrapped;
+import lombok.ToString;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import java.math.BigInteger;
+import org.springframework.data.annotation.Transient;
+import lombok.experimental.Delegate;
+import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlAttribute;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.NotNull;
+import java.util.List;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
-import com.yonde.dex.basedata.entity.annotation.RelationProperty;
-import com.yonde.dex.basedata.entity.annotation.VersionProperty;
+import com.yonde.dex.basedata.entity.xmladapters.LocalDateTimeXmlAdapter;
+import lombok.Data;
+import com.yonde.dex.basedata.entity.annotation.*;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import com.yonde.dex.basedata.entity.vo.IdOnlyVO;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.lang.TypeReference;
 import com.yonde.dex.basedata.entity.data.VersionRelationType;
 import com.yonde.dex.basedata.entity.vo.DxIdVOEmbeddable;
-import com.yonde.dex.basedata.entity.vo.IdOnlyVO;
-import com.yonde.dex.basedata.entity.vo.IdVO;
-import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbeddable;
+import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOHolder;
 import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOHolder;
-import com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOEmbeddable;
+import com.yonde.dex.version.plugin.common.entity.DxIterationVOEmbeddable;
+import com.yonde.dex.basedata.entity.users.DxUserVO;
 import com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOHolder;
-import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOEmbeddable;
+import com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOEmbeddable;
 import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOHolder;
+import com.yonde.dcs.plan.common.vo.ExtSupplierManageLinkVO;
+import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOEmbeddable;
+import com.yonde.dex.basedata.entity.vo.IdVO;
 import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOEmbeddable;
-import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOHolder;
-import com.yonde.dex.version.plugin.common.entity.DxIterationVOEmbeddable;
+import com.yonde.dcs.document.common.entity.vo.DxDocumentVO;
+import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbeddable;
 import com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import java.time.LocalDateTime;
-import java.util.List;
 
 /**
- * @description: ExtSupplierManage-VO
- * @author: dexadmin
- * @version: V
- * @date: 2024-9-18 15:26:16
- **/
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtSupplierManageVO.class)
+* @description: ExtSupplierManage-VO
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-19 11:25:51
+**/
+@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtSupplierManageVO.class)
 @EqualsAndHashCode(callSuper = true)
 @Data
 @ToString(callSuper = true)
-public class ExtSupplierManageVO extends IdOnlyVO implements DxIterationVOHolder<ExtSupplierManageVO>, IdVO, DxLifecycleManageBaseVOHolder, DxObjFileLinkVOHolder, DxLogicDeleteVOHolder, DxSecretVOHolder {
+public class ExtSupplierManageVO extends IdOnlyVO implements DxIterationVOHolder<ExtSupplierManageVO> ,IdVO ,DxLifecycleManageBaseVOHolder ,DxObjFileLinkVOHolder ,DxLogicDeleteVOHolder ,DxSecretVOHolder{
 
     public static final String DX_OBJ_FILE_LINK_EMBEDDABLE_PROP_NAME = "dxObjFileLinkEmbeddable";
     public static final String DX_LIFECYCLE_MANAGE_BASE_EMBEDDABLE_PROP_NAME = "dxLifecycleManageBaseEmbeddable";
@@ -44,145 +64,157 @@ public class ExtSupplierManageVO extends IdOnlyVO implements DxIterationVOHolder
     public static final String DX_LOGIC_DELETE_EMBEDDABLE_PROP_NAME = "dxLogicDeleteEmbeddable";
     public static final String DX_ITERATION_EMBEDDABLE_PROP_NAME = "dxIterationEmbeddable";
     public static final String DX_SECRET_EMBEDDABLE_PROP_NAME = "dxSecretEmbeddable";
-    public static final String CQC_NUMBER_PROP_NAME = "cqcNumber";
-    public static final String CQC_VALIDITY_TIME_PROP_NAME = "cqcValidityTime";
-    public static final String CQM_NUMBER_PROP_NAME = "cqmNumber";
-    public static final String CQM_VALIDITY_TIME_PROP_NAME = "cqmValidityTime";
     public static final String DIRECTORY_VALIDITY_PROP_NAME = "directoryValidity";
+    public static final String EXT_CQM_PROP_NAME = "extCqm";
+    public static final String EXT_CQM_ID_PROP_NAME = "extCqmId";
+    public static final String EXT_CQM_ID_TYPE_PROP_NAME = "extCqmIdType";
+    public static final String EXT_OTHER_PROP_NAME = "extOther";
+    public static final String EXT_OTHER_ID_PROP_NAME = "extOtherId";
+    public static final String EXT_OTHER_ID_TYPE_PROP_NAME = "extOtherIdType";
+    public static final String EXT_POTENTIAL_PROP_NAME = "extPotential";
+    public static final String EXT_POTENTIAL_ID_PROP_NAME = "extPotentialId";
+    public static final String EXT_POTENTIAL_ID_TYPE_PROP_NAME = "extPotentialIdType";
     public static final String EXT_SUPPLIER_MANAGE_LINKS_PROP_NAME = "extSupplierManageLinks";
     public static final String OPERATE_TYPE_PROP_NAME = "operateType";
-    public static final String QSC_NUMBER_PROP_NAME = "qscNumber";
-    public static final String QSC_VALIDITY_TIME_PROP_NAME = "qscValidityTime";
     public static final String REGISTRATION_FUND_PROP_NAME = "registrationFund";
     public static final String REGISTRATION_TIME_PROP_NAME = "registrationTime";
-    public static final String STUDY_PERMIT_NUMBER_PROP_NAME = "studyPermitNumber";
-    public static final String STUDY_PERMIT_TIME_PROP_NAME = "studyPermitTime";
     public static final String SUPPLIER_ADDRESS_PROP_NAME = "supplierAddress";
     public static final String SUPPLIER_TYPE_PROP_NAME = "supplierType";
     public static final String UNIFIED_SOCIETY_CODE_PROP_NAME = "unifiedSocietyCode";
 
     /**
-     * 扩展VO属性
-     */
+    * 扩展VO属性
+    */
     @DexEmbedded()
     @JsonIgnore
     private DxObjFileLinkVOEmbeddable dxObjFileLinkEmbeddable;
 
     /**
-     * 扩展VO属性
-     */
+    * 扩展VO属性
+    */
     @DexEmbedded()
     @JsonIgnore
     private DxLifecycleManageBaseVOEmbeddable dxLifecycleManageBaseEmbeddable;
 
     /**
-     * dao扩展对象
-     */
+    * dao扩展对象
+    */
     @DexEmbedded()
     @JsonIgnore
     private DxIdVOEmbeddable dxIdEmbeddable;
 
     /**
-     * 扩展VO属性
-     */
+    * 扩展VO属性
+    */
     @DexEmbedded()
     @JsonIgnore
     private DxLogicDeleteVOEmbeddable dxLogicDeleteEmbeddable;
 
     /**
-     * 扩展VO属性
-     */
+    * 扩展VO属性
+    */
     @DexEmbedded()
     @JsonIgnore
     private DxIterationVOEmbeddable<ExtSupplierManageVO> dxIterationEmbeddable;
 
     /**
-     * 扩展VO属性
-     */
+    * 扩展VO属性
+    */
     @DexEmbedded()
     @JsonIgnore
     private DxSecretVOEmbeddable dxSecretEmbeddable;
 
     /**
-     * 保密资质证书编号
-     */
-    private String cqcNumber;
+    * 名录有效期
+    */
+    private String directoryValidity;
 
     /**
-     * 保密资质证书有效期
-     */
-    private String cqcValidityTime;
+    * 文档
+    */
+    @ReferenceProperty(baseProperty = "extCqmId")
+    @VersionProperty(curVersion = VersionRelationType.ITERATION, refVersion = VersionRelationType.ITERATION)
+    private DxDocumentVO extCqm;
 
     /**
-     * 承制资格证书
-     */
-    private String cqmNumber;
+    * 文档
+    */
+    private Long extCqmId;
 
     /**
-     * 承制资格证书有效期
-     */
-    private LocalDateTime cqmValidityTime;
+    * 文档
+    */
+    private String extCqmIdType;
 
     /**
-     * 名录有效期
-     */
-    private String directoryValidity;
+    * 文档
+    */
+    @ReferenceProperty(baseProperty = "extOtherId")
+    @VersionProperty(curVersion = VersionRelationType.ITERATION, refVersion = VersionRelationType.ITERATION)
+    private DxDocumentVO extOther;
 
     /**
-     * ExtSupplierManageLink集合
-     */
-    @RelationProperty(refProperty = "source")
-    @VersionProperty(curVersion = VersionRelationType.ITERATION, refVersion = VersionRelationType.NONE)
-    private List<ExtSupplierManageLinkVO> extSupplierManageLinks;
+    * 文档
+    */
+    private Long extOtherId;
 
     /**
-     * 经营类别
-     */
-    private String operateType;
+    * 文档
+    */
+    private String extOtherIdType;
 
     /**
-     * 质量体系证书编号
-     */
-    private String qscNumber;
+    * 文档
+    */
+    @ReferenceProperty(baseProperty = "extPotentialId")
+    @VersionProperty(curVersion = VersionRelationType.ITERATION, refVersion = VersionRelationType.ITERATION)
+    private DxDocumentVO extPotential;
 
     /**
-     * 质量体系有效期
-     */
-    private LocalDateTime qscValidityTime;
+    * 文档
+    */
+    private Long extPotentialId;
 
     /**
-     * 注册资金
-     */
-    private String registrationFund;
+    * 文档
+    */
+    private String extPotentialIdType;
 
     /**
-     * 注册时间
-     */
-    private LocalDateTime registrationTime;
+    * ExtSupplierManageLink集合
+    */
+    @RelationProperty(refProperty = "source")
+    @VersionProperty(curVersion = VersionRelationType.ITERATION, refVersion = VersionRelationType.NONE)
+    private List<ExtSupplierManageLinkVO> extSupplierManageLinks;
 
     /**
-     * 科研许可证编号
-     */
-    private String studyPermitNumber;
+    * 经营类别
+    */
+    private String operateType;
 
     /**
-     * 科研许可证有效期
-     */
-    private LocalDateTime studyPermitTime;
+    * 注册资金
+    */
+    private String registrationFund;
+
+    /**
+    * 注册时间
+    */
+    private LocalDateTime registrationTime;
 
     /**
-     * 供方地址
-     */
+    * 供方地址
+    */
     private String supplierAddress;
 
     /**
-     * 供方类别
-     */
+    * 供方类别
+    */
     private String supplierType;
 
     /**
-     * 统一社会信用引用代码
-     */
+    * 统一社会信用引用代码
+    */
     private String unifiedSocietyCode;
 
 }

dcs-plan-entity/src/main/java/com/yonde/dcs/plan/entity/po/ExtSupplierManage.java

@@ -27,7 +27,7 @@ import java.time.LocalDateTime;
  * @description: ExtSupplierManage-PO实体
  * @author: dexadmin
  * @version: V
- * @date: 2024-9-18 15:26:16
+ * @date: 2024-9-19 11:25:51
  **/
 @Entity
 @EqualsAndHashCode(callSuper = true)
@@ -73,37 +73,37 @@ public class ExtSupplierManage extends IdOnlyEntity implements DxObjFileLinkHold
     @Embedded()
     private DxSecretEmbeddable dxSecretEmbeddable;
     /**
-     * 保密资质证书编号
+     * 名录有效期
      */
-    private String cqcNumber;
+    private String directoryValidity;
     /**
-     * 保密资质证书有效期
+     * 文档的id
      */
-    private String cqcValidityTime;
+    private Long extCqmId;
     /**
-     * 承制资格证书
+     * 文档的类型
      */
-    private String cqmNumber;
+    private String extCqmIdType;
     /**
-     * 承制资格证书有效期
+     * 文档的id
      */
-    private LocalDateTime cqmValidityTime;
+    private Long extOtherId;
     /**
-     * 名录有效期
+     * 文档的类型
      */
-    private String directoryValidity;
+    private String extOtherIdType;
     /**
-     * 经营类别
+     * 文档的id
      */
-    private String operateType;
+    private Long extPotentialId;
     /**
-     * 质量体系证书编号
+     * 文档的类型
      */
-    private String qscNumber;
+    private String extPotentialIdType;
     /**
-     * 质量体系有效期
+     * 经营类别
      */
-    private LocalDateTime qscValidityTime;
+    private String operateType;
     /**
      * 注册资金
      */
@@ -112,14 +112,6 @@ public class ExtSupplierManage extends IdOnlyEntity implements DxObjFileLinkHold
      * 注册时间
      */
     private LocalDateTime registrationTime;
-    /**
-     * 科研许可证编号
-     */
-    private String studyPermitNumber;
-    /**
-     * 科研许可证有效期
-     */
-    private LocalDateTime studyPermitTime;
     /**
      * 供方地址
      */