Merge remote-tracking branch 'origin/master'

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

@@ -47,8 +47,10 @@ import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOHolder;
 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.user.common.vo.DxOrganizationVO;
 import com.yonde.dcs.plan.common.vo.ExtMatterContractVO;
 import com.yonde.dcs.document.common.entity.vo.DxDocumentVO;
+import com.yonde.dex.user.common.vo.DxUserInfoVO;
 import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbeddable;
 import com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder;
 
@@ -56,7 +58,7 @@ import com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder;
 * @description: ExtExpenditureContract-VO
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-24 16:48:59
+* @date: 2024-9-25 10:40:02
 **/
 @JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtExpenditureContractVO.class)
 @EqualsAndHashCode(callSuper = true)
@@ -87,12 +89,12 @@ public class ExtExpenditureContractVO extends IdOnlyVO implements IdVO ,DxContex
     public static final String DX_CONTRACT_TEXT_FILE_PROP_NAME = "dxContractTextFile";
     public static final String DX_CONTRACT_TEXT_FILE_ID_PROP_NAME = "dxContractTextFileId";
     public static final String DX_CONTRACT_TEXT_FILE_ID_TYPE_PROP_NAME = "dxContractTextFileIdType";
-    public static final String DX_EXPLAIN_FILE_PROP_NAME = "dxExplainFile";
-    public static final String DX_EXPLAIN_FILE_ID_PROP_NAME = "dxExplainFileId";
-    public static final String DX_EXPLAIN_FILE_ID_TYPE_PROP_NAME = "dxExplainFileIdType";
-    public static final String DX_JG_CONTRA_TEXT_FILE_PROP_NAME = "dxJgContraTextFile";
-    public static final String DX_JG_CONTRA_TEXT_FILE_ID_PROP_NAME = "dxJgContraTextFileId";
-    public static final String DX_JG_CONTRA_TEXT_FILE_ID_TYPE_PROP_NAME = "dxJgContraTextFileIdType";
+    public static final String DX_ORGANIZATION_PROP_NAME = "dxOrganization";
+    public static final String DX_ORGANIZATION_ID_PROP_NAME = "dxOrganizationId";
+    public static final String DX_ORGANIZATION_ID_TYPE_PROP_NAME = "dxOrganizationIdType";
+    public static final String DX_USER_INFO_PROP_NAME = "dxUserInfo";
+    public static final String DX_USER_INFO_ID_PROP_NAME = "dxUserInfoId";
+    public static final String DX_USER_INFO_ID_TYPE_PROP_NAME = "dxUserInfoIdType";
     public static final String EXT_MATTER_CONTRACTS_PROP_NAME = "extMatterContracts";
     public static final String EXT_PAYMENT_CONTRACTS_PROP_NAME = "extPaymentContracts";
     public static final String EXT_PLAN_CONTRACTS_PROP_NAME = "extPlanContracts";
@@ -115,8 +117,6 @@ public class ExtExpenditureContractVO extends IdOnlyVO implements IdVO ,DxContex
     public static final String SUB_PROJECT_NUMBER_PROP_NAME = "subProjectNumber";
     public static final String SUPPLIER_NAME_PROP_NAME = "supplierName";
     public static final String SUPPLIER_NUMBER_PROP_NAME = "supplierNumber";
-    public static final String UNDERTAKER_PROP_NAME = "undertaker";
-    public static final String UNDERTAKING_DEPARTMENT_PROP_NAME = "undertakingDepartment";
 
     /**
     * 扩展VO属性
@@ -218,72 +218,72 @@ public class ExtExpenditureContractVO extends IdOnlyVO implements IdVO ,DxContex
     private String designApprovalItems;
 
     /**
-    * 文档
+    * 合同附件
     */
     @ReferenceProperty(baseProperty = "dxContractFileId")
     @VersionProperty(curVersion = VersionRelationType.ITERATION, refVersion = VersionRelationType.ITERATION)
     private DxDocumentVO dxContractFile;
 
     /**
-    * 文档
+    * 合同附件
     */
     private Long dxContractFileId;
 
     /**
-    * 文档
+    * 合同附件
     */
     private String dxContractFileIdType;
 
     /**
-    * 文档
+    * 合同文本
     */
     @ReferenceProperty(baseProperty = "dxContractTextFileId")
     @VersionProperty(curVersion = VersionRelationType.ITERATION, refVersion = VersionRelationType.ITERATION)
     private DxDocumentVO dxContractTextFile;
 
     /**
-    * 文档
+    * 合同文本
     */
     private Long dxContractTextFileId;
 
     /**
-    * 文档
+    * 合同文本
     */
     private String dxContractTextFileIdType;
 
     /**
-    * 文档
+    * 承办人部门
     */
-    @ReferenceProperty(baseProperty = "dxExplainFileId")
-    @VersionProperty(curVersion = VersionRelationType.ITERATION, refVersion = VersionRelationType.ITERATION)
-    private DxDocumentVO dxExplainFile;
+    @ReferenceProperty(baseProperty = "dxOrganizationId")
+    @VersionProperty(curVersion = VersionRelationType.ITERATION, refVersion = VersionRelationType.NONE)
+    private DxOrganizationVO dxOrganization;
 
     /**
-    * 文档
+    * 承办人部门
     */
-    private Long dxExplainFileId;
+    private Long dxOrganizationId;
 
     /**
-    * 文档
+    * 承办人部门
     */
-    private String dxExplainFileIdType;
+    private String dxOrganizationIdType;
 
     /**
-    * 文档
+    * 承办人
     */
-    @ReferenceProperty(baseProperty = "dxJgContraTextFileId")
-    @VersionProperty(curVersion = VersionRelationType.ITERATION, refVersion = VersionRelationType.ITERATION)
-    private DxDocumentVO dxJgContraTextFile;
+    @ReferenceProperty(baseProperty = "dxUserInfoId")
+    @VersionProperty(curVersion = VersionRelationType.ITERATION, refVersion = VersionRelationType.NONE)
+    private DxUserInfoVO dxUserInfo;
 
     /**
-    * 文档
+    * 承办人
     */
-    private Long dxJgContraTextFileId;
+    private Long dxUserInfoId;
 
     /**
-    * 文档
+    * 承办人
     */
-    private String dxJgContraTextFileIdType;
+    private String dxUserInfoIdType;
 
     /**
     * ExtMatterContract集合
@@ -405,16 +405,6 @@ public class ExtExpenditureContractVO extends IdOnlyVO implements IdVO ,DxContex
     */
     private String supplierNumber;
 
-    /**
-    * 承办人
-    */
-    private String undertaker;
-
-    /**
-    * 承办部门
-    */
-    private String undertakingDepartment;
-
 }
 
 

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

@@ -46,7 +46,9 @@ import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOHolder;
 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.user.common.vo.DxOrganizationVO;
 import com.yonde.dcs.document.common.entity.vo.DxDocumentVO;
+import com.yonde.dex.user.common.vo.DxUserInfoVO;
 import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbeddable;
 import com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder;
 
@@ -54,7 +56,7 @@ import com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder;
 * @description: ExtInComeContract-VO
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-24 16:48:58
+* @date: 2024-9-25 10:06:47
 **/
 @JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtInComeContractVO.class)
 @EqualsAndHashCode(callSuper = true)
@@ -73,12 +75,18 @@ public class ExtInComeContractVO extends IdOnlyVO implements DxIterationVOHolder
     public static final String CONTRACT_AMOUNT_PROP_NAME = "contractAmount";
     public static final String CONTRACT_TYPE_PROP_NAME = "contractType";
     public static final String CONTRACT_WAY_PROP_NAME = "contractWay";
+    public static final String DX_ORGANIZATION_PROP_NAME = "dxOrganization";
+    public static final String DX_ORGANIZATION_ID_PROP_NAME = "dxOrganizationId";
+    public static final String DX_ORGANIZATION_ID_TYPE_PROP_NAME = "dxOrganizationIdType";
     public static final String DX_OTHER_FILE_PROP_NAME = "dxOtherFile";
     public static final String DX_OTHER_FILE_ID_PROP_NAME = "dxOtherFileId";
     public static final String DX_OTHER_FILE_ID_TYPE_PROP_NAME = "dxOtherFileIdType";
     public static final String DX_TECHNICAL_FILE_PROP_NAME = "dxTechnicalFile";
     public static final String DX_TECHNICAL_FILE_ID_PROP_NAME = "dxTechnicalFileId";
     public static final String DX_TECHNICAL_FILE_ID_TYPE_PROP_NAME = "dxTechnicalFileIdType";
+    public static final String DX_USER_INFO_PROP_NAME = "dxUserInfo";
+    public static final String DX_USER_INFO_ID_PROP_NAME = "dxUserInfoId";
+    public static final String DX_USER_INFO_ID_TYPE_PROP_NAME = "dxUserInfoIdType";
     public static final String DX_WORK_FILE_PROP_NAME = "dxWorkFile";
     public static final String DX_WORK_FILE_ID_PROP_NAME = "dxWorkFileId";
     public static final String DX_WORK_FILE_ID_TYPE_PROP_NAME = "dxWorkFileIdType";
@@ -89,14 +97,12 @@ public class ExtInComeContractVO extends IdOnlyVO implements DxIterationVOHolder
     public static final String INCOME_AMOUNT_PROP_NAME = "incomeAmount";
     public static final String ITEM_NAME_PROP_NAME = "itemName";
     public static final String ITEM_NUMBER_PROP_NAME = "itemNumber";
-    public static final String OPERATOR_PROP_NAME = "operator";
     public static final String PAYMENT_METHOD_PROP_NAME = "paymentMethod";
     public static final String PERFORM_TERM_PROP_NAME = "performTerm";
     public static final String PRICE_WAY_PROP_NAME = "priceWay";
     public static final String SIGN_TIME_PROP_NAME = "signTime";
     public static final String SUPPLIER_NAME_PROP_NAME = "supplierName";
     public static final String SUPPLIER_NUMBER_PROP_NAME = "supplierNumber";
-    public static final String UNDERTAKING_DEPARTMENT_PROP_NAME = "undertakingDepartment";
 
     /**
     * 扩展VO属性
@@ -167,6 +173,23 @@ public class ExtInComeContractVO extends IdOnlyVO implements DxIterationVOHolder
     */
     private String contractWay;
 
+    /**
+    * 承办部门
+    */
+    @ReferenceProperty(baseProperty = "dxOrganizationId")
+    @VersionProperty(curVersion = VersionRelationType.ITERATION, refVersion = VersionRelationType.NONE)
+    private DxOrganizationVO dxOrganization;
+
+    /**
+    * 承办部门
+    */
+    private Long dxOrganizationId;
+
+    /**
+    * 承办部门
+    */
+    private String dxOrganizationIdType;
+
     /**
     * 文档
     */
@@ -201,6 +224,23 @@ public class ExtInComeContractVO extends IdOnlyVO implements DxIterationVOHolder
     */
     private String dxTechnicalFileIdType;
 
+    /**
+    * 经办人
+    */
+    @ReferenceProperty(baseProperty = "dxUserInfoId")
+    @VersionProperty(curVersion = VersionRelationType.ITERATION, refVersion = VersionRelationType.NONE)
+    private DxUserInfoVO dxUserInfo;
+
+    /**
+    * 经办人
+    */
+    private Long dxUserInfoId;
+
+    /**
+    * 经办人
+    */
+    private String dxUserInfoIdType;
+
     /**
     * 文档
     */
@@ -259,11 +299,6 @@ public class ExtInComeContractVO extends IdOnlyVO implements DxIterationVOHolder
     */
     private String itemNumber;
 
-    /**
-    * 经办人
-    */
-    private String undertaker;
-
     /**
     * 付款方式
     */
@@ -294,11 +329,6 @@ public class ExtInComeContractVO extends IdOnlyVO implements DxIterationVOHolder
     */
     private String supplierNumber;
 
-    /**
-    * 承办部门
-    */
-    private String undertakingDepartment;
-
 }
 
 

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

@@ -43,7 +43,7 @@ import com.yonde.dex.version.plugin.entities.DxIterationEmbeddable;
 * @description: ExtExpenditureContract-PO实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-24 16:48:59
+* @date: 2024-9-25 10:40:02
 **/
 @Entity
 @EqualsAndHashCode(callSuper = true)
@@ -135,41 +135,37 @@ public class ExtExpenditureContract extends IdOnlyEntity implements DxContextHol
     */
     private String designApprovalItems;
     /**
-    * 文档的id
+    * 合同附件的id
     */
-    @Column(name = "dxDocument1Id")
     private Long dxContractFileId;
     /**
-    * 文档的类型
+    * 合同附件的类型
     */
-    @Column(name = "dxDocument1IdType")
     private String dxContractFileIdType;
     /**
-    * 文档的id
+    * 合同文本的id
     */
-    @Column(name = "dxDocumentId")
     private Long dxContractTextFileId;
     /**
-    * 文档的类型
+    * 合同文本的类型
     */
-    @Column(name = "dxDocumentIdType")
     private String dxContractTextFileIdType;
     /**
-    * 文档的id
+    * 承办人部门的id
     */
-    private Long dxExplainFileId;
+    private Long dxOrganizationId;
     /**
-    * 文档的类型
+    * 承办人部门的类型
     */
-    private String dxExplainFileIdType;
+    private String dxOrganizationIdType;
     /**
-    * 文档的id
+    * 承办人的id
     */
-    private Long dxJgContraTextFileId;
+    private Long dxUserInfoId;
     /**
-    * 文档的类型
+    * 承办人的类型
     */
-    private String dxJgContraTextFileIdType;
+    private String dxUserInfoIdType;
     /**
     * 合同成果形式
     */
@@ -238,14 +234,6 @@ public class ExtExpenditureContract extends IdOnlyEntity implements DxContextHol
     * 供应商编号
     */
     private String supplierNumber;
-    /**
-    * 承办人
-    */
-    private String undertaker;
-    /**
-    * 承办部门
-    */
-    private String undertakingDepartment;
 }
 
 

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

@@ -43,7 +43,7 @@ import com.yonde.dex.version.plugin.entities.DxIterationEmbeddable;
 * @description: ExtInComeContract-PO实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-24 16:48:58
+* @date: 2024-9-25 10:06:47
 **/
 @Entity
 @EqualsAndHashCode(callSuper = true)
@@ -111,6 +111,14 @@ public class ExtInComeContract extends IdOnlyEntity implements DxContextHolder ,
     */
     private String contractWay;
     /**
+    * 承办部门的id
+    */
+    private Long dxOrganizationId;
+    /**
+    * 承办部门的类型
+    */
+    private String dxOrganizationIdType;
+    /**
     * 文档的id
     */
     private Long dxOtherFileId;
@@ -127,6 +135,14 @@ public class ExtInComeContract extends IdOnlyEntity implements DxContextHolder ,
     */
     private String dxTechnicalFileIdType;
     /**
+    * 经办人的id
+    */
+    private Long dxUserInfoId;
+    /**
+    * 经办人的类型
+    */
+    private String dxUserInfoIdType;
+    /**
     * 文档的id
     */
     private Long dxWorkFileId;
@@ -151,10 +167,6 @@ public class ExtInComeContract extends IdOnlyEntity implements DxContextHolder ,
     */
     private String itemNumber;
     /**
-    * 经办人
-    */
-    private String undertaker;
-    /**
     * 付款方式的类型
     */
     private String paymentMethod;
@@ -178,10 +190,6 @@ public class ExtInComeContract extends IdOnlyEntity implements DxContextHolder ,
     * 供应商编号
     */
     private String supplierNumber;
-    /**
-    * 承办部门
-    */
-    private String undertakingDepartment;
 }