合同管理

dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtContractCollectionLinkVO.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.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.IdVO;
+import com.yonde.dex.linkdata.plugin.common.DxLinkDataVOHolder;
+import com.yonde.dex.linkdata.plugin.common.DxLinkDataVOEmbeddable;
+import com.yonde.dcs.plan.common.vo.ExtInComeContractVO;
+import com.yonde.dex.basedata.entity.users.DxUserVO;
+
+/**
+* @description: ExtContractCollectionLink-VO
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtContractCollectionLinkVO.class)
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ToString(callSuper = true)
+@DexTypeVersionProp(propName = "source", join = @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.ITERATION))
+public class ExtContractCollectionLinkVO extends IdOnlyVO implements IdVO ,DxLinkDataVOHolder<ExtInComeContractVO, ExtContractCollectionVO>{
+
+    public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
+    public static final String DX_LINK_DATA_EMBEDDABLE_PROP_NAME = "dxLinkDataEmbeddable";
+
+    /**
+    * dao扩展对象
+    */
+    @DexEmbedded()
+    @JsonIgnore
+    private DxIdVOEmbeddable dxIdEmbeddable;
+
+    /**
+    * 扩展VO属性
+    */
+    @DexEmbedded()
+    @JsonIgnore
+    private DxLinkDataVOEmbeddable<ExtInComeContractVO, ExtContractCollectionVO> dxLinkDataEmbeddable;
+
+}
+
+

dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtContractCollectionVO.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.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.dcs.plan.common.vo.ExtContractCollectionLinkVO;
+import com.yonde.dex.basedata.entity.vo.IdVO;
+import com.yonde.dex.basedata.entity.users.DxUserVO;
+
+/**
+* @description: ExtContractCollection-VO
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtContractCollectionVO.class)
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ToString(callSuper = true)
+public class ExtContractCollectionVO extends IdOnlyVO implements IdVO{
+
+    public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
+    public static final String COLLECTION_NAME_PROP_NAME = "collectionName";
+    public static final String CUMULATIVE_PERCENTAGE_PROP_NAME = "cumulativePercentage";
+    public static final String EXAMINE_NODE_PROP_NAME = "examineNode";
+    public static final String EXAMINE_PRICE_PROP_NAME = "examinePrice";
+    public static final String EXT_CONTRACT_COLLECTION_LINKS_PROP_NAME = "extContractCollectionLinks";
+
+    /**
+    * dao扩展对象
+    */
+    @DexEmbedded()
+    @JsonIgnore
+    private DxIdVOEmbeddable dxIdEmbeddable;
+
+    /**
+    * 收款名称
+    */
+    private String collectionName;
+
+    /**
+    * 累计百分比
+    */
+    private String cumulativePercentage;
+
+    /**
+    * 考核节点
+    */
+    private String examineNode;
+
+    /**
+    * 收款金额
+    */
+    private String examinePrice;
+
+    /**
+    * ExtContractCollectionLink集合
+    */
+    @RelationProperty(refProperty = "target")
+    @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
+    private List<ExtContractCollectionLinkVO> extContractCollectionLinks;
+
+}
+
+

dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtContractNodeLinkVO.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.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.IdVO;
+import com.yonde.dex.linkdata.plugin.common.DxLinkDataVOHolder;
+import com.yonde.dex.linkdata.plugin.common.DxLinkDataVOEmbeddable;
+import com.yonde.dcs.plan.common.vo.ExtInComeContractVO;
+import com.yonde.dex.basedata.entity.users.DxUserVO;
+
+/**
+* @description: ExtContractNodeLink-VO
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtContractNodeLinkVO.class)
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ToString(callSuper = true)
+@DexTypeVersionProp(propName = "source", join = @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.ITERATION))
+public class ExtContractNodeLinkVO extends IdOnlyVO implements DxLinkDataVOHolder<ExtInComeContractVO, ExtContractNodeVO> ,IdVO{
+
+    public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
+    public static final String DX_LINK_DATA_EMBEDDABLE_PROP_NAME = "dxLinkDataEmbeddable";
+
+    /**
+    * dao扩展对象
+    */
+    @DexEmbedded()
+    @JsonIgnore
+    private DxIdVOEmbeddable dxIdEmbeddable;
+
+    /**
+    * 扩展VO属性
+    */
+    @DexEmbedded()
+    @JsonIgnore
+    private DxLinkDataVOEmbeddable<ExtInComeContractVO, ExtContractNodeVO> dxLinkDataEmbeddable;
+
+}
+
+

dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtContractNodeVO.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.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.dcs.plan.common.vo.ExtContractNodeLinkVO;
+import com.yonde.dex.basedata.entity.vo.DxIdVOEmbeddable;
+import com.yonde.dex.basedata.entity.vo.IdVO;
+import com.yonde.dex.basedata.entity.users.DxUserVO;
+
+/**
+* @description: ExtContractNode-VO
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:58
+**/
+@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtContractNodeVO.class)
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ToString(callSuper = true)
+public class ExtContractNodeVO extends IdOnlyVO implements IdVO{
+
+    public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
+    public static final String ASSESSMENT_CONTENT_PROP_NAME = "assessmentContent";
+    public static final String ASSESSMENT_METHOD_PROP_NAME = "assessmentMethod";
+    public static final String EXPECT_TIME_PROP_NAME = "expectTime";
+    public static final String EXT_CONTRACT_NODE_LINKS_PROP_NAME = "extContractNodeLinks";
+    public static final String NOTES_PROP_NAME = "notes";
+
+    /**
+    * dao扩展对象
+    */
+    @DexEmbedded()
+    @JsonIgnore
+    private DxIdVOEmbeddable dxIdEmbeddable;
+
+    /**
+    * 合同节点考核内容
+    */
+    private String assessmentContent;
+
+    /**
+    * 考核方法
+    */
+    private String assessmentMethod;
+
+    /**
+    * 预计时间
+    */
+    private LocalDateTime expectTime;
+
+    /**
+    * ExtContractNodeLink集合
+    */
+    @RelationProperty(refProperty = "target")
+    @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
+    private List<ExtContractNodeLinkVO> extContractNodeLinks;
+
+    /**
+    * 备注
+    */
+    private String notes;
+
+}
+
+

dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtContractPaymentVO.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.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.dcs.plan.common.vo.ExtPaymentContractVO;
+import com.yonde.dex.basedata.entity.vo.IdVO;
+import com.yonde.dex.basedata.entity.users.DxUserVO;
+
+/**
+* @description: ExtContractPayment-VO
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtContractPaymentVO.class)
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ToString(callSuper = true)
+public class ExtContractPaymentVO extends IdOnlyVO implements IdVO{
+
+    public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
+    public static final String CUMULATIVE_PERCENTAGE_PROP_NAME = "cumulativePercentage";
+    public static final String EXT_PAYMENT_CONTRACTS_PROP_NAME = "extPaymentContracts";
+    public static final String NODE_CONTENT_PROP_NAME = "nodeContent";
+    public static final String PAYMENT_AMOUNT_PROP_NAME = "paymentAmount";
+
+    /**
+    * dao扩展对象
+    */
+    @DexEmbedded()
+    @JsonIgnore
+    private DxIdVOEmbeddable dxIdEmbeddable;
+
+    /**
+    * 累计百分比
+    */
+    private String cumulativePercentage;
+
+    /**
+    * ExtPaymentContract集合
+    */
+    @RelationProperty(refProperty = "target")
+    @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
+    private List<ExtPaymentContractVO> extPaymentContracts;
+
+    /**
+    * 节点内容
+    */
+    private String nodeContent;
+
+    /**
+    * 付款金额（万元）
+    */
+    private String paymentAmount;
+
+}
+
+

dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtContractSubjectMatterVO.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.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.IdVO;
+import com.yonde.dcs.plan.common.vo.ExtMatterContractVO;
+import com.yonde.dex.basedata.entity.users.DxUserVO;
+
+/**
+* @description: ExtContractSubjectMatter-VO
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:00
+**/
+@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtContractSubjectMatterVO.class)
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ToString(callSuper = true)
+public class ExtContractSubjectMatterVO extends IdOnlyVO implements IdVO{
+
+    public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
+    public static final String EXT_MATTER_CONTRACTS_PROP_NAME = "extMatterContracts";
+    public static final String MANUFACTURER_PROP_NAME = "manufacturer";
+    public static final String PRODUCT_FEATURES_PROP_NAME = "productFeatures";
+    public static final String PRODUCT_NAME_PROP_NAME = "productName";
+    public static final String QUANTITY_PROP_NAME = "quantity";
+    public static final String REMARK_PROP_NAME = "remark";
+    public static final String SPECIFICATION_MODEL_PROP_NAME = "specificationModel";
+    public static final String TOTAL_PROP_NAME = "total";
+    public static final String UNIT_PRICE_PROP_NAME = "unitPrice";
+
+    /**
+    * dao扩展对象
+    */
+    @DexEmbedded()
+    @JsonIgnore
+    private DxIdVOEmbeddable dxIdEmbeddable;
+
+    /**
+    * ExtMatterContract集合
+    */
+    @RelationProperty(refProperty = "target")
+    @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
+    private List<ExtMatterContractVO> extMatterContracts;
+
+    /**
+    * 生产厂家
+    */
+    private String manufacturer;
+
+    /**
+    * 产品功能
+    */
+    private String productFeatures;
+
+    /**
+    * 产品名称
+    */
+    private String productName;
+
+    /**
+    * 数量
+    */
+    private String quantity;
+
+    /**
+    * 备注
+    */
+    private String remark;
+
+    /**
+    * 规格型号
+    */
+    private String specificationModel;
+
+    /**
+    * 合计
+    */
+    private String total;
+
+    /**
+    * 单价（元）
+    */
+    private String unitPrice;
+
+}
+
+

dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtDevelopmentPlanVO.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.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.dcs.plan.common.vo.ExtPlanContractVO;
+import com.yonde.dex.basedata.entity.vo.DxIdVOEmbeddable;
+import com.yonde.dex.basedata.entity.vo.IdVO;
+import com.yonde.dex.basedata.entity.users.DxUserVO;
+
+/**
+* @description: ExtDevelopmentPlan-VO
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:00
+**/
+@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtDevelopmentPlanVO.class)
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ToString(callSuper = true)
+public class ExtDevelopmentPlanVO extends IdOnlyVO implements IdVO{
+
+    public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
+    public static final String DEVELOPMENT_CONTENT_PROP_NAME = "developmentContent";
+    public static final String DEVELOPMENT_CONTENT_PERSONER_PROP_NAME = "developmentContentPersoner";
+    public static final String EXPECTED_COMPLETION_TIME_PROP_NAME = "expectedCompletionTime";
+    public static final String EXT_PLAN_CONTRACTS_PROP_NAME = "extPlanContracts";
+    public static final String REMARK_PROP_NAME = "remark";
+
+    /**
+    * dao扩展对象
+    */
+    @DexEmbedded()
+    @JsonIgnore
+    private DxIdVOEmbeddable dxIdEmbeddable;
+
+    /**
+    * 研制内容
+    */
+    private String developmentContent;
+
+    /**
+    * 研制内容责任人
+    */
+    private String developmentContentPersoner;
+
+    /**
+    * 研制预计完成时间
+    */
+    private LocalDateTime expectedCompletionTime;
+
+    /**
+    * ExtPlanContract集合
+    */
+    @RelationProperty(refProperty = "target")
+    @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
+    private List<ExtPlanContractVO> extPlanContracts;
+
+    /**
+    * 备注
+    */
+    private String remark;
+
+}
+
+

dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtMatterContractVO.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.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.dcs.plan.common.vo.ExtExpenditureContractVO;
+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.basedata.entity.users.DxUserVO;
+
+/**
+* @description: ExtMatterContract-VO
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:01
+**/
+@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtMatterContractVO.class)
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ToString(callSuper = true)
+@DexTypeVersionProp(propName = "source", join = @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.ITERATION))
+public class ExtMatterContractVO extends IdOnlyVO implements DxLinkDataVOHolder<ExtExpenditureContractVO, ExtContractSubjectMatterVO> ,IdVO{
+
+    public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
+    public static final String DX_LINK_DATA_EMBEDDABLE_PROP_NAME = "dxLinkDataEmbeddable";
+
+    /**
+    * dao扩展对象
+    */
+    @DexEmbedded()
+    @JsonIgnore
+    private DxIdVOEmbeddable dxIdEmbeddable;
+
+    /**
+    * 扩展VO属性
+    */
+    @DexEmbedded()
+    @JsonIgnore
+    private DxLinkDataVOEmbeddable<ExtExpenditureContractVO, ExtContractSubjectMatterVO> dxLinkDataEmbeddable;
+
+}
+
+

dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtPaymentContractVO.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.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.dcs.plan.common.vo.ExtExpenditureContractVO;
+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.basedata.entity.users.DxUserVO;
+
+/**
+* @description: ExtPaymentContract-VO
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:00
+**/
+@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtPaymentContractVO.class)
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ToString(callSuper = true)
+@DexTypeVersionProp(propName = "source", join = @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.ITERATION))
+public class ExtPaymentContractVO extends IdOnlyVO implements IdVO ,DxLinkDataVOHolder<ExtExpenditureContractVO, ExtContractPaymentVO>{
+
+    public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
+    public static final String DX_LINK_DATA_EMBEDDABLE_PROP_NAME = "dxLinkDataEmbeddable";
+
+    /**
+    * dao扩展对象
+    */
+    @DexEmbedded()
+    @JsonIgnore
+    private DxIdVOEmbeddable dxIdEmbeddable;
+
+    /**
+    * 扩展VO属性
+    */
+    @DexEmbedded()
+    @JsonIgnore
+    private DxLinkDataVOEmbeddable<ExtExpenditureContractVO, ExtContractPaymentVO> dxLinkDataEmbeddable;
+
+}
+
+

dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtPlanContractVO.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.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.dcs.plan.common.vo.ExtExpenditureContractVO;
+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.basedata.entity.users.DxUserVO;
+
+/**
+* @description: ExtPlanContract-VO
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:01
+**/
+@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtPlanContractVO.class)
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ToString(callSuper = true)
+@DexTypeVersionProp(propName = "source", join = @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.ITERATION))
+public class ExtPlanContractVO extends IdOnlyVO implements IdVO ,DxLinkDataVOHolder<ExtExpenditureContractVO, ExtDevelopmentPlanVO>{
+
+    public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
+    public static final String DX_LINK_DATA_EMBEDDABLE_PROP_NAME = "dxLinkDataEmbeddable";
+
+    /**
+    * dao扩展对象
+    */
+    @DexEmbedded()
+    @JsonIgnore
+    private DxIdVOEmbeddable dxIdEmbeddable;
+
+    /**
+    * 扩展VO属性
+    */
+    @DexEmbedded()
+    @JsonIgnore
+    private DxLinkDataVOEmbeddable<ExtExpenditureContractVO, ExtDevelopmentPlanVO> dxLinkDataEmbeddable;
+
+}
+
+

dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtResearchContractVO.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.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.dcs.plan.common.vo.ExtExpenditureContractVO;
+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.basedata.entity.users.DxUserVO;
+
+/**
+* @description: ExtResearchContract-VO
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtResearchContractVO.class)
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ToString(callSuper = true)
+@DexTypeVersionProp(propName = "source", join = @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.ITERATION))
+public class ExtResearchContractVO extends IdOnlyVO implements IdVO ,DxLinkDataVOHolder<ExtExpenditureContractVO, ExtResearchProgressVO>{
+
+    public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
+    public static final String DX_LINK_DATA_EMBEDDABLE_PROP_NAME = "dxLinkDataEmbeddable";
+
+    /**
+    * dao扩展对象
+    */
+    @DexEmbedded()
+    @JsonIgnore
+    private DxIdVOEmbeddable dxIdEmbeddable;
+
+    /**
+    * 扩展VO属性
+    */
+    @DexEmbedded()
+    @JsonIgnore
+    private DxLinkDataVOEmbeddable<ExtExpenditureContractVO, ExtResearchProgressVO> dxLinkDataEmbeddable;
+
+}
+
+

dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtResearchProgressVO.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.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.dcs.plan.common.vo.ExtResearchContractVO;
+import com.yonde.dex.basedata.entity.vo.IdVO;
+import com.yonde.dex.basedata.entity.users.DxUserVO;
+
+/**
+* @description: ExtResearchProgress-VO
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtResearchProgressVO.class)
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ToString(callSuper = true)
+public class ExtResearchProgressVO extends IdOnlyVO implements IdVO{
+
+    public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
+    public static final String ASSESSMENT_METHOD_PROP_NAME = "assessmentMethod";
+    public static final String COMPLETION_TIME_PROP_NAME = "completionTime";
+    public static final String DEVELOPMENT_CONTENT_PROP_NAME = "developmentContent";
+    public static final String EXT_RESEARCH_CONTRACTS_PROP_NAME = "extResearchContracts";
+    public static final String FORM_ACHIEVEMENT_PROP_NAME = "formAchievement";
+
+    /**
+    * dao扩展对象
+    */
+    @DexEmbedded()
+    @JsonIgnore
+    private DxIdVOEmbeddable dxIdEmbeddable;
+
+    /**
+    * 考核方式
+    */
+    private String assessmentMethod;
+
+    /**
+    * 完成时间
+    */
+    private LocalDateTime completionTime;
+
+    /**
+    * 研制内容
+    */
+    private String developmentContent;
+
+    /**
+    * ExtResearchContract集合
+    */
+    @RelationProperty(refProperty = "target")
+    @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
+    private List<ExtResearchContractVO> extResearchContracts;
+
+    /**
+    * 成果形式
+    */
+    private String formAchievement;
+
+}
+
+

dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtScientificResearchAchievementsVO.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.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.IdVO;
+import com.yonde.dcs.plan.common.vo.ExtScientificResearchContractVO;
+import com.yonde.dex.basedata.entity.users.DxUserVO;
+
+/**
+* @description: ExtScientificResearchAchievements-VO
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:00
+**/
+@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtScientificResearchAchievementsVO.class)
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ToString(callSuper = true)
+public class ExtScientificResearchAchievementsVO extends IdOnlyVO implements IdVO{
+
+    public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
+    public static final String ACHIEVEMENTS_NAME_PROP_NAME = "achievementsName";
+    public static final String ACHIEVEMENTS_QUANTITY_PROP_NAME = "achievementsQuantity";
+    public static final String ACHIEVEMENTS_TYPE_PROP_NAME = "achievementsType";
+    public static final String EXT_SCIENTIFIC_RESEARCH_CONTRACTS_PROP_NAME = "extScientificResearchContracts";
+
+    /**
+    * dao扩展对象
+    */
+    @DexEmbedded()
+    @JsonIgnore
+    private DxIdVOEmbeddable dxIdEmbeddable;
+
+    /**
+    * 科研成果名称
+    */
+    private String achievementsName;
+
+    /**
+    * 科研成果数量
+    */
+    private Integer achievementsQuantity;
+
+    /**
+    * 科研成果类型
+    */
+    private String achievementsType;
+
+    /**
+    * ExtScientificResearchContract集合
+    */
+    @RelationProperty(refProperty = "target")
+    @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
+    private List<ExtScientificResearchContractVO> extScientificResearchContracts;
+
+}
+
+

dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtScientificResearchContractVO.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.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.dcs.plan.common.vo.ExtExpenditureContractVO;
+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.basedata.entity.users.DxUserVO;
+
+/**
+* @description: ExtScientificResearchContract-VO
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:00
+**/
+@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtScientificResearchContractVO.class)
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ToString(callSuper = true)
+@DexTypeVersionProp(propName = "source", join = @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.ITERATION))
+public class ExtScientificResearchContractVO extends IdOnlyVO implements DxLinkDataVOHolder<ExtExpenditureContractVO, ExtScientificResearchAchievementsVO> ,IdVO{
+
+    public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
+    public static final String DX_LINK_DATA_EMBEDDABLE_PROP_NAME = "dxLinkDataEmbeddable";
+
+    /**
+    * dao扩展对象
+    */
+    @DexEmbedded()
+    @JsonIgnore
+    private DxIdVOEmbeddable dxIdEmbeddable;
+
+    /**
+    * 扩展VO属性
+    */
+    @DexEmbedded()
+    @JsonIgnore
+    private DxLinkDataVOEmbeddable<ExtExpenditureContractVO, ExtScientificResearchAchievementsVO> dxLinkDataEmbeddable;
+
+}
+
+

dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtTopicContractLinkVO.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.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.IdVO;
+import com.yonde.dex.linkdata.plugin.common.DxLinkDataVOHolder;
+import com.yonde.dex.linkdata.plugin.common.DxLinkDataVOEmbeddable;
+import com.yonde.dcs.plan.common.vo.ExtInComeContractVO;
+import com.yonde.dex.basedata.entity.users.DxUserVO;
+
+/**
+* @description: ExtTopicContractLink-VO
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtTopicContractLinkVO.class)
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ToString(callSuper = true)
+@DexTypeVersionProp(propName = "source", join = @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.ITERATION))
+public class ExtTopicContractLinkVO extends IdOnlyVO implements IdVO ,DxLinkDataVOHolder<ExtInComeContractVO, ExtTopicPreparationVO>{
+
+    public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
+    public static final String DX_LINK_DATA_EMBEDDABLE_PROP_NAME = "dxLinkDataEmbeddable";
+
+    /**
+    * dao扩展对象
+    */
+    @DexEmbedded()
+    @JsonIgnore
+    private DxIdVOEmbeddable dxIdEmbeddable;
+
+    /**
+    * 扩展VO属性
+    */
+    @DexEmbedded()
+    @JsonIgnore
+    private DxLinkDataVOEmbeddable<ExtInComeContractVO, ExtTopicPreparationVO> dxLinkDataEmbeddable;
+
+}
+
+

dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtTopicPreparationVO.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.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.dcs.plan.common.vo.ExtTopicContractLinkVO;
+import com.yonde.dex.basedata.entity.vo.IdVO;
+import com.yonde.dex.basedata.entity.users.DxUserVO;
+
+/**
+* @description: ExtTopicPreparation-VO
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:58
+**/
+@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtTopicPreparationVO.class)
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ToString(callSuper = true)
+public class ExtTopicPreparationVO extends IdOnlyVO implements IdVO{
+
+    public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
+    public static final String COMPLETE_TIME_PROP_NAME = "completeTime";
+    public static final String ESTIMATED_COST_PROP_NAME = "estimatedCost";
+    public static final String EXT_TOPIC_CONTRACT_LINKS_PROP_NAME = "extTopicContractLinks";
+    public static final String GAIN_CONTENT_PROP_NAME = "gainContent";
+    public static final String PREPARE_CONTENT_PROP_NAME = "prepareContent";
+    public static final String PREPARE_GAIN_PROP_NAME = "prepareGain";
+    public static final String TOPIC_NAME_PROP_NAME = "topicName";
+
+    /**
+    * dao扩展对象
+    */
+    @DexEmbedded()
+    @JsonIgnore
+    private DxIdVOEmbeddable dxIdEmbeddable;
+
+    /**
+    * 完成时间
+    */
+    private LocalDateTime completeTime;
+
+    /**
+    * 预算费用
+    */
+    private String estimatedCost;
+
+    /**
+    * ExtTopicContractLink集合
+    */
+    @RelationProperty(refProperty = "target")
+    @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
+    private List<ExtTopicContractLinkVO> extTopicContractLinks;
+
+    /**
+    * 成果内容
+    */
+    private String gainContent;
+
+    /**
+    * 研制内容
+    */
+    private String prepareContent;
+
+    /**
+    * 研制成果形式
+    */
+    private String prepareGain;
+
+    /**
+    * 课题名称
+    */
+    private String topicName;
+
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/ExtContractCollectionController.java

+package com.yonde.dcs.plan.core.controller;
+
+import org.springframework.stereotype.Controller;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtContractCollectionVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtContractCollectionService;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import com.yonde.dcs.plan.core.controller.shadow.ExtContractCollectionControllerShadow;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Controller;
+
+/**
+* @description: ExtContractCollection-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+@Api(tags = "ExtContractCollection管理服务")
+@RequestMapping("/ExtContractCollection")
+@ResponseBody()
+@Controller(ExtContractCollectionController.BEAN_NAME)
+public class ExtContractCollectionController<V extends ExtContractCollectionVO, S extends ExtContractCollectionService<V>> extends ExtContractCollectionControllerShadow<V, S> {
+
+
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/ExtContractCollectionLinkController.java

+package com.yonde.dcs.plan.core.controller;
+
+import org.springframework.stereotype.Controller;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtContractCollectionLinkVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtContractCollectionLinkService;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import com.yonde.dcs.plan.core.controller.shadow.ExtContractCollectionLinkControllerShadow;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Controller;
+
+/**
+* @description: ExtContractCollectionLink-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+@Api(tags = "ExtContractCollectionLink管理服务")
+@RequestMapping("/ExtContractCollectionLink")
+@ResponseBody()
+@Controller(ExtContractCollectionLinkController.BEAN_NAME)
+public class ExtContractCollectionLinkController<V extends ExtContractCollectionLinkVO, S extends ExtContractCollectionLinkService<V>> extends ExtContractCollectionLinkControllerShadow<V, S> {
+
+
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/ExtContractNodeController.java

+package com.yonde.dcs.plan.core.controller;
+
+import org.springframework.stereotype.Controller;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtContractNodeVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtContractNodeService;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import com.yonde.dcs.plan.core.controller.shadow.ExtContractNodeControllerShadow;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Controller;
+
+/**
+* @description: ExtContractNode-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:58
+**/
+@Api(tags = "ExtContractNode管理服务")
+@RequestMapping("/ExtContractNode")
+@ResponseBody()
+@Controller(ExtContractNodeController.BEAN_NAME)
+public class ExtContractNodeController<V extends ExtContractNodeVO, S extends ExtContractNodeService<V>> extends ExtContractNodeControllerShadow<V, S> {
+
+
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/ExtContractNodeLinkController.java

+package com.yonde.dcs.plan.core.controller;
+
+import org.springframework.stereotype.Controller;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtContractNodeLinkVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtContractNodeLinkService;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import com.yonde.dcs.plan.core.controller.shadow.ExtContractNodeLinkControllerShadow;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Controller;
+
+/**
+* @description: ExtContractNodeLink-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+@Api(tags = "ExtContractNodeLink管理服务")
+@RequestMapping("/ExtContractNodeLink")
+@ResponseBody()
+@Controller(ExtContractNodeLinkController.BEAN_NAME)
+public class ExtContractNodeLinkController<V extends ExtContractNodeLinkVO, S extends ExtContractNodeLinkService<V>> extends ExtContractNodeLinkControllerShadow<V, S> {
+
+
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/ExtContractPaymentController.java

+package com.yonde.dcs.plan.core.controller;
+
+import org.springframework.stereotype.Controller;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtContractPaymentVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtContractPaymentService;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import com.yonde.dcs.plan.core.controller.shadow.ExtContractPaymentControllerShadow;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Controller;
+
+/**
+* @description: ExtContractPayment-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:00
+**/
+@Api(tags = "ExtContractPayment管理服务")
+@RequestMapping("/ExtContractPayment")
+@ResponseBody()
+@Controller(ExtContractPaymentController.BEAN_NAME)
+public class ExtContractPaymentController<V extends ExtContractPaymentVO, S extends ExtContractPaymentService<V>> extends ExtContractPaymentControllerShadow<V, S> {
+
+
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/ExtContractSubjectMatterController.java

+package com.yonde.dcs.plan.core.controller;
+
+import org.springframework.stereotype.Controller;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtContractSubjectMatterVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtContractSubjectMatterService;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import com.yonde.dcs.plan.core.controller.shadow.ExtContractSubjectMatterControllerShadow;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Controller;
+
+/**
+* @description: ExtContractSubjectMatter-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:00
+**/
+@Api(tags = "ExtContractSubjectMatter管理服务")
+@RequestMapping("/ExtContractSubjectMatter")
+@ResponseBody()
+@Controller(ExtContractSubjectMatterController.BEAN_NAME)
+public class ExtContractSubjectMatterController<V extends ExtContractSubjectMatterVO, S extends ExtContractSubjectMatterService<V>> extends ExtContractSubjectMatterControllerShadow<V, S> {
+
+
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/ExtDevelopmentPlanController.java

+package com.yonde.dcs.plan.core.controller;
+
+import org.springframework.stereotype.Controller;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtDevelopmentPlanVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtDevelopmentPlanService;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import com.yonde.dcs.plan.core.controller.shadow.ExtDevelopmentPlanControllerShadow;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Controller;
+
+/**
+* @description: ExtDevelopmentPlan-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:00
+**/
+@Api(tags = "ExtDevelopmentPlan管理服务")
+@RequestMapping("/ExtDevelopmentPlan")
+@ResponseBody()
+@Controller(ExtDevelopmentPlanController.BEAN_NAME)
+public class ExtDevelopmentPlanController<V extends ExtDevelopmentPlanVO, S extends ExtDevelopmentPlanService<V>> extends ExtDevelopmentPlanControllerShadow<V, S> {
+
+
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/ExtExpenditureContractController.java

+package com.yonde.dcs.plan.core.controller;
+
+import org.springframework.stereotype.Controller;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtExpenditureContractVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtExpenditureContractService;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import com.yonde.dcs.plan.core.controller.shadow.ExtExpenditureContractControllerShadow;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Controller;
+
+/**
+* @description: ExtExpenditureContract-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+@Api(tags = "ExtExpenditureContract管理服务")
+@RequestMapping("/ExtExpenditureContract")
+@ResponseBody()
+@Controller(ExtExpenditureContractController.BEAN_NAME)
+public class ExtExpenditureContractController<V extends ExtExpenditureContractVO, S extends ExtExpenditureContractService<V>> extends ExtExpenditureContractControllerShadow<V, S> {
+
+
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/ExtIncomeContractController.java

-package com.yonde.dcs.plan.core.controller;
-
-import org.springframework.stereotype.Controller;
-import io.swagger.annotations.ApiOperation;
-import com.yonde.dcs.plan.common.vo.ExtIncomeContractOldVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.*;
-import com.yonde.dcs.plan.core.service.ExtIncomeContractService;
-import com.yonde.dex.basedata.entity.api.ApiResult;
-import com.yonde.dcs.plan.core.controller.shadow.ExtIncomeContractControllerShadow;
-
-/**
-* @description: ExtIncomeContract-Controller
-* @author: dexadmin
-* @version: V
-* @date: 2024-7-26 9:34:06
-**/
-@Api(tags = "ExtIncomeContract管理服务")
-@RequestMapping("/ExtIncomeContract")
-@ResponseBody()
-@Controller(ExtIncomeContractController.BEAN_NAME)
-public class ExtIncomeContractController<V extends ExtIncomeContractOldVO, S extends ExtIncomeContractService<V>> extends ExtIncomeContractControllerShadow<V, S> {
-
-    @Autowired
-    private ExtIncomeContractService extIncomeContractService;
-
-
-    @ApiOperation(value = "合同收入计算", notes = "合同收入计算", httpMethod = "GET")
-    @GetMapping("/calculateIncome/{id}")
-    public ApiResult calculateIncome(@PathVariable Long id) {
-        //通过收入基本属性id获取多个收入信息
-        ExtIncomeContractOldVO extIncomeContract = extIncomeContractService.calculateIncome(id);
-        return ApiResult.ok(extIncomeContract);
-    }
-
-    @ApiOperation(value = "xxx年到款计算", notes = "xxx年到款计算", httpMethod = "GET")
-    @GetMapping("/calculateIncome")
-    public ApiResult calculateIncomeByYear(@RequestParam Long id, String year) {
-        //todo wq：因为service继承了feign接口，所以要service接口必须实现feign接口，故将逻辑代码放入service中
-        return ApiResult.ok(extIncomeContractService.calculateIncomeByYear(id,year));
-    }
-
-    @ApiOperation(value = "重新计算收入到款", notes = "重新计算收入到款", httpMethod = "GET")
-    @GetMapping("/reCalculIncomeById")
-    public ApiResult reCalculIncomeById(@RequestParam("id") Long id){
-        return ApiResult.ok(extIncomeContractService.reCalculIncomeById(id));
-    }
-
-
-}
-
-

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/ExtMatterContractController.java

+package com.yonde.dcs.plan.core.controller;
+
+import org.springframework.stereotype.Controller;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtMatterContractVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtMatterContractService;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import com.yonde.dcs.plan.core.controller.shadow.ExtMatterContractControllerShadow;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Controller;
+
+/**
+* @description: ExtMatterContract-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:01
+**/
+@Api(tags = "ExtMatterContract管理服务")
+@RequestMapping("/ExtMatterContract")
+@ResponseBody()
+@Controller(ExtMatterContractController.BEAN_NAME)
+public class ExtMatterContractController<V extends ExtMatterContractVO, S extends ExtMatterContractService<V>> extends ExtMatterContractControllerShadow<V, S> {
+
+
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/ExtPaymentContractController.java

+package com.yonde.dcs.plan.core.controller;
+
+import org.springframework.stereotype.Controller;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtPaymentContractVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtPaymentContractService;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import com.yonde.dcs.plan.core.controller.shadow.ExtPaymentContractControllerShadow;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Controller;
+
+/**
+* @description: ExtPaymentContract-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:00
+**/
+@Api(tags = "ExtPaymentContract管理服务")
+@RequestMapping("/ExtPaymentContract")
+@ResponseBody()
+@Controller(ExtPaymentContractController.BEAN_NAME)
+public class ExtPaymentContractController<V extends ExtPaymentContractVO, S extends ExtPaymentContractService<V>> extends ExtPaymentContractControllerShadow<V, S> {
+
+
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/ExtPlanContractController.java

+package com.yonde.dcs.plan.core.controller;
+
+import org.springframework.stereotype.Controller;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtPlanContractVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtPlanContractService;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import com.yonde.dcs.plan.core.controller.shadow.ExtPlanContractControllerShadow;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Controller;
+
+/**
+* @description: ExtPlanContract-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:01
+**/
+@Api(tags = "ExtPlanContract管理服务")
+@RequestMapping("/ExtPlanContract")
+@ResponseBody()
+@Controller(ExtPlanContractController.BEAN_NAME)
+public class ExtPlanContractController<V extends ExtPlanContractVO, S extends ExtPlanContractService<V>> extends ExtPlanContractControllerShadow<V, S> {
+
+
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/ExtResearchContractController.java

+package com.yonde.dcs.plan.core.controller;
+
+import org.springframework.stereotype.Controller;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtResearchContractVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtResearchContractService;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import com.yonde.dcs.plan.core.controller.shadow.ExtResearchContractControllerShadow;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Controller;
+
+/**
+* @description: ExtResearchContract-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+@Api(tags = "ExtResearchContract管理服务")
+@RequestMapping("/ExtResearchContract")
+@ResponseBody()
+@Controller(ExtResearchContractController.BEAN_NAME)
+public class ExtResearchContractController<V extends ExtResearchContractVO, S extends ExtResearchContractService<V>> extends ExtResearchContractControllerShadow<V, S> {
+
+
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/ExtResearchProgressController.java

+package com.yonde.dcs.plan.core.controller;
+
+import org.springframework.stereotype.Controller;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtResearchProgressVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtResearchProgressService;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import com.yonde.dcs.plan.core.controller.shadow.ExtResearchProgressControllerShadow;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Controller;
+
+/**
+* @description: ExtResearchProgress-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+@Api(tags = "ExtResearchProgress管理服务")
+@RequestMapping("/ExtResearchProgress")
+@ResponseBody()
+@Controller(ExtResearchProgressController.BEAN_NAME)
+public class ExtResearchProgressController<V extends ExtResearchProgressVO, S extends ExtResearchProgressService<V>> extends ExtResearchProgressControllerShadow<V, S> {
+
+
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/ExtScientificResearchAchievementsController.java

+package com.yonde.dcs.plan.core.controller;
+
+import org.springframework.stereotype.Controller;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtScientificResearchAchievementsVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtScientificResearchAchievementsService;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import com.yonde.dcs.plan.core.controller.shadow.ExtScientificResearchAchievementsControllerShadow;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Controller;
+
+/**
+* @description: ExtScientificResearchAchievements-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:00
+**/
+@Api(tags = "ExtScientificResearchAchievements管理服务")
+@RequestMapping("/ExtScientificResearchAchievements")
+@ResponseBody()
+@Controller(ExtScientificResearchAchievementsController.BEAN_NAME)
+public class ExtScientificResearchAchievementsController<V extends ExtScientificResearchAchievementsVO, S extends ExtScientificResearchAchievementsService<V>> extends ExtScientificResearchAchievementsControllerShadow<V, S> {
+
+
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/ExtScientificResearchContractController.java

+package com.yonde.dcs.plan.core.controller;
+
+import org.springframework.stereotype.Controller;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtScientificResearchContractVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtScientificResearchContractService;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import com.yonde.dcs.plan.core.controller.shadow.ExtScientificResearchContractControllerShadow;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Controller;
+
+/**
+* @description: ExtScientificResearchContract-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:00
+**/
+@Api(tags = "ExtScientificResearchContract管理服务")
+@RequestMapping("/ExtScientificResearchContract")
+@ResponseBody()
+@Controller(ExtScientificResearchContractController.BEAN_NAME)
+public class ExtScientificResearchContractController<V extends ExtScientificResearchContractVO, S extends ExtScientificResearchContractService<V>> extends ExtScientificResearchContractControllerShadow<V, S> {
+
+
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/ExtTopicContractLinkController.java

+package com.yonde.dcs.plan.core.controller;
+
+import org.springframework.stereotype.Controller;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtTopicContractLinkVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtTopicContractLinkService;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import com.yonde.dcs.plan.core.controller.shadow.ExtTopicContractLinkControllerShadow;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Controller;
+
+/**
+* @description: ExtTopicContractLink-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+@Api(tags = "ExtTopicContractLink管理服务")
+@RequestMapping("/ExtTopicContractLink")
+@ResponseBody()
+@Controller(ExtTopicContractLinkController.BEAN_NAME)
+public class ExtTopicContractLinkController<V extends ExtTopicContractLinkVO, S extends ExtTopicContractLinkService<V>> extends ExtTopicContractLinkControllerShadow<V, S> {
+
+
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/ExtTopicPreparationController.java

+package com.yonde.dcs.plan.core.controller;
+
+import org.springframework.stereotype.Controller;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtTopicPreparationVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtTopicPreparationService;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import com.yonde.dcs.plan.core.controller.shadow.ExtTopicPreparationControllerShadow;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Controller;
+
+/**
+* @description: ExtTopicPreparation-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:58
+**/
+@Api(tags = "ExtTopicPreparation管理服务")
+@RequestMapping("/ExtTopicPreparation")
+@ResponseBody()
+@Controller(ExtTopicPreparationController.BEAN_NAME)
+public class ExtTopicPreparationController<V extends ExtTopicPreparationVO, S extends ExtTopicPreparationService<V>> extends ExtTopicPreparationControllerShadow<V, S> {
+
+
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/shadow/ExtContractCollectionControllerShadow.java

+package com.yonde.dcs.plan.core.controller.shadow;
+
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtContractCollectionVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtContractCollectionService;
+import com.yonde.dcs.plan.core.service.impl.ExtContractCollectionServiceImpl;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import javax.annotation.Resource;
+import com.yonde.dex.baseweb.AbstractBaseController;
+
+/**
+* @description: ExtContractCollection-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+public class ExtContractCollectionControllerShadow<V extends ExtContractCollectionVO, S extends ExtContractCollectionService<V>> implements AbstractBaseController<V, S>{
+
+    public static final String BEAN_NAME = "extContractCollectionController";
+
+
+    /**
+    * 注入
+    */
+    @Resource(name = ExtContractCollectionServiceImpl.BEAN_NAME)
+    private ExtContractCollectionService<V> extContractCollectionService;
+
+    /**
+        * getService
+    */
+    @Override
+    public S getService() {
+        return (S)this.extContractCollectionService;
+    }
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/shadow/ExtContractCollectionLinkControllerShadow.java

+package com.yonde.dcs.plan.core.controller.shadow;
+
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtContractCollectionLinkVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtContractCollectionLinkService;
+import com.yonde.dcs.plan.core.service.impl.ExtContractCollectionLinkServiceImpl;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import javax.annotation.Resource;
+import com.yonde.dex.linkdata.plugin.core.controller.DxLinkDataController;
+import com.yonde.dex.baseweb.AbstractBaseController;
+
+/**
+* @description: ExtContractCollectionLink-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+public class ExtContractCollectionLinkControllerShadow<V extends ExtContractCollectionLinkVO, S extends ExtContractCollectionLinkService<V>> implements AbstractBaseController<V, S> ,DxLinkDataController<V, S>{
+
+    public static final String BEAN_NAME = "extContractCollectionLinkController";
+
+
+    /**
+    * 注入
+    */
+    @Resource(name = ExtContractCollectionLinkServiceImpl.BEAN_NAME)
+    private ExtContractCollectionLinkService<V> extContractCollectionLinkService;
+
+    /**
+        * getService
+    */
+    @Override
+    public S getService() {
+        return (S)this.extContractCollectionLinkService;
+    }
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/shadow/ExtContractNodeControllerShadow.java

+package com.yonde.dcs.plan.core.controller.shadow;
+
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtContractNodeVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtContractNodeService;
+import com.yonde.dcs.plan.core.service.impl.ExtContractNodeServiceImpl;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import javax.annotation.Resource;
+import com.yonde.dex.baseweb.AbstractBaseController;
+
+/**
+* @description: ExtContractNode-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:58
+**/
+public class ExtContractNodeControllerShadow<V extends ExtContractNodeVO, S extends ExtContractNodeService<V>> implements AbstractBaseController<V, S>{
+
+    public static final String BEAN_NAME = "extContractNodeController";
+
+
+    /**
+    * 注入
+    */
+    @Resource(name = ExtContractNodeServiceImpl.BEAN_NAME)
+    private ExtContractNodeService<V> extContractNodeService;
+
+    /**
+        * getService
+    */
+    @Override
+    public S getService() {
+        return (S)this.extContractNodeService;
+    }
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/shadow/ExtContractNodeLinkControllerShadow.java

+package com.yonde.dcs.plan.core.controller.shadow;
+
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtContractNodeLinkVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtContractNodeLinkService;
+import com.yonde.dcs.plan.core.service.impl.ExtContractNodeLinkServiceImpl;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import javax.annotation.Resource;
+import com.yonde.dex.linkdata.plugin.core.controller.DxLinkDataController;
+import com.yonde.dex.baseweb.AbstractBaseController;
+
+/**
+* @description: ExtContractNodeLink-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+public class ExtContractNodeLinkControllerShadow<V extends ExtContractNodeLinkVO, S extends ExtContractNodeLinkService<V>> implements AbstractBaseController<V, S> ,DxLinkDataController<V, S>{
+
+    public static final String BEAN_NAME = "extContractNodeLinkController";
+
+
+    /**
+    * 注入
+    */
+    @Resource(name = ExtContractNodeLinkServiceImpl.BEAN_NAME)
+    private ExtContractNodeLinkService<V> extContractNodeLinkService;
+
+    /**
+        * getService
+    */
+    @Override
+    public S getService() {
+        return (S)this.extContractNodeLinkService;
+    }
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/shadow/ExtContractPaymentControllerShadow.java

+package com.yonde.dcs.plan.core.controller.shadow;
+
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtContractPaymentVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtContractPaymentService;
+import com.yonde.dcs.plan.core.service.impl.ExtContractPaymentServiceImpl;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import javax.annotation.Resource;
+import com.yonde.dex.baseweb.AbstractBaseController;
+
+/**
+* @description: ExtContractPayment-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:00
+**/
+public class ExtContractPaymentControllerShadow<V extends ExtContractPaymentVO, S extends ExtContractPaymentService<V>> implements AbstractBaseController<V, S>{
+
+    public static final String BEAN_NAME = "extContractPaymentController";
+
+
+    /**
+    * 注入
+    */
+    @Resource(name = ExtContractPaymentServiceImpl.BEAN_NAME)
+    private ExtContractPaymentService<V> extContractPaymentService;
+
+    /**
+        * getService
+    */
+    @Override
+    public S getService() {
+        return (S)this.extContractPaymentService;
+    }
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/shadow/ExtContractSubjectMatterControllerShadow.java

+package com.yonde.dcs.plan.core.controller.shadow;
+
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtContractSubjectMatterVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtContractSubjectMatterService;
+import com.yonde.dcs.plan.core.service.impl.ExtContractSubjectMatterServiceImpl;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import javax.annotation.Resource;
+import com.yonde.dex.baseweb.AbstractBaseController;
+
+/**
+* @description: ExtContractSubjectMatter-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:00
+**/
+public class ExtContractSubjectMatterControllerShadow<V extends ExtContractSubjectMatterVO, S extends ExtContractSubjectMatterService<V>> implements AbstractBaseController<V, S>{
+
+    public static final String BEAN_NAME = "extContractSubjectMatterController";
+
+
+    /**
+    * 注入
+    */
+    @Resource(name = ExtContractSubjectMatterServiceImpl.BEAN_NAME)
+    private ExtContractSubjectMatterService<V> extContractSubjectMatterService;
+
+    /**
+        * getService
+    */
+    @Override
+    public S getService() {
+        return (S)this.extContractSubjectMatterService;
+    }
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/shadow/ExtDevelopmentPlanControllerShadow.java

+package com.yonde.dcs.plan.core.controller.shadow;
+
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtDevelopmentPlanVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtDevelopmentPlanService;
+import com.yonde.dcs.plan.core.service.impl.ExtDevelopmentPlanServiceImpl;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import javax.annotation.Resource;
+import com.yonde.dex.baseweb.AbstractBaseController;
+
+/**
+* @description: ExtDevelopmentPlan-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:00
+**/
+public class ExtDevelopmentPlanControllerShadow<V extends ExtDevelopmentPlanVO, S extends ExtDevelopmentPlanService<V>> implements AbstractBaseController<V, S>{
+
+    public static final String BEAN_NAME = "extDevelopmentPlanController";
+
+
+    /**
+    * 注入
+    */
+    @Resource(name = ExtDevelopmentPlanServiceImpl.BEAN_NAME)
+    private ExtDevelopmentPlanService<V> extDevelopmentPlanService;
+
+    /**
+        * getService
+    */
+    @Override
+    public S getService() {
+        return (S)this.extDevelopmentPlanService;
+    }
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/shadow/ExtExpenditureContractControllerShadow.java

+package com.yonde.dcs.plan.core.controller.shadow;
+
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtExpenditureContractVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtExpenditureContractService;
+import com.yonde.dcs.plan.core.service.impl.ExtExpenditureContractServiceImpl;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import javax.annotation.Resource;
+import com.yonde.dex.basedata.auth.annos.PermissionObject;
+import com.yonde.dex.version.plugin.core.controller.AbstractVersionBaseController;
+import com.yonde.dex.basedata.auth.annos.SubPermission;
+import com.yonde.entity.annotation.SandBoxOpen;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dex.dfs.objfilelink.plugin.core.controller.DxObjFileLinkController;
+import com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder;
+import com.yonde.dex.lcycle.plugin.core.controller.AbstractLifecycleBaseController;
+import com.yonde.dex.baseweb.AbstractBaseController;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+
+/**
+* @description: ExtExpenditureContract-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+public class ExtExpenditureContractControllerShadow<V extends ExtExpenditureContractVO, S extends ExtExpenditureContractService<V>> implements AbstractBaseController<V, S> ,AbstractLifecycleBaseController<V, S> ,AbstractVersionBaseController<V, S> ,DxObjFileLinkController<V, S>{
+
+    public static final String BEAN_NAME = "extExpenditureContractController";
+
+
+    /**
+    * 注入
+    */
+    @Resource(name = ExtExpenditureContractServiceImpl.BEAN_NAME)
+    private ExtExpenditureContractService<V> extExpenditureContractService;
+
+    /**
+        * getService
+    */
+    @Override
+    public S getService() {
+        return (S)this.extExpenditureContractService;
+    }
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/shadow/ExtIncomeContractControllerShadow.java

-package com.yonde.dcs.plan.core.controller.shadow;
-
-import com.yonde.dcs.plan.common.vo.ExtIncomeContractOldVO;
-import com.yonde.dcs.plan.core.service.ExtIncomeContractService;
-import com.yonde.dcs.plan.core.service.impl.ExtIncomeContractServiceImpl;
-
-import javax.annotation.Resource;
-import com.yonde.dex.baseweb.AbstractBaseController;
-
-/**
-* @description: ExtIncomeContract-Controller
-* @author: dexadmin
-* @version: V
-* @date: 2024-7-26 9:34:06
-**/
-public class ExtIncomeContractControllerShadow<V extends ExtIncomeContractOldVO, S extends ExtIncomeContractService<V>> implements AbstractBaseController<V, S>{
-
-    public static final String BEAN_NAME = "extIncomeContractController";
-
-
-    /**
-    * 注入
-    */
-    @Resource(name = ExtIncomeContractServiceImpl.BEAN_NAME)
-    private ExtIncomeContractService<V> extIncomeContractService;
-
-    /**
-        * getService
-    */
-    @Override
-    public S getService() {
-        return (S)this.extIncomeContractService;
-    }
-}
-
-

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/shadow/ExtMatterContractControllerShadow.java

+package com.yonde.dcs.plan.core.controller.shadow;
+
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtMatterContractVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtMatterContractService;
+import com.yonde.dcs.plan.core.service.impl.ExtMatterContractServiceImpl;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import javax.annotation.Resource;
+import com.yonde.dex.linkdata.plugin.core.controller.DxLinkDataController;
+import com.yonde.dex.baseweb.AbstractBaseController;
+
+/**
+* @description: ExtMatterContract-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:01
+**/
+public class ExtMatterContractControllerShadow<V extends ExtMatterContractVO, S extends ExtMatterContractService<V>> implements AbstractBaseController<V, S> ,DxLinkDataController<V, S>{
+
+    public static final String BEAN_NAME = "extMatterContractController";
+
+
+    /**
+    * 注入
+    */
+    @Resource(name = ExtMatterContractServiceImpl.BEAN_NAME)
+    private ExtMatterContractService<V> extMatterContractService;
+
+    /**
+        * getService
+    */
+    @Override
+    public S getService() {
+        return (S)this.extMatterContractService;
+    }
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/shadow/ExtPaymentContractControllerShadow.java

+package com.yonde.dcs.plan.core.controller.shadow;
+
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtPaymentContractVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtPaymentContractService;
+import com.yonde.dcs.plan.core.service.impl.ExtPaymentContractServiceImpl;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import javax.annotation.Resource;
+import com.yonde.dex.linkdata.plugin.core.controller.DxLinkDataController;
+import com.yonde.dex.baseweb.AbstractBaseController;
+
+/**
+* @description: ExtPaymentContract-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:00
+**/
+public class ExtPaymentContractControllerShadow<V extends ExtPaymentContractVO, S extends ExtPaymentContractService<V>> implements AbstractBaseController<V, S> ,DxLinkDataController<V, S>{
+
+    public static final String BEAN_NAME = "extPaymentContractController";
+
+
+    /**
+    * 注入
+    */
+    @Resource(name = ExtPaymentContractServiceImpl.BEAN_NAME)
+    private ExtPaymentContractService<V> extPaymentContractService;
+
+    /**
+        * getService
+    */
+    @Override
+    public S getService() {
+        return (S)this.extPaymentContractService;
+    }
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/shadow/ExtPlanContractControllerShadow.java

+package com.yonde.dcs.plan.core.controller.shadow;
+
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtPlanContractVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtPlanContractService;
+import com.yonde.dcs.plan.core.service.impl.ExtPlanContractServiceImpl;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import javax.annotation.Resource;
+import com.yonde.dex.linkdata.plugin.core.controller.DxLinkDataController;
+import com.yonde.dex.baseweb.AbstractBaseController;
+
+/**
+* @description: ExtPlanContract-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:01
+**/
+public class ExtPlanContractControllerShadow<V extends ExtPlanContractVO, S extends ExtPlanContractService<V>> implements AbstractBaseController<V, S> ,DxLinkDataController<V, S>{
+
+    public static final String BEAN_NAME = "extPlanContractController";
+
+
+    /**
+    * 注入
+    */
+    @Resource(name = ExtPlanContractServiceImpl.BEAN_NAME)
+    private ExtPlanContractService<V> extPlanContractService;
+
+    /**
+        * getService
+    */
+    @Override
+    public S getService() {
+        return (S)this.extPlanContractService;
+    }
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/shadow/ExtResearchContractControllerShadow.java

+package com.yonde.dcs.plan.core.controller.shadow;
+
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtResearchContractVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtResearchContractService;
+import com.yonde.dcs.plan.core.service.impl.ExtResearchContractServiceImpl;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import javax.annotation.Resource;
+import com.yonde.dex.linkdata.plugin.core.controller.DxLinkDataController;
+import com.yonde.dex.baseweb.AbstractBaseController;
+
+/**
+* @description: ExtResearchContract-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+public class ExtResearchContractControllerShadow<V extends ExtResearchContractVO, S extends ExtResearchContractService<V>> implements AbstractBaseController<V, S> ,DxLinkDataController<V, S>{
+
+    public static final String BEAN_NAME = "extResearchContractController";
+
+
+    /**
+    * 注入
+    */
+    @Resource(name = ExtResearchContractServiceImpl.BEAN_NAME)
+    private ExtResearchContractService<V> extResearchContractService;
+
+    /**
+        * getService
+    */
+    @Override
+    public S getService() {
+        return (S)this.extResearchContractService;
+    }
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/shadow/ExtResearchProgressControllerShadow.java

+package com.yonde.dcs.plan.core.controller.shadow;
+
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtResearchProgressVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtResearchProgressService;
+import com.yonde.dcs.plan.core.service.impl.ExtResearchProgressServiceImpl;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import javax.annotation.Resource;
+import com.yonde.dex.baseweb.AbstractBaseController;
+
+/**
+* @description: ExtResearchProgress-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+public class ExtResearchProgressControllerShadow<V extends ExtResearchProgressVO, S extends ExtResearchProgressService<V>> implements AbstractBaseController<V, S>{
+
+    public static final String BEAN_NAME = "extResearchProgressController";
+
+
+    /**
+    * 注入
+    */
+    @Resource(name = ExtResearchProgressServiceImpl.BEAN_NAME)
+    private ExtResearchProgressService<V> extResearchProgressService;
+
+    /**
+        * getService
+    */
+    @Override
+    public S getService() {
+        return (S)this.extResearchProgressService;
+    }
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/shadow/ExtScientificResearchAchievementsControllerShadow.java

+package com.yonde.dcs.plan.core.controller.shadow;
+
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtScientificResearchAchievementsVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtScientificResearchAchievementsService;
+import com.yonde.dcs.plan.core.service.impl.ExtScientificResearchAchievementsServiceImpl;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import javax.annotation.Resource;
+import com.yonde.dex.baseweb.AbstractBaseController;
+
+/**
+* @description: ExtScientificResearchAchievements-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:00
+**/
+public class ExtScientificResearchAchievementsControllerShadow<V extends ExtScientificResearchAchievementsVO, S extends ExtScientificResearchAchievementsService<V>> implements AbstractBaseController<V, S>{
+
+    public static final String BEAN_NAME = "extScientificResearchAchievementsController";
+
+
+    /**
+    * 注入
+    */
+    @Resource(name = ExtScientificResearchAchievementsServiceImpl.BEAN_NAME)
+    private ExtScientificResearchAchievementsService<V> extScientificResearchAchievementsService;
+
+    /**
+        * getService
+    */
+    @Override
+    public S getService() {
+        return (S)this.extScientificResearchAchievementsService;
+    }
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/shadow/ExtScientificResearchContractControllerShadow.java

+package com.yonde.dcs.plan.core.controller.shadow;
+
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtScientificResearchContractVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtScientificResearchContractService;
+import com.yonde.dcs.plan.core.service.impl.ExtScientificResearchContractServiceImpl;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import javax.annotation.Resource;
+import com.yonde.dex.linkdata.plugin.core.controller.DxLinkDataController;
+import com.yonde.dex.baseweb.AbstractBaseController;
+
+/**
+* @description: ExtScientificResearchContract-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:00
+**/
+public class ExtScientificResearchContractControllerShadow<V extends ExtScientificResearchContractVO, S extends ExtScientificResearchContractService<V>> implements AbstractBaseController<V, S> ,DxLinkDataController<V, S>{
+
+    public static final String BEAN_NAME = "extScientificResearchContractController";
+
+
+    /**
+    * 注入
+    */
+    @Resource(name = ExtScientificResearchContractServiceImpl.BEAN_NAME)
+    private ExtScientificResearchContractService<V> extScientificResearchContractService;
+
+    /**
+        * getService
+    */
+    @Override
+    public S getService() {
+        return (S)this.extScientificResearchContractService;
+    }
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/shadow/ExtTopicContractLinkControllerShadow.java

+package com.yonde.dcs.plan.core.controller.shadow;
+
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtTopicContractLinkVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtTopicContractLinkService;
+import com.yonde.dcs.plan.core.service.impl.ExtTopicContractLinkServiceImpl;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import javax.annotation.Resource;
+import com.yonde.dex.linkdata.plugin.core.controller.DxLinkDataController;
+import com.yonde.dex.baseweb.AbstractBaseController;
+
+/**
+* @description: ExtTopicContractLink-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+public class ExtTopicContractLinkControllerShadow<V extends ExtTopicContractLinkVO, S extends ExtTopicContractLinkService<V>> implements AbstractBaseController<V, S> ,DxLinkDataController<V, S>{
+
+    public static final String BEAN_NAME = "extTopicContractLinkController";
+
+
+    /**
+    * 注入
+    */
+    @Resource(name = ExtTopicContractLinkServiceImpl.BEAN_NAME)
+    private ExtTopicContractLinkService<V> extTopicContractLinkService;
+
+    /**
+        * getService
+    */
+    @Override
+    public S getService() {
+        return (S)this.extTopicContractLinkService;
+    }
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/shadow/ExtTopicPreparationControllerShadow.java

+package com.yonde.dcs.plan.core.controller.shadow;
+
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtTopicPreparationVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtTopicPreparationService;
+import com.yonde.dcs.plan.core.service.impl.ExtTopicPreparationServiceImpl;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import javax.annotation.Resource;
+import com.yonde.dex.baseweb.AbstractBaseController;
+
+/**
+* @description: ExtTopicPreparation-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:58
+**/
+public class ExtTopicPreparationControllerShadow<V extends ExtTopicPreparationVO, S extends ExtTopicPreparationService<V>> implements AbstractBaseController<V, S>{
+
+    public static final String BEAN_NAME = "extTopicPreparationController";
+
+
+    /**
+    * 注入
+    */
+    @Resource(name = ExtTopicPreparationServiceImpl.BEAN_NAME)
+    private ExtTopicPreparationService<V> extTopicPreparationService;
+
+    /**
+        * getService
+    */
+    @Override
+    public S getService() {
+        return (S)this.extTopicPreparationService;
+    }
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/ExtContractCollectionLinkRepository.java

+package com.yonde.dcs.plan.core.repository;
+
+import com.yonde.dcs.plan.entity.po.ExtContractCollectionLink;
+import com.yonde.dcs.plan.core.repository.shadow.ExtContractCollectionLinkRepositoryShadow;
+/**
+* @description: ExtContractCollectionLink-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+public interface ExtContractCollectionLinkRepository<P extends ExtContractCollectionLink> extends ExtContractCollectionLinkRepositoryShadow<P> {
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/ExtContractCollectionRepository.java

+package com.yonde.dcs.plan.core.repository;
+
+import com.yonde.dcs.plan.entity.po.ExtContractCollection;
+import com.yonde.dcs.plan.core.repository.shadow.ExtContractCollectionRepositoryShadow;
+/**
+* @description: ExtContractCollection-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+public interface ExtContractCollectionRepository<P extends ExtContractCollection> extends ExtContractCollectionRepositoryShadow<P> {
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/ExtContractNodeLinkRepository.java

+package com.yonde.dcs.plan.core.repository;
+
+import com.yonde.dcs.plan.entity.po.ExtContractNodeLink;
+import com.yonde.dcs.plan.core.repository.shadow.ExtContractNodeLinkRepositoryShadow;
+/**
+* @description: ExtContractNodeLink-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+public interface ExtContractNodeLinkRepository<P extends ExtContractNodeLink> extends ExtContractNodeLinkRepositoryShadow<P> {
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/ExtContractNodeRepository.java

+package com.yonde.dcs.plan.core.repository;
+
+import com.yonde.dcs.plan.entity.po.ExtContractNode;
+import com.yonde.dcs.plan.core.repository.shadow.ExtContractNodeRepositoryShadow;
+/**
+* @description: ExtContractNode-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+public interface ExtContractNodeRepository<P extends ExtContractNode> extends ExtContractNodeRepositoryShadow<P> {
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/ExtContractPaymentRepository.java

+package com.yonde.dcs.plan.core.repository;
+
+import com.yonde.dcs.plan.entity.po.ExtContractPayment;
+import com.yonde.dcs.plan.core.repository.shadow.ExtContractPaymentRepositoryShadow;
+/**
+* @description: ExtContractPayment-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:00
+**/
+public interface ExtContractPaymentRepository<P extends ExtContractPayment> extends ExtContractPaymentRepositoryShadow<P> {
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/ExtContractSubjectMatterRepository.java

+package com.yonde.dcs.plan.core.repository;
+
+import com.yonde.dcs.plan.entity.po.ExtContractSubjectMatter;
+import com.yonde.dcs.plan.core.repository.shadow.ExtContractSubjectMatterRepositoryShadow;
+/**
+* @description: ExtContractSubjectMatter-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:00
+**/
+public interface ExtContractSubjectMatterRepository<P extends ExtContractSubjectMatter> extends ExtContractSubjectMatterRepositoryShadow<P> {
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/ExtDevelopmentPlanRepository.java

+package com.yonde.dcs.plan.core.repository;
+
+import com.yonde.dcs.plan.entity.po.ExtDevelopmentPlan;
+import com.yonde.dcs.plan.core.repository.shadow.ExtDevelopmentPlanRepositoryShadow;
+/**
+* @description: ExtDevelopmentPlan-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:00
+**/
+public interface ExtDevelopmentPlanRepository<P extends ExtDevelopmentPlan> extends ExtDevelopmentPlanRepositoryShadow<P> {
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/ExtExpenditureContractRepository.java

+package com.yonde.dcs.plan.core.repository;
+
+import com.yonde.dcs.plan.entity.po.ExtExpenditureContract;
+import com.yonde.dcs.plan.core.repository.shadow.ExtExpenditureContractRepositoryShadow;
+/**
+* @description: ExtExpenditureContract-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+public interface ExtExpenditureContractRepository<P extends ExtExpenditureContract> extends ExtExpenditureContractRepositoryShadow<P> {
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/ExtICMExternalInterfacePlanCurrentRepository.java

+package com.yonde.dcs.plan.core.repository;
+
+import com.yonde.dcs.plan.entity.po.ExtICMExternalInterfacePlanCurrent;
+import com.yonde.dcs.plan.core.repository.ExtICMExternalInterfacePlanRepository;
+import com.yonde.dcs.plan.core.repository.ExtICMExternalInterfacePlanCurrentRepository;
+import com.yonde.dcs.plan.core.repository.ExtICMExternalInterfacePlanRepository;
+/**
+* @description: ExtICMExternalInterfacePlan-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:58
+**/
+public interface ExtICMExternalInterfacePlanCurrentRepository<P extends ExtICMExternalInterfacePlanCurrent> extends ExtICMExternalInterfacePlanRepository<P> {
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/ExtICMExternalInterfacePlanHistoryRepository.java

+package com.yonde.dcs.plan.core.repository;
+
+import com.yonde.dcs.plan.entity.po.ExtICMExternalInterfacePlanHistory;
+import com.yonde.dcs.plan.core.repository.ExtICMExternalInterfacePlanRepository;
+import com.yonde.dcs.plan.core.repository.ExtICMExternalInterfacePlanHistoryRepository;
+import com.yonde.dcs.plan.core.repository.ExtICMExternalInterfacePlanRepository;
+/**
+* @description: ExtICMExternalInterfacePlan-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:58
+**/
+public interface ExtICMExternalInterfacePlanHistoryRepository<P extends ExtICMExternalInterfacePlanHistory> extends ExtICMExternalInterfacePlanRepository<P> {
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/ExtIncomeContractRepository.java

-package com.yonde.dcs.plan.core.repository;
-
-import com.yonde.dcs.plan.entity.po.ExtIncomeContract;
-import com.yonde.dcs.plan.core.repository.shadow.ExtIncomeContractRepositoryShadow;
-/**
-* @description: ExtIncomeContract-repository
-* @author: dexadmin
-* @version: V
-* @date: 2024-7-26 9:34:06
-**/
-public interface ExtIncomeContractRepository<P extends ExtIncomeContract> extends ExtIncomeContractRepositoryShadow<P> {
-}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/ExtMatterContractRepository.java

+package com.yonde.dcs.plan.core.repository;
+
+import com.yonde.dcs.plan.entity.po.ExtMatterContract;
+import com.yonde.dcs.plan.core.repository.shadow.ExtMatterContractRepositoryShadow;
+/**
+* @description: ExtMatterContract-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:01
+**/
+public interface ExtMatterContractRepository<P extends ExtMatterContract> extends ExtMatterContractRepositoryShadow<P> {
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/ExtPaymentContractRepository.java

+package com.yonde.dcs.plan.core.repository;
+
+import com.yonde.dcs.plan.entity.po.ExtPaymentContract;
+import com.yonde.dcs.plan.core.repository.shadow.ExtPaymentContractRepositoryShadow;
+/**
+* @description: ExtPaymentContract-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:00
+**/
+public interface ExtPaymentContractRepository<P extends ExtPaymentContract> extends ExtPaymentContractRepositoryShadow<P> {
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/ExtPlanContractRepository.java

+package com.yonde.dcs.plan.core.repository;
+
+import com.yonde.dcs.plan.entity.po.ExtPlanContract;
+import com.yonde.dcs.plan.core.repository.shadow.ExtPlanContractRepositoryShadow;
+/**
+* @description: ExtPlanContract-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:01
+**/
+public interface ExtPlanContractRepository<P extends ExtPlanContract> extends ExtPlanContractRepositoryShadow<P> {
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/ExtResearchContractRepository.java

+package com.yonde.dcs.plan.core.repository;
+
+import com.yonde.dcs.plan.entity.po.ExtResearchContract;
+import com.yonde.dcs.plan.core.repository.shadow.ExtResearchContractRepositoryShadow;
+/**
+* @description: ExtResearchContract-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+public interface ExtResearchContractRepository<P extends ExtResearchContract> extends ExtResearchContractRepositoryShadow<P> {
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/ExtResearchProgressRepository.java

+package com.yonde.dcs.plan.core.repository;
+
+import com.yonde.dcs.plan.entity.po.ExtResearchProgress;
+import com.yonde.dcs.plan.core.repository.shadow.ExtResearchProgressRepositoryShadow;
+/**
+* @description: ExtResearchProgress-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+public interface ExtResearchProgressRepository<P extends ExtResearchProgress> extends ExtResearchProgressRepositoryShadow<P> {
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/ExtScientificResearchAchievementsRepository.java

+package com.yonde.dcs.plan.core.repository;
+
+import com.yonde.dcs.plan.entity.po.ExtScientificResearchAchievements;
+import com.yonde.dcs.plan.core.repository.shadow.ExtScientificResearchAchievementsRepositoryShadow;
+/**
+* @description: ExtScientificResearchAchievements-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:00
+**/
+public interface ExtScientificResearchAchievementsRepository<P extends ExtScientificResearchAchievements> extends ExtScientificResearchAchievementsRepositoryShadow<P> {
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/ExtScientificResearchContractRepository.java

+package com.yonde.dcs.plan.core.repository;
+
+import com.yonde.dcs.plan.entity.po.ExtScientificResearchContract;
+import com.yonde.dcs.plan.core.repository.shadow.ExtScientificResearchContractRepositoryShadow;
+/**
+* @description: ExtScientificResearchContract-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:00
+**/
+public interface ExtScientificResearchContractRepository<P extends ExtScientificResearchContract> extends ExtScientificResearchContractRepositoryShadow<P> {
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/ExtTopicContractLinkRepository.java

+package com.yonde.dcs.plan.core.repository;
+
+import com.yonde.dcs.plan.entity.po.ExtTopicContractLink;
+import com.yonde.dcs.plan.core.repository.shadow.ExtTopicContractLinkRepositoryShadow;
+/**
+* @description: ExtTopicContractLink-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+public interface ExtTopicContractLinkRepository<P extends ExtTopicContractLink> extends ExtTopicContractLinkRepositoryShadow<P> {
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/ExtTopicPreparationRepository.java

+package com.yonde.dcs.plan.core.repository;
+
+import com.yonde.dcs.plan.entity.po.ExtTopicPreparation;
+import com.yonde.dcs.plan.core.repository.shadow.ExtTopicPreparationRepositoryShadow;
+/**
+* @description: ExtTopicPreparation-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:58
+**/
+public interface ExtTopicPreparationRepository<P extends ExtTopicPreparation> extends ExtTopicPreparationRepositoryShadow<P> {
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtContractCollectionLinkRepositoryShadow.java

+package com.yonde.dcs.plan.core.repository.shadow;
+
+import com.yonde.dcs.plan.entity.po.ExtContractCollectionLink;
+import org.springframework.data.repository.NoRepositoryBean;
+import com.yonde.dex.dao.business.repository.BaseRepository;
+import com.yonde.dex.linkdata.plugin.core.repository.DxLinkDataRepository;
+/**
+* @description: ExtContractCollectionLink-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+@NoRepositoryBean
+public interface ExtContractCollectionLinkRepositoryShadow<P extends ExtContractCollectionLink> extends BaseRepository<P> ,DxLinkDataRepository<P> {
+
+    String BEAN_NAME = "extContractCollectionLinkRepository";
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtContractCollectionRepositoryShadow.java

+package com.yonde.dcs.plan.core.repository.shadow;
+
+import com.yonde.dcs.plan.entity.po.ExtContractCollection;
+import org.springframework.data.repository.NoRepositoryBean;
+import com.yonde.dex.dao.business.repository.BaseRepository;
+/**
+* @description: ExtContractCollection-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+@NoRepositoryBean
+public interface ExtContractCollectionRepositoryShadow<P extends ExtContractCollection> extends BaseRepository<P> {
+
+    String BEAN_NAME = "extContractCollectionRepository";
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtContractNodeLinkRepositoryShadow.java

+package com.yonde.dcs.plan.core.repository.shadow;
+
+import com.yonde.dcs.plan.entity.po.ExtContractNodeLink;
+import org.springframework.data.repository.NoRepositoryBean;
+import com.yonde.dex.dao.business.repository.BaseRepository;
+import com.yonde.dex.linkdata.plugin.core.repository.DxLinkDataRepository;
+/**
+* @description: ExtContractNodeLink-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+@NoRepositoryBean
+public interface ExtContractNodeLinkRepositoryShadow<P extends ExtContractNodeLink> extends BaseRepository<P> ,DxLinkDataRepository<P> {
+
+    String BEAN_NAME = "extContractNodeLinkRepository";
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtContractNodeRepositoryShadow.java

+package com.yonde.dcs.plan.core.repository.shadow;
+
+import com.yonde.dcs.plan.entity.po.ExtContractNode;
+import org.springframework.data.repository.NoRepositoryBean;
+import com.yonde.dex.dao.business.repository.BaseRepository;
+/**
+* @description: ExtContractNode-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:58
+**/
+@NoRepositoryBean
+public interface ExtContractNodeRepositoryShadow<P extends ExtContractNode> extends BaseRepository<P> {
+
+    String BEAN_NAME = "extContractNodeRepository";
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtContractPaymentRepositoryShadow.java

+package com.yonde.dcs.plan.core.repository.shadow;
+
+import com.yonde.dcs.plan.entity.po.ExtContractPayment;
+import org.springframework.data.repository.NoRepositoryBean;
+import com.yonde.dex.dao.business.repository.BaseRepository;
+/**
+* @description: ExtContractPayment-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:00
+**/
+@NoRepositoryBean
+public interface ExtContractPaymentRepositoryShadow<P extends ExtContractPayment> extends BaseRepository<P> {
+
+    String BEAN_NAME = "extContractPaymentRepository";
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtContractSubjectMatterRepositoryShadow.java

+package com.yonde.dcs.plan.core.repository.shadow;
+
+import com.yonde.dcs.plan.entity.po.ExtContractSubjectMatter;
+import org.springframework.data.repository.NoRepositoryBean;
+import com.yonde.dex.dao.business.repository.BaseRepository;
+/**
+* @description: ExtContractSubjectMatter-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:00
+**/
+@NoRepositoryBean
+public interface ExtContractSubjectMatterRepositoryShadow<P extends ExtContractSubjectMatter> extends BaseRepository<P> {
+
+    String BEAN_NAME = "extContractSubjectMatterRepository";
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtDevelopmentPlanRepositoryShadow.java

+package com.yonde.dcs.plan.core.repository.shadow;
+
+import com.yonde.dcs.plan.entity.po.ExtDevelopmentPlan;
+import org.springframework.data.repository.NoRepositoryBean;
+import com.yonde.dex.dao.business.repository.BaseRepository;
+/**
+* @description: ExtDevelopmentPlan-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:00
+**/
+@NoRepositoryBean
+public interface ExtDevelopmentPlanRepositoryShadow<P extends ExtDevelopmentPlan> extends BaseRepository<P> {
+
+    String BEAN_NAME = "extDevelopmentPlanRepository";
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtIncomeContractRepositoryShadow.java → dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtExpenditureContractRepositoryShadow.java

 package com.yonde.dcs.plan.core.repository.shadow;
 
-import com.yonde.dcs.plan.entity.po.ExtIncomeContract;
-import com.yonde.dex.context.plugin.entities.DxContextHolder;
-import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteHolder;
-import com.yonde.dex.secretcode.plugin.entities.DxSecretHolder;
+import com.yonde.dcs.plan.entity.po.ExtExpenditureContract;
 import org.springframework.data.repository.NoRepositoryBean;
 import com.yonde.dex.context.plugin.core.repository.DxContextPluginRepository;
 import com.yonde.dex.logicdelete.plugin.core.repository.DxLogicDeleteRepository;
 import com.yonde.dex.dao.business.repository.BaseRepository;
 import com.yonde.dex.secretcode.plugin.core.repositroy.DxSecretCodePluginRepository;
+import com.yonde.dex.version.plugin.core.repository.DxIterationRepository;
+import com.yonde.dex.lcycle.plugin.core.repository.DxLifecycleManageBaseRepository;
+import com.yonde.dex.dfs.objfilelink.plugin.core.repository.DxObjFileLinkPluginRepository;
 /**
-* @description: ExtIncomeContract-repository
+* @description: ExtExpenditureContract-repository
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-15 10:55:29
+* @date: 2024-9-24 16:48:59
 **/
 @NoRepositoryBean
-public interface ExtIncomeContractRepositoryShadow<P extends ExtIncomeContract & DxContextHolder & DxLogicDeleteHolder & DxSecretHolder> extends DxContextPluginRepository<P> ,BaseRepository<P> ,DxLogicDeleteRepository<P> ,DxSecretCodePluginRepository<P> {
+public interface ExtExpenditureContractRepositoryShadow<P extends ExtExpenditureContract> extends DxContextPluginRepository<P> ,DxObjFileLinkPluginRepository<P> ,DxLifecycleManageBaseRepository<P> ,BaseRepository<P> ,DxLogicDeleteRepository<P> ,DxSecretCodePluginRepository<P> ,DxIterationRepository<P> {
 
-    String BEAN_NAME = "extIncomeContractRepository";
+    String BEAN_NAME = "extExpenditureContractRepository";
 }

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtMatterContractRepositoryShadow.java

+package com.yonde.dcs.plan.core.repository.shadow;
+
+import com.yonde.dcs.plan.entity.po.ExtMatterContract;
+import org.springframework.data.repository.NoRepositoryBean;
+import com.yonde.dex.dao.business.repository.BaseRepository;
+import com.yonde.dex.linkdata.plugin.core.repository.DxLinkDataRepository;
+/**
+* @description: ExtMatterContract-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:01
+**/
+@NoRepositoryBean
+public interface ExtMatterContractRepositoryShadow<P extends ExtMatterContract> extends BaseRepository<P> ,DxLinkDataRepository<P> {
+
+    String BEAN_NAME = "extMatterContractRepository";
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtPaymentContractRepositoryShadow.java

+package com.yonde.dcs.plan.core.repository.shadow;
+
+import com.yonde.dcs.plan.entity.po.ExtPaymentContract;
+import org.springframework.data.repository.NoRepositoryBean;
+import com.yonde.dex.dao.business.repository.BaseRepository;
+import com.yonde.dex.linkdata.plugin.core.repository.DxLinkDataRepository;
+/**
+* @description: ExtPaymentContract-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:00
+**/
+@NoRepositoryBean
+public interface ExtPaymentContractRepositoryShadow<P extends ExtPaymentContract> extends BaseRepository<P> ,DxLinkDataRepository<P> {
+
+    String BEAN_NAME = "extPaymentContractRepository";
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtPlanContractRepositoryShadow.java

+package com.yonde.dcs.plan.core.repository.shadow;
+
+import com.yonde.dcs.plan.entity.po.ExtPlanContract;
+import org.springframework.data.repository.NoRepositoryBean;
+import com.yonde.dex.dao.business.repository.BaseRepository;
+import com.yonde.dex.linkdata.plugin.core.repository.DxLinkDataRepository;
+/**
+* @description: ExtPlanContract-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:01
+**/
+@NoRepositoryBean
+public interface ExtPlanContractRepositoryShadow<P extends ExtPlanContract> extends BaseRepository<P> ,DxLinkDataRepository<P> {
+
+    String BEAN_NAME = "extPlanContractRepository";
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtResearchContractRepositoryShadow.java

+package com.yonde.dcs.plan.core.repository.shadow;
+
+import com.yonde.dcs.plan.entity.po.ExtResearchContract;
+import org.springframework.data.repository.NoRepositoryBean;
+import com.yonde.dex.dao.business.repository.BaseRepository;
+import com.yonde.dex.linkdata.plugin.core.repository.DxLinkDataRepository;
+/**
+* @description: ExtResearchContract-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+@NoRepositoryBean
+public interface ExtResearchContractRepositoryShadow<P extends ExtResearchContract> extends BaseRepository<P> ,DxLinkDataRepository<P> {
+
+    String BEAN_NAME = "extResearchContractRepository";
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtResearchProgressRepositoryShadow.java

+package com.yonde.dcs.plan.core.repository.shadow;
+
+import com.yonde.dcs.plan.entity.po.ExtResearchProgress;
+import org.springframework.data.repository.NoRepositoryBean;
+import com.yonde.dex.dao.business.repository.BaseRepository;
+/**
+* @description: ExtResearchProgress-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+@NoRepositoryBean
+public interface ExtResearchProgressRepositoryShadow<P extends ExtResearchProgress> extends BaseRepository<P> {
+
+    String BEAN_NAME = "extResearchProgressRepository";
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtScientificResearchAchievementsRepositoryShadow.java

+package com.yonde.dcs.plan.core.repository.shadow;
+
+import com.yonde.dcs.plan.entity.po.ExtScientificResearchAchievements;
+import org.springframework.data.repository.NoRepositoryBean;
+import com.yonde.dex.dao.business.repository.BaseRepository;
+/**
+* @description: ExtScientificResearchAchievements-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:00
+**/
+@NoRepositoryBean
+public interface ExtScientificResearchAchievementsRepositoryShadow<P extends ExtScientificResearchAchievements> extends BaseRepository<P> {
+
+    String BEAN_NAME = "extScientificResearchAchievementsRepository";
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtScientificResearchContractRepositoryShadow.java

+package com.yonde.dcs.plan.core.repository.shadow;
+
+import com.yonde.dcs.plan.entity.po.ExtScientificResearchContract;
+import org.springframework.data.repository.NoRepositoryBean;
+import com.yonde.dex.dao.business.repository.BaseRepository;
+import com.yonde.dex.linkdata.plugin.core.repository.DxLinkDataRepository;
+/**
+* @description: ExtScientificResearchContract-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:00
+**/
+@NoRepositoryBean
+public interface ExtScientificResearchContractRepositoryShadow<P extends ExtScientificResearchContract> extends BaseRepository<P> ,DxLinkDataRepository<P> {
+
+    String BEAN_NAME = "extScientificResearchContractRepository";
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtTopicContractLinkRepositoryShadow.java

+package com.yonde.dcs.plan.core.repository.shadow;
+
+import com.yonde.dcs.plan.entity.po.ExtTopicContractLink;
+import org.springframework.data.repository.NoRepositoryBean;
+import com.yonde.dex.dao.business.repository.BaseRepository;
+import com.yonde.dex.linkdata.plugin.core.repository.DxLinkDataRepository;
+/**
+* @description: ExtTopicContractLink-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+@NoRepositoryBean
+public interface ExtTopicContractLinkRepositoryShadow<P extends ExtTopicContractLink> extends BaseRepository<P> ,DxLinkDataRepository<P> {
+
+    String BEAN_NAME = "extTopicContractLinkRepository";
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtTopicPreparationRepositoryShadow.java

+package com.yonde.dcs.plan.core.repository.shadow;
+
+import com.yonde.dcs.plan.entity.po.ExtTopicPreparation;
+import org.springframework.data.repository.NoRepositoryBean;
+import com.yonde.dex.dao.business.repository.BaseRepository;
+/**
+* @description: ExtTopicPreparation-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:58
+**/
+@NoRepositoryBean
+public interface ExtTopicPreparationRepositoryShadow<P extends ExtTopicPreparation> extends BaseRepository<P> {
+
+    String BEAN_NAME = "extTopicPreparationRepository";
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/ExtContractCollectionLinkService.java

+package com.yonde.dcs.plan.core.service;
+
+import com.yonde.dcs.plan.common.vo.ExtContractCollectionLinkVO;
+import com.yonde.dcs.plan.core.service.shadow.ExtContractCollectionLinkServiceShadow;
+/**
+* @description: ExtContractCollectionLink-service
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+public interface ExtContractCollectionLinkService<V extends ExtContractCollectionLinkVO> extends ExtContractCollectionLinkServiceShadow<V> {
+
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/ExtContractCollectionService.java

+package com.yonde.dcs.plan.core.service;
+
+import com.yonde.dcs.plan.common.vo.ExtContractCollectionVO;
+import com.yonde.dcs.plan.core.service.shadow.ExtContractCollectionServiceShadow;
+/**
+* @description: ExtContractCollection-service
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+public interface ExtContractCollectionService<V extends ExtContractCollectionVO> extends ExtContractCollectionServiceShadow<V> {
+
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/ExtContractNodeLinkService.java

+package com.yonde.dcs.plan.core.service;
+
+import com.yonde.dcs.plan.common.vo.ExtContractNodeLinkVO;
+import com.yonde.dcs.plan.core.service.shadow.ExtContractNodeLinkServiceShadow;
+/**
+* @description: ExtContractNodeLink-service
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+public interface ExtContractNodeLinkService<V extends ExtContractNodeLinkVO> extends ExtContractNodeLinkServiceShadow<V> {
+
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/ExtContractNodeService.java

+package com.yonde.dcs.plan.core.service;
+
+import com.yonde.dcs.plan.common.vo.ExtContractNodeVO;
+import com.yonde.dcs.plan.core.service.shadow.ExtContractNodeServiceShadow;
+/**
+* @description: ExtContractNode-service
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:58
+**/
+public interface ExtContractNodeService<V extends ExtContractNodeVO> extends ExtContractNodeServiceShadow<V> {
+
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/ExtContractPaymentService.java

+package com.yonde.dcs.plan.core.service;
+
+import com.yonde.dcs.plan.common.vo.ExtContractPaymentVO;
+import com.yonde.dcs.plan.core.service.shadow.ExtContractPaymentServiceShadow;
+/**
+* @description: ExtContractPayment-service
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:00
+**/
+public interface ExtContractPaymentService<V extends ExtContractPaymentVO> extends ExtContractPaymentServiceShadow<V> {
+
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/ExtContractSubjectMatterService.java

+package com.yonde.dcs.plan.core.service;
+
+import com.yonde.dcs.plan.common.vo.ExtContractSubjectMatterVO;
+import com.yonde.dcs.plan.core.service.shadow.ExtContractSubjectMatterServiceShadow;
+/**
+* @description: ExtContractSubjectMatter-service
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:00
+**/
+public interface ExtContractSubjectMatterService<V extends ExtContractSubjectMatterVO> extends ExtContractSubjectMatterServiceShadow<V> {
+
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/ExtDevelopmentPlanService.java

+package com.yonde.dcs.plan.core.service;
+
+import com.yonde.dcs.plan.common.vo.ExtDevelopmentPlanVO;
+import com.yonde.dcs.plan.core.service.shadow.ExtDevelopmentPlanServiceShadow;
+/**
+* @description: ExtDevelopmentPlan-service
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:49:00
+**/
+public interface ExtDevelopmentPlanService<V extends ExtDevelopmentPlanVO> extends ExtDevelopmentPlanServiceShadow<V> {
+
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/ExtExpenditureContractService.java

+package com.yonde.dcs.plan.core.service;
+
+import com.yonde.dcs.plan.common.vo.ExtExpenditureContractVO;
+import com.yonde.dcs.plan.core.service.shadow.ExtExpenditureContractServiceShadow;
+/**
+* @description: ExtExpenditureContract-service
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:59
+**/
+public interface ExtExpenditureContractService<V extends ExtExpenditureContractVO> extends ExtExpenditureContractServiceShadow<V> {
+
+}

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/ExtIncomeContractService.java

-package com.yonde.dcs.plan.core.service;
-
-import com.yonde.dcs.plan.common.vo.ExtIncomeContractOldVO;
-import com.yonde.dcs.plan.core.service.shadow.ExtIncomeContractServiceShadow;
-/**
-* @description: ExtIncomeContract-service
-* @author: dexadmin
-* @version: V
-* @date: 2024-7-26 9:34:06
-**/
-public interface ExtIncomeContractService<V extends ExtIncomeContractOldVO> extends ExtIncomeContractServiceShadow<V> {
-
-    /**
-     * 计算收入明细
-     *
-     * @param id
-     */
-    ExtIncomeContractOldVO calculateIncome(Long id);
-
-    /**
-     * 深度查询收入合同
-     *
-     * @param
-     * @return
-     */
-    ExtIncomeContractOldVO findRecursionExtIncomeContractVO(Long id);
-
-    /**
-     * 根据年份计算到款金额
-     *
-     * @param year
-     * @return
-     */
-    void calculateIncomeByYear(Long id, String year, ExtIncomeContractOldVO extIncomeContractOldVO);
-
-
-    /**
-     * 重新计算收入到款
-     *
-     * @param id
-     */
-    String reCalculIncomeById(Long id);
-
-}