合同管理

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

@@ -22,29 +22,35 @@ import javax.persistence.Column;
 import javax.persistence.Embedded;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import com.yonde.dex.dao.entity.base.IdEntity;
-import javax.persistence.Column;
+import com.yonde.dex.lcycle.plugin.entities.DxLifecycleManageBaseEmbeddable;
 import com.yonde.dex.context.plugin.entities.DxContextHolder;
+import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkHolder;
+import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkEmbeddable;
 import com.yonde.dex.context.plugin.entities.DxContextEmbeddable;
+import com.yonde.dex.dao.entity.base.IdOnlyEntity;
+import com.yonde.dex.version.plugin.entities.DxIterationHolder;
+import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteHolder;
+import com.yonde.dex.dao.entity.base.IdEntity;
+import javax.persistence.Column;
 import com.yonde.dex.secretcode.plugin.entities.DxSecretHolder;
+import com.yonde.dex.lcycle.plugin.entities.DxLifecycleManageBaseHolder;
 import com.yonde.dex.dao.entity.base.DxIdEntityEmbeddable;
 import com.yonde.dex.secretcode.plugin.entities.DxSecretEmbeddable;
-import com.yonde.dex.dao.entity.base.IdOnlyEntity;
-import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteHolder;
 import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteEmbeddable;
+import com.yonde.dex.version.plugin.entities.DxIterationEmbeddable;
 
 /**
-* @description: ExtIncomeContract-PO实体
+* @description: ExtInComeContract-PO实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-15 10:55:29
+* @date: 2024-9-24 16:48:58
 **/
 @Entity
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @Data
-@Table(name = "EXT_INCOME_CONTRACT")
-public class ExtIncomeContract extends IdOnlyEntity implements DxContextHolder ,IdEntity ,DxLogicDeleteHolder ,DxSecretHolder{
+@Table(name = "EXT_IN_COME_CONTRACT")
+public class ExtInComeContract extends IdOnlyEntity implements DxContextHolder ,DxObjFileLinkHolder ,DxLifecycleManageBaseHolder ,IdEntity ,DxLogicDeleteHolder ,DxIterationHolder ,DxSecretHolder{
 
     /**
     * 扩展PO属性
@@ -53,6 +59,18 @@ public class ExtIncomeContract extends IdOnlyEntity implements DxContextHolder ,
     @Embedded()
     private DxContextEmbeddable dxContextEmbeddable;
     /**
+    * 扩展PO属性
+    */
+    @DexEmbedded()
+    @Embedded()
+    private DxObjFileLinkEmbeddable dxObjFileLinkEmbeddable;
+    /**
+    * 扩展PO属性
+    */
+    @DexEmbedded()
+    @Embedded()
+    private DxLifecycleManageBaseEmbeddable dxLifecycleManageBaseEmbeddable;
+    /**
     * dao扩展对象
     */
     @DexEmbedded()
@@ -69,59 +87,61 @@ public class ExtIncomeContract extends IdOnlyEntity implements DxContextHolder ,
     */
     @DexEmbedded()
     @Embedded()
-    private DxSecretEmbeddable dxSecretEmbeddable;
+    private DxIterationEmbeddable dxIterationEmbeddable;
     /**
-    * 票据金额
+    * 扩展PO属性
     */
-    private BigDecimal billAmount;
+    @DexEmbedded()
+    @Embedded()
+    private DxSecretEmbeddable dxSecretEmbeddable;
     /**
-    * 票据号码
+    * 委托方
     */
-    private String billNumber;
+    private String client;
     /**
-    * 票据开具情况
+    * 合同金额
     */
-    private String billStatus;
+    private String contractAmount;
     /**
-    * 票据类型
+    * 合同类型的类型
     */
-    private String billType;
+    private String contractType;
     /**
-    * 合同名称
+    * 合同承包方式的类型
     */
-    private String contractName;
+    private String contractWay;
     /**
-    * 合同编号
+    * 文档的id
     */
-    private String contractNo;
+    private Long dxOtherFileId;
     /**
-    * 合同额
+    * 文档的类型
     */
-    private BigDecimal contractPrice;
+    private String dxOtherFileIdType;
     /**
-    * 合同价款类型
+    * 文档的id
     */
-    private String contractPriceType;
+    private Long dxTechnicalFileId;
     /**
-    * 合同经费构成
+    * 文档的类型
     */
-    private String contractfunding;
+    private String dxTechnicalFileIdType;
     /**
-    * 合同结束时间
+    * 文档的id
     */
-    private LocalDateTime endTime;
+    private Long dxWorkFileId;
     /**
-    * 校内财务账号
+    * 文档的类型
     */
-    private String financialCode;
+    private String dxWorkFileIdType;
     /**
-    * 执行财务规定
+    * 截止日期
     */
-    private String financialRegul;
+    private LocalDateTime endTime;
     /**
-    * 票据开具时间
+    * 合同累计收入金额
     */
-    private LocalDateTime issuanceTime;
+    private String incomeAmount;
     /**
     * 项目名称
     */
@@ -131,49 +151,37 @@ public class ExtIncomeContract extends IdOnlyEntity implements DxContextHolder ,
     */
     private String itemNumber;
     /**
-    * 项目来源
-    */
-    private String itemOrigin;
-    /**
-    * 项目属性
-    */
-    private String itemProperties;
-    /**
-    * 已到款
-    */
-    private BigDecimal paid;
-    /**
-    * 支付金额
+    * 经办人
     */
-    private BigDecimal payPrice;
+    private String operator;
     /**
-    * 	 支付时间
+    * 付款方式的类型
     */
-    private LocalDateTime payTime;
+    private String paymentMethod;
     /**
-    * 到款情况
+    * 履行期限的类型
     */
-    private String paymentSituat;
+    private String performTerm;
     /**
-    * 校内科研编号
+    * 定价方式的类型
     */
-    private String researchCode;
+    private String priceWay;
     /**
-    * 合同生效时间
+    * 签订时间
     */
-    private LocalDateTime startTime;
+    private LocalDateTime signTime;
     /**
-    * 税率
+    * 供应商名称
     */
-    private String tariff;
+    private String supplierName;
     /**
-    * 待拨付
+    * 供应商编号
     */
-    private Integer toBedisbursed;
+    private String supplierNumber;
     /**
-    * 审价额
+    * 承办部门
     */
-    private BigDecimal trialPrice;
+    private String undertakingDepartment;
 }