基线：四类计划继承父级

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

@@ -30,21 +30,16 @@ 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.lcycle.plugin.common.entity.DxLifecycleManageBaseVOHolder;
+import com.yonde.dcs.plan.common.vo.ExtPlanParentVO;
+import com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOEmbeddable;
 import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOHolder;
+import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOEmbeddable;
+import com.yonde.dcs.plan.common.vo.ExtICMPlanDocLinkVO;
 import com.yonde.dex.context.plugin.common.entity.DxContextVOEmbeddable;
 import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOHolder;
 import com.yonde.dex.context.plugin.common.entity.DxContextVOHolder;
 import com.yonde.dex.version.plugin.common.entity.DxIterationVOEmbeddable;
-import com.yonde.dex.basedata.entity.users.DxUserVO;
-import com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOHolder;
-import com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOEmbeddable;
-import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOHolder;
-import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOEmbeddable;
-import com.yonde.dex.basedata.entity.vo.IdVO;
-import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOEmbeddable;
-import com.yonde.dcs.plan.common.vo.ExtICMPlanDocLinkVO;
 import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbeddable;
 import com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder;
 
@@ -52,19 +47,17 @@ import com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder;
 * @description: ExtICMExternalInterfacePlan-VO
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-14 10:04:10
+* @date: 2024-10-28 17:18:22
 **/
 @JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtICMExternalInterfacePlanVO.class)
 @EqualsAndHashCode(callSuper = true)
 @Data
 @ToString(callSuper = true)
-public class ExtICMExternalInterfacePlanVO extends IdOnlyVO implements IdVO ,DxContextVOHolder ,DxLifecycleManageBaseVOHolder ,DxObjFileLinkVOHolder ,DxIterationVOHolder<ExtICMExternalInterfacePlanVO> ,DxLogicDeleteVOHolder ,DxSecretVOHolder{
+public class ExtICMExternalInterfacePlanVO extends ExtPlanParentVO implements DxContextVOHolder ,DxLifecycleManageBaseVOHolder ,DxObjFileLinkVOHolder ,DxIterationVOHolder<ExtICMExternalInterfacePlanVO> ,DxSecretVOHolder{
 
     public static final String DX_CONTEXT_EMBEDDABLE_PROP_NAME = "dxContextEmbeddable";
     public static final String DX_OBJ_FILE_LINK_EMBEDDABLE_PROP_NAME = "dxObjFileLinkEmbeddable";
     public static final String DX_LIFECYCLE_MANAGE_BASE_EMBEDDABLE_PROP_NAME = "dxLifecycleManageBaseEmbeddable";
-    public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
-    public static final String DX_LOGIC_DELETE_EMBEDDABLE_PROP_NAME = "dxLogicDeleteEmbeddable";
     public static final String DX_SECRET_EMBEDDABLE_PROP_NAME = "dxSecretEmbeddable";
     public static final String DX_ITERATION_EMBEDDABLE_PROP_NAME = "dxIterationEmbeddable";
     public static final String ACCEPTOR_PROP_NAME = "acceptor";
@@ -103,20 +96,6 @@ public class ExtICMExternalInterfacePlanVO extends IdOnlyVO implements IdVO ,DxC
     @JsonIgnore
     private DxLifecycleManageBaseVOEmbeddable dxLifecycleManageBaseEmbeddable;
 
-    /**
-    * dao扩展对象
-    */
-    @DexEmbedded()
-    @JsonIgnore
-    private DxIdVOEmbeddable dxIdEmbeddable;
-
-    /**
-    * 扩展VO属性
-    */
-    @DexEmbedded()
-    @JsonIgnore
-    private DxLogicDeleteVOEmbeddable dxLogicDeleteEmbeddable;
-
     /**
     * 扩展VO属性
     */

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

 package com.yonde.dcs.plan.common.vo;
 
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import cn.hutool.core.convert.Convert;
+import com.yonde.dex.basedata.entity.annotation.XmlElementProperty;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.annotation.JsonUnwrapped;
+import lombok.ToString;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import java.math.BigInteger;
+import org.springframework.data.annotation.Transient;
+import lombok.experimental.Delegate;
+import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.XmlAttribute;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.NotNull;
+import java.util.List;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
-import com.yonde.dex.basedata.entity.annotation.RelationProperty;
-import com.yonde.dex.basedata.entity.annotation.VersionProperty;
-import com.yonde.dex.basedata.entity.data.VersionRelationType;
-import com.yonde.dex.basedata.entity.vo.DxIdVOEmbeddable;
+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 com.yonde.dex.basedata.entity.vo.IdVO;
+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.ExtPlanParentVO;
+import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOHolder;
 import com.yonde.dex.context.plugin.common.entity.DxContextVOEmbeddable;
-import com.yonde.dex.context.plugin.common.entity.DxContextVOHolder;
-import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbeddable;
 import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOHolder;
-import com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOEmbeddable;
+import com.yonde.dex.context.plugin.common.entity.DxContextVOHolder;
+import com.yonde.dex.version.plugin.common.entity.DxIterationVOEmbeddable;
 import com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOHolder;
-import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOEmbeddable;
+import com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOEmbeddable;
 import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOHolder;
+import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOEmbeddable;
+import com.yonde.dcs.plan.common.vo.ExtIEDPlanDocLinkVO;
 import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOEmbeddable;
-import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOHolder;
-import com.yonde.dex.version.plugin.common.entity.DxIterationVOEmbeddable;
+import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbeddable;
 import com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import java.time.LocalDateTime;
-import java.util.List;
 
 /**
 * @description: ExtIEDPlan-VO
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-11 15:49:41
+* @date: 2024-10-28 17:18:21
 **/
 @JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtIEDPlanVO.class)
 @EqualsAndHashCode(callSuper = true)
 @Data
 @ToString(callSuper = true)
-public class ExtIEDPlanVO extends IdOnlyVO implements IdVO ,DxContextVOHolder ,DxLifecycleManageBaseVOHolder ,DxObjFileLinkVOHolder ,DxIterationVOHolder<ExtIEDPlanVO> ,DxLogicDeleteVOHolder ,DxSecretVOHolder{
+public class ExtIEDPlanVO extends ExtPlanParentVO implements DxContextVOHolder ,DxLifecycleManageBaseVOHolder ,DxObjFileLinkVOHolder ,DxIterationVOHolder<ExtIEDPlanVO> ,DxLogicDeleteVOHolder ,DxSecretVOHolder{
 
     public static final String DX_CONTEXT_EMBEDDABLE_PROP_NAME = "dxContextEmbeddable";
     public static final String DX_OBJ_FILE_LINK_EMBEDDABLE_PROP_NAME = "dxObjFileLinkEmbeddable";
     public static final String DX_LIFECYCLE_MANAGE_BASE_EMBEDDABLE_PROP_NAME = "dxLifecycleManageBaseEmbeddable";
-    public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
     public static final String DX_LOGIC_DELETE_EMBEDDABLE_PROP_NAME = "dxLogicDeleteEmbeddable";
     public static final String DX_SECRET_EMBEDDABLE_PROP_NAME = "dxSecretEmbeddable";
     public static final String DX_ITERATION_EMBEDDABLE_PROP_NAME = "dxIterationEmbeddable";
@@ -58,7 +74,8 @@ public class ExtIEDPlanVO extends IdOnlyVO implements IdVO ,DxContextVOHolder ,D
     public static final String FILE_CLASSIFY_PROP_NAME = "fileClassify";
     public static final String FILE_CODE_PROP_NAME = "fileCode";
     public static final String FILE_NAME_PROP_NAME = "fileName";
-    public static final String FILE_SUBMIT_TIMEE_PROP_NAME = "fileSubmitTimee";
+    public static final String FILE_NUMBER_PROP_NAME = "fileNumber";
+    public static final String FILE_SUBMIT_TIME_PROP_NAME = "fileSubmitTime";
     public static final String FILE_TYPE_PROP_NAME = "fileType";
     public static final String INVESTIGATOR_PROP_NAME = "investigator";
     public static final String PHASE_PROP_NAME = "phase";
@@ -87,13 +104,6 @@ public class ExtIEDPlanVO extends IdOnlyVO implements IdVO ,DxContextVOHolder ,D
     @JsonIgnore
     private DxLifecycleManageBaseVOEmbeddable dxLifecycleManageBaseEmbeddable;
 
-    /**
-    * dao扩展对象
-    */
-    @DexEmbedded()
-    @JsonIgnore
-    private DxIdVOEmbeddable dxIdEmbeddable;
-
     /**
     * 扩展VO属性
     */
@@ -154,7 +164,7 @@ public class ExtIEDPlanVO extends IdOnlyVO implements IdVO ,DxContextVOHolder ,D
     * IED计划文档关系集合
     */
     @RelationProperty(refProperty = "source")
-    @VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
+    @VersionProperty(curVersion = VersionRelationType.ITERATION, refVersion = VersionRelationType.NONE)
     private List<ExtIEDPlanDocLinkVO> extIEDPlanDocLinks;
 
     /**
@@ -173,8 +183,8 @@ public class ExtIEDPlanVO extends IdOnlyVO implements IdVO ,DxContextVOHolder ,D
     private String fileName;
 
     /**
-     * 文件编号
-     */
+    * 文件编号
+    */
     private String fileNumber;
 
     /**

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

@@ -40,13 +40,13 @@ import com.yonde.dex.basedata.entity.users.DxUserVO;
 * @description: ExtPlanBaseLineLink-VO
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-27 10:56:22
+* @date: 2024-10-28 17:18:26
 **/
 @JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtPlanBaseLineLinkVO.class)
 @EqualsAndHashCode(callSuper = true)
 @Data
 @ToString(callSuper = true)
-public class ExtPlanBaseLineLinkVO extends IdOnlyVO implements IdVO ,DxLinkDataVOHolder<ExtPlanBaseLineVO, IdOnlyVO>{
+public class ExtPlanBaseLineLinkVO extends IdOnlyVO implements IdVO ,DxLinkDataVOHolder<ExtPlanBaseLineVO, ExtPlanParentVO>{
 
     public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
     public static final String DX_LINK_DATA_EMBEDDABLE_PROP_NAME = "dxLinkDataEmbeddable";
@@ -63,7 +63,7 @@ public class ExtPlanBaseLineLinkVO extends IdOnlyVO implements IdVO ,DxLinkDataV
     */
     @DexEmbedded()
     @JsonIgnore
-    private DxLinkDataVOEmbeddable<ExtPlanBaseLineVO, IdOnlyVO> dxLinkDataEmbeddable;
+    private DxLinkDataVOEmbeddable<ExtPlanBaseLineVO, ExtPlanParentVO> dxLinkDataEmbeddable;
 
 }
 

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

@@ -41,7 +41,7 @@ import com.yonde.dex.basedata.entity.users.DxUserVO;
 * @description: ExtPlanBaseLine-VO
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-27 10:56:22
+* @date: 2024-10-28 17:18:26
 **/
 @JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtPlanBaseLineVO.class)
 @EqualsAndHashCode(callSuper = true)

dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtPlanParentVO.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.ExtPlanBaseLineLinkVO;
+import com.yonde.dex.basedata.entity.users.DxUserVO;
+
+/**
+* @description: ExtPlanParent-VO
+* @author: dexadmin
+* @version: V
+* @date: 2024-10-28 17:18:27
+**/
+@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtPlanParentVO.class)
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ToString(callSuper = true)
+public class ExtPlanParentVO extends IdOnlyVO implements IdVO{
+
+    public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
+    public static final String EXT_PLAN_BASE_LINE_LINKS_PROP_NAME = "extPlanBaseLineLinks";
+
+    /**
+    * dao扩展对象
+    */
+    @DexEmbedded()
+    @JsonIgnore
+    private DxIdVOEmbeddable dxIdEmbeddable;
+
+    /**
+    * 计划基线link集合
+    */
+    @RelationProperty(refProperty = "target")
+    @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
+    private List<ExtPlanBaseLineLinkVO> extPlanBaseLineLinks;
+
+}
+
+

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

@@ -30,18 +30,18 @@ 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.ExtPlanParentVO;
 import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOHolder;
 import com.yonde.dex.context.plugin.common.entity.DxContextVOEmbeddable;
 import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOHolder;
 import com.yonde.dex.context.plugin.common.entity.DxContextVOHolder;
 import com.yonde.dex.version.plugin.common.entity.DxIterationVOEmbeddable;
 import com.yonde.dcs.plan.common.vo.ExtPlanDocLinkVO;
-import com.yonde.dex.basedata.entity.users.DxUserVO;
 import com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOHolder;
 import com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOEmbeddable;
+import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOHolder;
+import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOEmbeddable;
 import com.yonde.dex.tree.plugin.common.entity.DxTreeContextVOEmbeddable;
-import com.yonde.dex.basedata.entity.vo.IdVO;
 import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOEmbeddable;
 import com.yonde.dex.tree.plugin.common.entity.DxTreeContextVOHolder;
 import com.yonde.dcs.plan.common.vo.ExtPlanReplyLinkVO;
@@ -52,19 +52,19 @@ import com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder;
 * @description: ExtPlan-VO
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-15 9:25:36
+* @date: 2024-10-28 17:18:21
 **/
 @JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtPlanVO.class)
 @EqualsAndHashCode(callSuper = true)
 @Data
 @ToString(callSuper = true)
-public class ExtPlanVO extends IdOnlyVO implements IdVO ,DxTreeContextVOHolder<ExtPlanVO> ,DxContextVOHolder ,DxLifecycleManageBaseVOHolder ,DxIterationVOHolder<ExtPlanVO> ,DxObjFileLinkVOHolder ,DxSecretVOHolder{
+public class ExtPlanVO extends ExtPlanParentVO implements DxTreeContextVOHolder<ExtPlanVO> ,DxContextVOHolder ,DxLifecycleManageBaseVOHolder ,DxIterationVOHolder<ExtPlanVO> ,DxObjFileLinkVOHolder ,DxLogicDeleteVOHolder ,DxSecretVOHolder{
 
     public static final String DX_CONTEXT_EMBEDDABLE_PROP_NAME = "dxContextEmbeddable";
     public static final String DX_OBJ_FILE_LINK_EMBEDDABLE_PROP_NAME = "dxObjFileLinkEmbeddable";
     public static final String DX_TREE_CONTEXT_EMBEDDABLE_PROP_NAME = "dxTreeContextEmbeddable";
     public static final String DX_LIFECYCLE_MANAGE_BASE_EMBEDDABLE_PROP_NAME = "dxLifecycleManageBaseEmbeddable";
-    public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
+    public static final String DX_LOGIC_DELETE_EMBEDDABLE_PROP_NAME = "dxLogicDeleteEmbeddable";
     public static final String DX_ITERATION_EMBEDDABLE_PROP_NAME = "dxIterationEmbeddable";
     public static final String DX_SECRET_EMBEDDABLE_PROP_NAME = "dxSecretEmbeddable";
     public static final String ACTUAL_COMPLATE_TIME_PROP_NAME = "actualComplateTime";
@@ -87,6 +87,7 @@ public class ExtPlanVO extends IdOnlyVO implements IdVO ,DxTreeContextVOHolder<E
     public static final String OPERATE_PROP_NAME = "operate";
     public static final String PHASE_STATE_PROP_NAME = "phaseState";
     public static final String PLAN_EXECUTOR_PROP_NAME = "planExecutor";
+    public static final String PLAN_EXECUTOR_ID_PROP_NAME = "planExecutorId";
     public static final String PLAN_LEVEL_PROP_NAME = "planLevel";
     public static final String PROJECT_CODE_PROP_NAME = "projectCode";
     public static final String REVIEW_PROP_NAME = "review";
@@ -128,11 +129,11 @@ public class ExtPlanVO extends IdOnlyVO implements IdVO ,DxTreeContextVOHolder<E
     private DxLifecycleManageBaseVOEmbeddable dxLifecycleManageBaseEmbeddable;
 
     /**
-    * dao扩展对象
+    * 扩展VO属性
     */
     @DexEmbedded()
     @JsonIgnore
-    private DxIdVOEmbeddable dxIdEmbeddable;
+    private DxLogicDeleteVOEmbeddable dxLogicDeleteEmbeddable;
 
     /**
     * 扩展VO属性
@@ -199,7 +200,7 @@ public class ExtPlanVO extends IdOnlyVO implements IdVO ,DxTreeContextVOHolder<E
     * ExtPlanReplyLink集合
     */
     @RelationProperty(refProperty = "source")
-    @VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
+    @VersionProperty(curVersion = VersionRelationType.ITERATION, refVersion = VersionRelationType.NONE)
     private List<ExtPlanReplyLinkVO> extPlanReplyLinks;
 
     /**
@@ -252,6 +253,11 @@ public class ExtPlanVO extends IdOnlyVO implements IdVO ,DxTreeContextVOHolder<E
     */
     private String planExecutor;
 
+    /**
+    * 执行计划人Id
+    */
+    private Long planExecutorId;
+
     /**
     * 计划级别
     */
@@ -307,11 +313,6 @@ public class ExtPlanVO extends IdOnlyVO implements IdVO ,DxTreeContextVOHolder<E
     */
     private String verifier;
 
-    /**
-     * 计划执行人ID
-     */
-    private Long planExecutorId;
-
 }
 
 

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

@@ -30,39 +30,37 @@ 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.ExtPlanParentVO;
 import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOHolder;
 import com.yonde.dex.context.plugin.common.entity.DxContextVOEmbeddable;
 import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOHolder;
 import com.yonde.dex.context.plugin.common.entity.DxContextVOHolder;
 import com.yonde.dex.version.plugin.common.entity.DxIterationVOEmbeddable;
-import com.yonde.dex.basedata.entity.users.DxUserVO;
 import com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOHolder;
 import com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOEmbeddable;
 import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOHolder;
 import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOEmbeddable;
-import com.yonde.dex.basedata.entity.vo.IdVO;
 import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOEmbeddable;
 import com.yonde.dcs.plan.common.vo.ExtPurchasePlanDocLinkVO;
 import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbeddable;
 import com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder;
+import com.yonde.dcs.plan.common.vo.ExtPurPlanExtExpendContractLinkVO;
 
 /**
 * @description: ExtPuchasePlanAttribute-VO
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-29 17:14:49
+* @date: 2024-10-28 17:18:22
 **/
 @JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtPuchasePlanAttributeVO.class)
 @EqualsAndHashCode(callSuper = true)
 @Data
 @ToString(callSuper = true)
-public class ExtPuchasePlanAttributeVO extends IdOnlyVO implements DxIterationVOHolder<ExtPuchasePlanAttributeVO> ,IdVO ,DxContextVOHolder ,DxLifecycleManageBaseVOHolder ,DxObjFileLinkVOHolder ,DxLogicDeleteVOHolder ,DxSecretVOHolder{
+public class ExtPuchasePlanAttributeVO extends ExtPlanParentVO implements DxIterationVOHolder<ExtPuchasePlanAttributeVO> ,DxContextVOHolder ,DxLifecycleManageBaseVOHolder ,DxObjFileLinkVOHolder ,DxLogicDeleteVOHolder ,DxSecretVOHolder{
 
     public static final String DX_CONTEXT_EMBEDDABLE_PROP_NAME = "dxContextEmbeddable";
     public static final String DX_OBJ_FILE_LINK_EMBEDDABLE_PROP_NAME = "dxObjFileLinkEmbeddable";
     public static final String DX_LIFECYCLE_MANAGE_BASE_EMBEDDABLE_PROP_NAME = "dxLifecycleManageBaseEmbeddable";
-    public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
     public static final String DX_LOGIC_DELETE_EMBEDDABLE_PROP_NAME = "dxLogicDeleteEmbeddable";
     public static final String DX_ITERATION_EMBEDDABLE_PROP_NAME = "dxIterationEmbeddable";
     public static final String DX_SECRET_EMBEDDABLE_PROP_NAME = "dxSecretEmbeddable";
@@ -70,6 +68,7 @@ public class ExtPuchasePlanAttributeVO extends IdOnlyVO implements DxIterationVO
     public static final String CONTRACT_ACTUAL_SIGNING_TIME_PROP_NAME = "contractActualSigningTime";
     public static final String CONTRACT_DELIVERY_TIME_PROP_NAME = "contractDeliveryTime";
     public static final String CONTRACT_SIGNING_TIME_PROP_NAME = "contractSigningTime";
+    public static final String EXT_PUR_PLAN_EXT_EXPEND_CONTRACT_LINKS_PROP_NAME = "extPurPlanExtExpendContractLinks";
     public static final String EXT_PURCHASE_PLAN_DOC_LINKS_PROP_NAME = "extPurchasePlanDocLinks";
     public static final String OUTSOURCE_PROJECT_NAME_PROP_NAME = "outsourceProjectName";
     public static final String PLAN_CODE_PROP_NAME = "planCode";
@@ -99,13 +98,6 @@ public class ExtPuchasePlanAttributeVO extends IdOnlyVO implements DxIterationVO
     @JsonIgnore
     private DxLifecycleManageBaseVOEmbeddable dxLifecycleManageBaseEmbeddable;
 
-    /**
-    * dao扩展对象
-    */
-    @DexEmbedded()
-    @JsonIgnore
-    private DxIdVOEmbeddable dxIdEmbeddable;
-
     /**
     * 扩展VO属性
     */
@@ -147,6 +139,13 @@ public class ExtPuchasePlanAttributeVO extends IdOnlyVO implements DxIterationVO
     */
     private LocalDateTime contractSigningTime;
 
+    /**
+    * 采购计划与支出合同关系集合
+    */
+    @RelationProperty(refProperty = "source")
+    @VersionProperty(curVersion = VersionRelationType.ITERATION, refVersion = VersionRelationType.NONE)
+    private List<ExtPurPlanExtExpendContractLinkVO> extPurPlanExtExpendContractLinks;
+
     /**
     * 采购计划文档关系集合
     */

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/ExtPlanParentController.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.ExtPlanParentVO;
+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.ExtPlanParentService;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import com.yonde.dcs.plan.core.controller.shadow.ExtPlanParentControllerShadow;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Controller;
+
+/**
+* @description: ExtPlanParent-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-10-28 17:18:27
+**/
+@Api(tags = "ExtPlanParent管理服务")
+@RequestMapping("/ExtPlanParent")
+@ResponseBody()
+@Controller(ExtPlanParentController.BEAN_NAME)
+public class ExtPlanParentController<V extends ExtPlanParentVO, S extends ExtPlanParentService<V>> extends ExtPlanParentControllerShadow<V, S> {
+
+
+}
+
+

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

@@ -12,16 +12,14 @@ import com.yonde.dcs.plan.core.service.ExtICMExternalInterfacePlanService;
 import com.yonde.dcs.plan.core.service.impl.ExtICMExternalInterfacePlanServiceImpl;
 import com.yonde.dex.basedata.entity.api.ApiResult;
 import javax.annotation.Resource;
+import com.yonde.dcs.plan.core.controller.ExtPlanParentController;
 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.baseweb.AbstractBaseController;
 import com.yonde.dex.lcycle.plugin.core.controller.AbstractLifecycleBaseController;
 import com.yonde.dex.basedata.entity.api.ApiResult;
 
@@ -29,9 +27,9 @@ import com.yonde.dex.basedata.entity.api.ApiResult;
 * @description: ExtICMExternalInterfacePlan-Controller
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-14 10:04:10
+* @date: 2024-10-28 17:18:22
 **/
-public class ExtICMExternalInterfacePlanControllerShadow<V extends ExtICMExternalInterfacePlanVO, S extends ExtICMExternalInterfacePlanService<V>> implements AbstractBaseController<V, S> ,AbstractLifecycleBaseController<V, S> ,AbstractVersionBaseController<V, S> ,DxObjFileLinkController<V, S> {
+public class ExtICMExternalInterfacePlanControllerShadow<V extends ExtICMExternalInterfacePlanVO, S extends ExtICMExternalInterfacePlanService<V>> extends ExtPlanParentController<V, S> implements AbstractLifecycleBaseController<V, S> ,AbstractVersionBaseController<V, S> ,DxObjFileLinkController<V, S>{
 
     public static final String BEAN_NAME = "extICMExternalInterfacePlanController";
 

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/shadow/ExtIEDPlanControllerShadow.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.ExtIEDPlanVO;
+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.ExtIEDPlanService;
 import com.yonde.dcs.plan.core.service.impl.ExtIEDPlanServiceImpl;
-import com.yonde.dex.baseweb.AbstractBaseController;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import javax.annotation.Resource;
+import com.yonde.dcs.plan.core.controller.ExtPlanParentController;
+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.version.plugin.core.controller.AbstractVersionBaseController;
-
-import javax.annotation.Resource;
+import com.yonde.dex.basedata.entity.api.ApiResult;
 
 /**
 * @description: ExtIEDPlan-Controller
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-11 15:49:41
+* @date: 2024-10-28 17:18:22
 **/
-public class ExtIEDPlanControllerShadow<V extends ExtIEDPlanVO, S extends ExtIEDPlanService<V>> implements AbstractBaseController<V, S> ,AbstractLifecycleBaseController<V, S> ,AbstractVersionBaseController<V, S> ,DxObjFileLinkController<V, S>{
+public class ExtIEDPlanControllerShadow<V extends ExtIEDPlanVO, S extends ExtIEDPlanService<V>> extends ExtPlanParentController<V, S> implements AbstractLifecycleBaseController<V, S> ,AbstractVersionBaseController<V, S> ,DxObjFileLinkController<V, S>{
 
     public static final String BEAN_NAME = "extIEDPlanController";
 

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

@@ -12,6 +12,7 @@ import com.yonde.dcs.plan.core.service.ExtPlanService;
 import com.yonde.dcs.plan.core.service.impl.ExtPlanServiceImpl;
 import com.yonde.dex.basedata.entity.api.ApiResult;
 import javax.annotation.Resource;
+import com.yonde.dcs.plan.core.controller.ExtPlanParentController;
 import com.yonde.dex.basedata.auth.annos.PermissionObject;
 import com.yonde.dex.version.plugin.core.controller.AbstractVersionBaseController;
 import com.yonde.dex.tree.plugin.core.controller.BaseTreeController;
@@ -21,16 +22,15 @@ 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: ExtPlan-Controller
 * @author: dexadmin
 * @version: V
-* @date: 2024-7-26 9:34:06
+* @date: 2024-10-28 17:18:21
 **/
-public class ExtPlanControllerShadow<V extends ExtPlanVO, S extends ExtPlanService<V>> implements AbstractBaseController<V, S> ,AbstractLifecycleBaseController<V, S> ,AbstractVersionBaseController<V, S> ,DxObjFileLinkController<V, S> ,BaseTreeController<V, S>{
+public class ExtPlanControllerShadow<V extends ExtPlanVO, S extends ExtPlanService<V>> extends ExtPlanParentController<V, S> implements AbstractLifecycleBaseController<V, S> ,AbstractVersionBaseController<V, S> ,DxObjFileLinkController<V, S> ,BaseTreeController<V, S>{
 
     public static final String BEAN_NAME = "extPlanController";
 

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/shadow/ExtPlanParentControllerShadow.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.ExtPlanParentVO;
+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.ExtPlanParentService;
+import com.yonde.dcs.plan.core.service.impl.ExtPlanParentServiceImpl;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import javax.annotation.Resource;
+import com.yonde.dex.baseweb.AbstractBaseController;
+
+/**
+* @description: ExtPlanParent-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-10-28 17:18:27
+**/
+public class ExtPlanParentControllerShadow<V extends ExtPlanParentVO, S extends ExtPlanParentService<V>> implements AbstractBaseController<V, S>{
+
+    public static final String BEAN_NAME = "extPlanParentController";
+
+
+    /**
+    * 注入
+    */
+    @Resource(name = ExtPlanParentServiceImpl.BEAN_NAME)
+    private ExtPlanParentService<V> extPlanParentService;
+
+    /**
+        * getService
+    */
+    @Override
+    public S getService() {
+        return (S)this.extPlanParentService;
+    }
+}
+
+

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

@@ -12,6 +12,7 @@ import com.yonde.dcs.plan.core.service.ExtPuchasePlanAttributeService;
 import com.yonde.dcs.plan.core.service.impl.ExtPuchasePlanAttributeServiceImpl;
 import com.yonde.dex.basedata.entity.api.ApiResult;
 import javax.annotation.Resource;
+import com.yonde.dcs.plan.core.controller.ExtPlanParentController;
 import com.yonde.dex.basedata.auth.annos.PermissionObject;
 import com.yonde.dex.version.plugin.core.controller.AbstractVersionBaseController;
 import com.yonde.dex.basedata.auth.annos.BasePermission;
@@ -21,17 +22,16 @@ 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: ExtPuchasePlanAttribute-Controller
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-29 17:14:49
+* @date: 2024-10-28 17:18:22
 **/
 @BasePermission("inet-plan:ExtPuchasePlanAttribute")
-public class ExtPuchasePlanAttributeControllerShadow<V extends ExtPuchasePlanAttributeVO, S extends ExtPuchasePlanAttributeService<V>> implements AbstractBaseController<V, S> ,AbstractLifecycleBaseController<V, S> ,AbstractVersionBaseController<V, S> ,DxObjFileLinkController<V, S>{
+public class ExtPuchasePlanAttributeControllerShadow<V extends ExtPuchasePlanAttributeVO, S extends ExtPuchasePlanAttributeService<V>> extends ExtPlanParentController<V, S> implements AbstractLifecycleBaseController<V, S> ,AbstractVersionBaseController<V, S> ,DxObjFileLinkController<V, S>{
 
     public static final String BEAN_NAME = "extPuchasePlanAttributeController";
 

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

@@ -6,7 +6,7 @@ import com.yonde.dcs.plan.core.repository.shadow.ExtICMExternalInterfacePlanRepo
 * @description: ExtICMExternalInterfacePlan-repository
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-14 10:04:10
+* @date: 2024-10-28 17:18:22
 **/
 public interface ExtICMExternalInterfacePlanRepository<P extends ExtICMExternalInterfacePlan> extends ExtICMExternalInterfacePlanRepositoryShadow<P> {
 }

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

 package com.yonde.dcs.plan.core.repository;
 
-
-import com.yonde.dcs.plan.core.repository.shadow.ExtIEDPlanRepositoryShadow;
 import com.yonde.dcs.plan.entity.po.ExtIEDPlan;
-
+import com.yonde.dcs.plan.core.repository.shadow.ExtIEDPlanRepositoryShadow;
 /**
 * @description: ExtIEDPlan-repository
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-11 15:49:41
+* @date: 2024-10-28 17:18:22
 **/
 public interface ExtIEDPlanRepository<P extends ExtIEDPlan> extends ExtIEDPlanRepositoryShadow<P> {
 }

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

+package com.yonde.dcs.plan.core.repository;
+
+import com.yonde.dcs.plan.entity.po.ExtPlanParent;
+import com.yonde.dcs.plan.core.repository.shadow.ExtPlanParentRepositoryShadow;
+/**
+* @description: ExtPlanParent-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-10-28 17:18:27
+**/
+public interface ExtPlanParentRepository<P extends ExtPlanParent> extends ExtPlanParentRepositoryShadow<P> {
+}

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

@@ -6,7 +6,7 @@ import com.yonde.dcs.plan.core.repository.shadow.ExtPlanRepositoryShadow;
 * @description: ExtPlan-repository
 * @author: dexadmin
 * @version: V
-* @date: 2024-7-26 9:34:06
+* @date: 2024-10-28 17:18:21
 **/
 public interface ExtPlanRepository<P extends ExtPlan> extends ExtPlanRepositoryShadow<P> {
 }

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

@@ -6,7 +6,7 @@ import com.yonde.dcs.plan.core.repository.shadow.ExtPuchasePlanAttributeReposito
 * @description: ExtPuchasePlanAttribute-repository
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-29 17:14:49
+* @date: 2024-10-28 17:18:22
 **/
 public interface ExtPuchasePlanAttributeRepository<P extends ExtPuchasePlanAttribute> extends ExtPuchasePlanAttributeRepositoryShadow<P> {
 }

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

@@ -3,8 +3,7 @@ package com.yonde.dcs.plan.core.repository.shadow;
 import com.yonde.dcs.plan.entity.po.ExtICMExternalInterfacePlan;
 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.dcs.plan.core.repository.ExtPlanParentRepository;
 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;
@@ -13,10 +12,10 @@ import com.yonde.dex.dfs.objfilelink.plugin.core.repository.DxObjFileLinkPluginR
 * @description: ExtICMExternalInterfacePlan-repository
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-14 10:04:10
+* @date: 2024-10-28 17:18:22
 **/
 @NoRepositoryBean
-public interface ExtICMExternalInterfacePlanRepositoryShadow<P extends ExtICMExternalInterfacePlan> extends DxContextPluginRepository<P> ,DxObjFileLinkPluginRepository<P> ,DxLifecycleManageBaseRepository<P> ,BaseRepository<P> ,DxLogicDeleteRepository<P> ,DxSecretCodePluginRepository<P> ,DxIterationRepository<P> {
+public interface ExtICMExternalInterfacePlanRepositoryShadow<P extends ExtICMExternalInterfacePlan> extends ExtPlanParentRepository<P> ,DxContextPluginRepository<P> ,DxObjFileLinkPluginRepository<P> ,DxLifecycleManageBaseRepository<P> ,DxSecretCodePluginRepository<P> ,DxIterationRepository<P> {
 
     String BEAN_NAME = "extICMExternalInterfacePlanRepository";
 }

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

 package com.yonde.dcs.plan.core.repository.shadow;
 
-
 import com.yonde.dcs.plan.entity.po.ExtIEDPlan;
 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.dcs.plan.core.repository.ExtPlanParentRepository;
 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;
@@ -14,10 +13,10 @@ import com.yonde.dex.dfs.objfilelink.plugin.core.repository.DxObjFileLinkPluginR
 * @description: ExtIEDPlan-repository
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-11 15:49:41
+* @date: 2024-10-28 17:18:22
 **/
 @NoRepositoryBean
-public interface ExtIEDPlanRepositoryShadow<P extends ExtIEDPlan> extends DxContextPluginRepository<P> ,DxObjFileLinkPluginRepository<P> ,DxLifecycleManageBaseRepository<P> ,BaseRepository<P> ,DxLogicDeleteRepository<P> ,DxSecretCodePluginRepository<P> ,DxIterationRepository<P> {
+public interface ExtIEDPlanRepositoryShadow<P extends ExtIEDPlan> extends ExtPlanParentRepository<P> ,DxContextPluginRepository<P> ,DxObjFileLinkPluginRepository<P> ,DxLifecycleManageBaseRepository<P> ,DxLogicDeleteRepository<P> ,DxSecretCodePluginRepository<P> ,DxIterationRepository<P> {
 
     String BEAN_NAME = "extIEDPlanRepository";
 }

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

+package com.yonde.dcs.plan.core.repository.shadow;
+
+import com.yonde.dcs.plan.entity.po.ExtPlanParent;
+import org.springframework.data.repository.NoRepositoryBean;
+import com.yonde.dex.dao.business.repository.BaseRepository;
+/**
+* @description: ExtPlanParent-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-10-28 17:18:27
+**/
+@NoRepositoryBean
+public interface ExtPlanParentRepositoryShadow<P extends ExtPlanParent> extends BaseRepository<P> {
+
+    String BEAN_NAME = "extPlanParentRepository";
+}

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

@@ -3,7 +3,8 @@ package com.yonde.dcs.plan.core.repository.shadow;
 import com.yonde.dcs.plan.entity.po.ExtPlan;
 import org.springframework.data.repository.NoRepositoryBean;
 import com.yonde.dex.context.plugin.core.repository.DxContextPluginRepository;
-import com.yonde.dex.dao.business.repository.BaseRepository;
+import com.yonde.dex.logicdelete.plugin.core.repository.DxLogicDeleteRepository;
+import com.yonde.dcs.plan.core.repository.ExtPlanParentRepository;
 import com.yonde.dex.secretcode.plugin.core.repositroy.DxSecretCodePluginRepository;
 import com.yonde.dex.tree.plugin.core.repository.DxTreePluginRepository;
 import com.yonde.dex.version.plugin.core.repository.DxIterationRepository;
@@ -13,10 +14,10 @@ import com.yonde.dex.dfs.objfilelink.plugin.core.repository.DxObjFileLinkPluginR
 * @description: ExtPlan-repository
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-15 10:55:29
+* @date: 2024-10-28 17:18:21
 **/
 @NoRepositoryBean
-public interface ExtPlanRepositoryShadow<P extends ExtPlan> extends DxContextPluginRepository<P> ,DxObjFileLinkPluginRepository<P> ,DxTreePluginRepository<P> ,DxLifecycleManageBaseRepository<P> ,BaseRepository<P> ,DxIterationRepository<P> ,DxSecretCodePluginRepository<P> {
+public interface ExtPlanRepositoryShadow<P extends ExtPlan> extends ExtPlanParentRepository<P> ,DxContextPluginRepository<P> ,DxObjFileLinkPluginRepository<P> ,DxTreePluginRepository<P> ,DxLifecycleManageBaseRepository<P> ,DxLogicDeleteRepository<P> ,DxIterationRepository<P> ,DxSecretCodePluginRepository<P> {
 
     String BEAN_NAME = "extPlanRepository";
 }

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

@@ -4,7 +4,7 @@ import com.yonde.dcs.plan.entity.po.ExtPuchasePlanAttribute;
 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.dcs.plan.core.repository.ExtPlanParentRepository;
 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;
@@ -13,10 +13,10 @@ import com.yonde.dex.dfs.objfilelink.plugin.core.repository.DxObjFileLinkPluginR
 * @description: ExtPuchasePlanAttribute-repository
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-29 17:14:49
+* @date: 2024-10-28 17:18:22
 **/
 @NoRepositoryBean
-public interface ExtPuchasePlanAttributeRepositoryShadow<P extends ExtPuchasePlanAttribute> extends DxContextPluginRepository<P> ,DxObjFileLinkPluginRepository<P> ,DxLifecycleManageBaseRepository<P> ,BaseRepository<P> ,DxLogicDeleteRepository<P> ,DxIterationRepository<P> ,DxSecretCodePluginRepository<P> {
+public interface ExtPuchasePlanAttributeRepositoryShadow<P extends ExtPuchasePlanAttribute> extends ExtPlanParentRepository<P> ,DxContextPluginRepository<P> ,DxObjFileLinkPluginRepository<P> ,DxLifecycleManageBaseRepository<P> ,DxLogicDeleteRepository<P> ,DxIterationRepository<P> ,DxSecretCodePluginRepository<P> {
 
     String BEAN_NAME = "extPuchasePlanAttributeRepository";
 }

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

+package com.yonde.dcs.plan.core.service;
+
+import com.yonde.dcs.plan.common.vo.ExtPlanParentVO;
+import com.yonde.dcs.plan.core.service.shadow.ExtPlanParentServiceShadow;
+/**
+* @description: ExtPlanParent-service
+* @author: dexadmin
+* @version: V
+* @date: 2024-10-28 17:18:27
+**/
+public interface ExtPlanParentService<V extends ExtPlanParentVO> extends ExtPlanParentServiceShadow<V> {
+
+}

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

@@ -51,7 +51,7 @@ import java.util.List;
  **/
 @Slf4j
 @Service(ExtICMExternalInterfacePlanServiceImpl.BEAN_NAME)
-public class ExtICMExternalInterfacePlanServiceImpl<V extends ExtICMExternalInterfacePlanVO> implements ExtICMExternalInterfacePlanService<V> {
+public class ExtICMExternalInterfacePlanServiceImpl<V extends ExtICMExternalInterfacePlanVO> extends ExtPlanParentServiceImpl<V> implements ExtICMExternalInterfacePlanService<V> {
 
 
     public static final String BEAN_NAME = "extICMExternalInterfacePlanServiceImpl";

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

@@ -63,7 +63,7 @@ import java.util.Map;
  **/
 @Slf4j
 @Service(ExtIEDPlanServiceImpl.BEAN_NAME)
-public class ExtIEDPlanServiceImpl<V extends ExtIEDPlanVO> implements ExtIEDPlanService<V> {
+public class ExtIEDPlanServiceImpl<V extends ExtIEDPlanVO> extends ExtPlanParentServiceImpl<V>  implements ExtIEDPlanService<V> {
 
 
     public static final String BEAN_NAME = "extIEDPlanServiceImpl";

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

@@ -5,6 +5,7 @@ import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.yonde.dcs.plan.common.vo.ExtIEDPlanVO;
 import com.yonde.dcs.plan.common.vo.ExtPlanBaseLineLinkVO;
+import com.yonde.dcs.plan.common.vo.ExtPlanParentVO;
 import com.yonde.dcs.plan.core.service.ExtPlanBaseLineLinkService;
 import com.yonde.dcs.plan.core.util.SearchUtil;
 import com.yonde.dex.basedata.data.search.SearchItem;
@@ -59,7 +60,7 @@ public class ExtPlanBaseLineServiceImpl<V extends ExtPlanBaseLineVO> implements
         ExtIEDPlanVO iedPlanVO = new ExtIEDPlanVO();
         iedPlanVO.getDynamicAttrs();
         if (recursion.getTotalElements() != 0) {
-            List<IdOnlyVO> result = recursion.getContent();
+            List<ExtPlanParentVO> result = recursion.getContent();
             List<ExtPlanBaseLineLinkVO> lineLinkVOS = new ArrayList<>();
             result.forEach(idVO -> {
                 Long oldId = idVO.getId();

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

+package com.yonde.dcs.plan.core.service.impl;
+
+import org.springframework.stereotype.Service;
+import io.swagger.annotations.ApiOperation;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtPlanParentVO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.core.service.ExtPlanParentService;
+import com.yonde.dcs.plan.core.repository.ExtPlanParentRepository;
+import com.yonde.dcs.plan.entity.po.ExtPlanParent;
+import javax.annotation.Resource;
+
+/**
+* @description: ExtPlanParent-ServiceImpl
+* @author: dexadmin
+* @version: V
+* @date: 2024-10-28 17:18:27
+**/
+@Slf4j
+@Service(ExtPlanParentServiceImpl.BEAN_NAME)
+public class ExtPlanParentServiceImpl<V extends ExtPlanParentVO> implements ExtPlanParentService<V>{
+
+
+    public static final String BEAN_NAME = "extPlanParentServiceImpl";
+
+    @Autowired
+    ExtPlanParentRepository<ExtPlanParent> extPlanParentRepository;
+
+}
+
+

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

@@ -68,7 +68,7 @@ import java.util.*;
  **/
 @Slf4j
 @Service(ExtPlanServiceImpl.BEAN_NAME)
-public class ExtPlanServiceImpl<V extends ExtPlanVO> implements ExtPlanService<V> {
+public class ExtPlanServiceImpl<V extends ExtPlanVO>  extends ExtPlanParentServiceImpl<V> implements ExtPlanService<V> {
 
 
     public static final String BEAN_NAME = "extPlanServiceImpl";

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

@@ -53,7 +53,7 @@ import java.util.List;
  **/
 @Slf4j
 @Service(ExtPuchasePlanAttributeServiceImpl.BEAN_NAME)
-public class ExtPuchasePlanAttributeServiceImpl<V extends ExtPuchasePlanAttributeVO> implements ExtPuchasePlanAttributeService<V> {
+public class ExtPuchasePlanAttributeServiceImpl<V extends ExtPuchasePlanAttributeVO> extends ExtPlanParentServiceImpl<V> implements ExtPuchasePlanAttributeService<V> {
 
 
     public static final String BEAN_NAME = "extPuchasePlanAttributeServiceImpl";

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

@@ -2,20 +2,18 @@ package com.yonde.dcs.plan.core.service.shadow;
 
 import com.yonde.dcs.plan.common.vo.ExtICMExternalInterfacePlanVO;
 import com.yonde.dcs.plan.feign.ExtICMExternalInterfacePlanServiceFeign;
-
-import com.yonde.dex.dao.service.BaseIdEntityService;
+import com.yonde.dcs.plan.core.service.ExtPlanParentService;
 import com.yonde.dex.secretcode.plugin.core.service.SecretCodePluginService;
 import com.yonde.dex.version.plugin.core.service.IterationService;
 import com.yonde.dex.context.plugin.core.service.ContextPluginService;
 import com.yonde.dex.lcycle.plugin.core.service.LifecycleBaseService;
-import com.yonde.dex.logicdelete.plugin.core.service.LogicDeleteService;
 import com.yonde.dex.dfs.objfilelink.plugin.core.service.ObjFileLinkPluginService;
 /**
 * @description: ExtICMExternalInterfacePlan-service
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-14 10:04:10
+* @date: 2024-10-28 17:18:22
 **/
-public interface ExtICMExternalInterfacePlanServiceShadow<V extends ExtICMExternalInterfacePlanVO> extends ExtICMExternalInterfacePlanServiceFeign<V>, ContextPluginService<V> ,ObjFileLinkPluginService<V> ,LifecycleBaseService<V> ,BaseIdEntityService<V> ,LogicDeleteService<V> ,SecretCodePluginService<V> ,IterationService<V> {
+public interface ExtICMExternalInterfacePlanServiceShadow<V extends ExtICMExternalInterfacePlanVO> extends ExtICMExternalInterfacePlanServiceFeign<V>, ExtPlanParentService<V> ,ContextPluginService<V> ,ObjFileLinkPluginService<V> ,LifecycleBaseService<V> ,SecretCodePluginService<V> ,IterationService<V> {
 
 }

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

 package com.yonde.dcs.plan.core.service.shadow;
 
-
 import com.yonde.dcs.plan.common.vo.ExtIEDPlanVO;
 import com.yonde.dcs.plan.feign.ExtIEDPlanServiceFeign;
-import com.yonde.dex.dao.service.BaseIdEntityService;
+import com.yonde.dcs.plan.core.service.ExtPlanParentService;
 import com.yonde.dex.secretcode.plugin.core.service.SecretCodePluginService;
 import com.yonde.dex.version.plugin.core.service.IterationService;
 import com.yonde.dex.context.plugin.core.service.ContextPluginService;
@@ -14,8 +13,8 @@ import com.yonde.dex.dfs.objfilelink.plugin.core.service.ObjFileLinkPluginServic
 * @description: ExtIEDPlan-service
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-11 15:49:41
+* @date: 2024-10-28 17:18:21
 **/
-public interface ExtIEDPlanServiceShadow<V extends ExtIEDPlanVO> extends ExtIEDPlanServiceFeign<V>, ContextPluginService<V> ,ObjFileLinkPluginService<V> ,LifecycleBaseService<V> ,BaseIdEntityService<V> ,LogicDeleteService<V> ,SecretCodePluginService<V> ,IterationService<V> {
+public interface ExtIEDPlanServiceShadow<V extends ExtIEDPlanVO> extends ExtIEDPlanServiceFeign<V>, ExtPlanParentService<V> ,ContextPluginService<V> ,ObjFileLinkPluginService<V> ,LifecycleBaseService<V> ,LogicDeleteService<V> ,SecretCodePluginService<V> ,IterationService<V> {
 
 }

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

+package com.yonde.dcs.plan.core.service.shadow;
+
+import com.yonde.dcs.plan.common.vo.ExtPlanParentVO;
+import com.yonde.dcs.plan.feign.ExtPlanParentServiceFeign;
+import com.yonde.dex.dao.service.BaseIdEntityService;
+/**
+* @description: ExtPlanParent-service
+* @author: dexadmin
+* @version: V
+* @date: 2024-10-28 17:18:27
+**/
+public interface ExtPlanParentServiceShadow<V extends ExtPlanParentVO> extends ExtPlanParentServiceFeign<V>, BaseIdEntityService<V> {
+
+}

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

@@ -2,19 +2,20 @@ package com.yonde.dcs.plan.core.service.shadow;
 
 import com.yonde.dcs.plan.common.vo.ExtPlanVO;
 import com.yonde.dcs.plan.feign.ExtPlanServiceFeign;
-import com.yonde.dex.dao.service.BaseIdEntityService;
+import com.yonde.dcs.plan.core.service.ExtPlanParentService;
 import com.yonde.dex.secretcode.plugin.core.service.SecretCodePluginService;
 import com.yonde.dex.version.plugin.core.service.IterationService;
 import com.yonde.dex.context.plugin.core.service.ContextPluginService;
 import com.yonde.dex.lcycle.plugin.core.service.LifecycleBaseService;
+import com.yonde.dex.logicdelete.plugin.core.service.LogicDeleteService;
 import com.yonde.dex.dfs.objfilelink.plugin.core.service.ObjFileLinkPluginService;
 import com.yonde.dex.tree.plugin.core.service.BaseTreeService;
 /**
 * @description: ExtPlan-service
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-30 10:28:36
+* @date: 2024-10-28 17:18:21
 **/
-public interface ExtPlanServiceShadow<V extends ExtPlanVO> extends ExtPlanServiceFeign<V>, ContextPluginService<V> ,ObjFileLinkPluginService<V> ,BaseTreeService<V> ,LifecycleBaseService<V> ,BaseIdEntityService<V> ,IterationService<V> ,SecretCodePluginService<V> {
+public interface ExtPlanServiceShadow<V extends ExtPlanVO> extends ExtPlanServiceFeign<V>, ExtPlanParentService<V> ,ContextPluginService<V> ,ObjFileLinkPluginService<V> ,BaseTreeService<V> ,LifecycleBaseService<V> ,LogicDeleteService<V> ,IterationService<V> ,SecretCodePluginService<V> {
 
 }

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

@@ -2,7 +2,7 @@ package com.yonde.dcs.plan.core.service.shadow;
 
 import com.yonde.dcs.plan.common.vo.ExtPuchasePlanAttributeVO;
 import com.yonde.dcs.plan.feign.ExtPuchasePlanAttributeServiceFeign;
-import com.yonde.dex.dao.service.BaseIdEntityService;
+import com.yonde.dcs.plan.core.service.ExtPlanParentService;
 import com.yonde.dex.secretcode.plugin.core.service.SecretCodePluginService;
 import com.yonde.dex.version.plugin.core.service.IterationService;
 import com.yonde.dex.context.plugin.core.service.ContextPluginService;
@@ -13,8 +13,8 @@ import com.yonde.dex.dfs.objfilelink.plugin.core.service.ObjFileLinkPluginServic
 * @description: ExtPuchasePlanAttribute-service
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-29 17:14:49
+* @date: 2024-10-28 17:18:22
 **/
-public interface ExtPuchasePlanAttributeServiceShadow<V extends ExtPuchasePlanAttributeVO> extends ExtPuchasePlanAttributeServiceFeign<V>, ContextPluginService<V> ,ObjFileLinkPluginService<V> ,LifecycleBaseService<V> ,BaseIdEntityService<V> ,LogicDeleteService<V> ,IterationService<V> ,SecretCodePluginService<V> {
+public interface ExtPuchasePlanAttributeServiceShadow<V extends ExtPuchasePlanAttributeVO> extends ExtPuchasePlanAttributeServiceFeign<V>, ExtPlanParentService<V> ,ContextPluginService<V> ,ObjFileLinkPluginService<V> ,LifecycleBaseService<V> ,LogicDeleteService<V> ,IterationService<V> ,SecretCodePluginService<V> {
 
 }

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

@@ -26,31 +26,26 @@ import com.yonde.dex.lcycle.plugin.entities.DxLifecycleManageBaseEmbeddable;
 import com.yonde.dex.context.plugin.entities.DxContextHolder;
 import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkHolder;
 import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkEmbeddable;
+import com.yonde.dcs.plan.entity.po.ExtPlanParent;
 import com.yonde.dex.context.plugin.entities.DxContextEmbeddable;
-import com.yonde.dex.dao.entity.base.IdOnlyEntity;
-import com.yonde.dex.version.plugin.entities.DxIterationHolder;
-import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteHolder;
-import com.yonde.dex.dao.entity.base.IdEntity;
-import javax.persistence.Column;
 import com.yonde.dex.secretcode.plugin.entities.DxSecretHolder;
 import com.yonde.dex.lcycle.plugin.entities.DxLifecycleManageBaseHolder;
-import com.yonde.dex.dao.entity.base.DxIdEntityEmbeddable;
 import com.yonde.dex.secretcode.plugin.entities.DxSecretEmbeddable;
-import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteEmbeddable;
+import com.yonde.dex.version.plugin.entities.DxIterationHolder;
 import com.yonde.dex.version.plugin.entities.DxIterationEmbeddable;
 
 /**
 * @description: ExtICMExternalInterfacePlan-PO实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-14 10:04:10
+* @date: 2024-10-28 17:18:22
 **/
 @Entity
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @Data
 @Table(name = "EXT_ICM_EXT_INTERFACE_PLAN")
-public class ExtICMExternalInterfacePlan extends IdOnlyEntity implements DxContextHolder ,DxObjFileLinkHolder ,DxLifecycleManageBaseHolder ,IdEntity ,DxLogicDeleteHolder ,DxSecretHolder ,DxIterationHolder{
+public class ExtICMExternalInterfacePlan extends ExtPlanParent implements DxContextHolder ,DxObjFileLinkHolder ,DxLifecycleManageBaseHolder ,DxSecretHolder ,DxIterationHolder{
 
     /**
     * 扩展PO属性
@@ -71,18 +66,6 @@ public class ExtICMExternalInterfacePlan extends IdOnlyEntity implements DxConte
     @Embedded()
     private DxLifecycleManageBaseEmbeddable dxLifecycleManageBaseEmbeddable;
     /**
-    * dao扩展对象
-    */
-    @DexEmbedded()
-    @Embedded()
-    private DxIdEntityEmbeddable dxIdEmbeddable;
-    /**
-    * 扩展PO属性
-    */
-    @DexEmbedded()
-    @Embedded()
-    private DxLogicDeleteEmbeddable dxLogicDeleteEmbeddable;
-    /**
     * 扩展PO属性
     */
     @DexEmbedded()

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

@@ -27,14 +27,11 @@ import com.yonde.dex.context.plugin.entities.DxContextHolder;
 import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkHolder;
 import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkEmbeddable;
 import com.yonde.dex.context.plugin.entities.DxContextEmbeddable;
-import com.yonde.dex.dao.entity.base.IdOnlyEntity;
 import com.yonde.dex.version.plugin.entities.DxIterationHolder;
 import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteHolder;
-import com.yonde.dex.dao.entity.base.IdEntity;
-import javax.persistence.Column;
+import com.yonde.dcs.plan.entity.po.ExtPlanParent;
 import com.yonde.dex.secretcode.plugin.entities.DxSecretHolder;
 import com.yonde.dex.lcycle.plugin.entities.DxLifecycleManageBaseHolder;
-import com.yonde.dex.dao.entity.base.DxIdEntityEmbeddable;
 import com.yonde.dex.secretcode.plugin.entities.DxSecretEmbeddable;
 import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteEmbeddable;
 import com.yonde.dex.version.plugin.entities.DxIterationEmbeddable;
@@ -43,14 +40,14 @@ import com.yonde.dex.version.plugin.entities.DxIterationEmbeddable;
 * @description: ExtIEDPlan-PO实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-11 15:49:41
+* @date: 2024-10-28 17:18:21
 **/
 @Entity
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @Data
 @Table(name = "EXT_IED_PLAN")
-public class ExtIEDPlan extends IdOnlyEntity implements DxContextHolder ,DxObjFileLinkHolder ,DxLifecycleManageBaseHolder ,IdEntity ,DxLogicDeleteHolder ,DxSecretHolder ,DxIterationHolder{
+public class ExtIEDPlan extends ExtPlanParent implements DxContextHolder ,DxObjFileLinkHolder ,DxLifecycleManageBaseHolder ,DxLogicDeleteHolder ,DxSecretHolder ,DxIterationHolder{
 
     /**
     * 扩展PO属性
@@ -71,12 +68,6 @@ public class ExtIEDPlan extends IdOnlyEntity implements DxContextHolder ,DxObjFi
     @Embedded()
     private DxLifecycleManageBaseEmbeddable dxLifecycleManageBaseEmbeddable;
     /**
-    * dao扩展对象
-    */
-    @DexEmbedded()
-    @Embedded()
-    private DxIdEntityEmbeddable dxIdEmbeddable;
-    /**
     * 扩展PO属性
     */
     @DexEmbedded()
@@ -134,10 +125,9 @@ public class ExtIEDPlan extends IdOnlyEntity implements DxContextHolder ,DxObjFi
     * 文件名称
     */
     private String fileName;
-
     /**
-     * 文件编号
-     */
+    * 文件编号
+    */
     private String fileNumber;
     /**
     * 文件提交时间

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

@@ -27,30 +27,29 @@ import com.yonde.dex.context.plugin.entities.DxContextHolder;
 import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkHolder;
 import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkEmbeddable;
 import com.yonde.dex.context.plugin.entities.DxContextEmbeddable;
-import com.yonde.dex.dao.entity.base.IdOnlyEntity;
 import com.yonde.dex.version.plugin.entities.DxIterationHolder;
+import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteHolder;
 import com.yonde.dex.tree.plugin.entities.DxTreeContextEmbeddable;
 import com.yonde.dex.tree.plugin.entities.DxTreeContextHolder;
-import com.yonde.dex.dao.entity.base.IdEntity;
-import javax.persistence.Column;
+import com.yonde.dcs.plan.entity.po.ExtPlanParent;
 import com.yonde.dex.secretcode.plugin.entities.DxSecretHolder;
 import com.yonde.dex.lcycle.plugin.entities.DxLifecycleManageBaseHolder;
-import com.yonde.dex.dao.entity.base.DxIdEntityEmbeddable;
 import com.yonde.dex.secretcode.plugin.entities.DxSecretEmbeddable;
+import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteEmbeddable;
 import com.yonde.dex.version.plugin.entities.DxIterationEmbeddable;
 
 /**
 * @description: ExtPlan-PO实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-15 10:55:29
+* @date: 2024-10-28 17:18:21
 **/
 @Entity
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @Data
 @Table(name = "EXT_PLAN")
-public class ExtPlan extends IdOnlyEntity implements DxContextHolder ,DxObjFileLinkHolder ,DxTreeContextHolder ,DxLifecycleManageBaseHolder ,IdEntity ,DxIterationHolder ,DxSecretHolder{
+public class ExtPlan extends ExtPlanParent implements DxContextHolder ,DxObjFileLinkHolder ,DxTreeContextHolder ,DxLifecycleManageBaseHolder ,DxLogicDeleteHolder ,DxIterationHolder ,DxSecretHolder{
 
     /**
     * 扩展PO属性
@@ -77,11 +76,11 @@ public class ExtPlan extends IdOnlyEntity implements DxContextHolder ,DxObjFileL
     @Embedded()
     private DxLifecycleManageBaseEmbeddable dxLifecycleManageBaseEmbeddable;
     /**
-    * dao扩展对象
+    * 扩展PO属性
     */
     @DexEmbedded()
     @Embedded()
-    private DxIdEntityEmbeddable dxIdEmbeddable;
+    private DxLogicDeleteEmbeddable dxLogicDeleteEmbeddable;
     /**
     * 扩展PO属性
     */
@@ -167,6 +166,10 @@ public class ExtPlan extends IdOnlyEntity implements DxContextHolder ,DxObjFileL
     */
     private String planExecutor;
     /**
+    * 执行计划人Id
+    */
+    private Long planExecutorId;
+    /**
     * 计划级别
     */
     private String planLevel;
@@ -210,11 +213,6 @@ public class ExtPlan extends IdOnlyEntity implements DxContextHolder ,DxObjFileL
     * 审定者
     */
     private String verifier;
-
-    /**
-     *   计划执行人ID
-     */
-    private Long planExecutorId;
 }
 
 

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

+package com.yonde.dcs.plan.entity.po;
+
+import org.springframework.data.annotation.CreatedBy;
+import javax.persistence.UniqueConstraint;
+import java.util.Date;
+import java.time.LocalDateTime;
+import lombok.EqualsAndHashCode;
+import org.springframework.data.annotation.LastModifiedDate;
+import com.yonde.dex.dao.entity.base.IdEntity;
+import org.springframework.data.annotation.LastModifiedBy;
+import javax.persistence.Column;
+import org.springframework.data.annotation.CreatedDate;
+import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
+import lombok.Data;
+import com.yonde.dex.basedata.entity.annotation.*;
+import java.math.BigInteger;
+import javax.persistence.*;
+import java.math.BigDecimal;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import com.yonde.dex.dao.entity.base.IdEntity;
+import javax.persistence.Column;
+import com.yonde.dex.dao.entity.base.DxIdEntityEmbeddable;
+import com.yonde.dex.dao.entity.base.IdOnlyEntity;
+
+/**
+* @description: ExtPlanParent-PO实体
+* @author: dexadmin
+* @version: V
+* @date: 2024-10-28 17:18:27
+**/
+@Entity
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@Data
+@Table(name = "EXT_PLAN_PARENT")
+public class ExtPlanParent extends IdOnlyEntity implements IdEntity{
+
+    /**
+    * dao扩展对象
+    */
+    @DexEmbedded()
+    @Embedded()
+    private DxIdEntityEmbeddable dxIdEmbeddable;
+}
+
+

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

@@ -27,14 +27,11 @@ import com.yonde.dex.context.plugin.entities.DxContextHolder;
 import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkHolder;
 import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkEmbeddable;
 import com.yonde.dex.context.plugin.entities.DxContextEmbeddable;
-import com.yonde.dex.dao.entity.base.IdOnlyEntity;
 import com.yonde.dex.version.plugin.entities.DxIterationHolder;
 import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteHolder;
-import com.yonde.dex.dao.entity.base.IdEntity;
-import javax.persistence.Column;
+import com.yonde.dcs.plan.entity.po.ExtPlanParent;
 import com.yonde.dex.secretcode.plugin.entities.DxSecretHolder;
 import com.yonde.dex.lcycle.plugin.entities.DxLifecycleManageBaseHolder;
-import com.yonde.dex.dao.entity.base.DxIdEntityEmbeddable;
 import com.yonde.dex.secretcode.plugin.entities.DxSecretEmbeddable;
 import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteEmbeddable;
 import com.yonde.dex.version.plugin.entities.DxIterationEmbeddable;
@@ -43,14 +40,14 @@ import com.yonde.dex.version.plugin.entities.DxIterationEmbeddable;
 * @description: ExtPuchasePlanAttribute-PO实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-29 17:14:49
+* @date: 2024-10-28 17:18:22
 **/
 @Entity
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @Data
 @Table(name = "EXT_PUCHASE_PLAN_ATTRIBUTE")
-public class ExtPuchasePlanAttribute extends IdOnlyEntity implements DxContextHolder ,DxObjFileLinkHolder ,DxLifecycleManageBaseHolder ,IdEntity ,DxLogicDeleteHolder ,DxIterationHolder ,DxSecretHolder{
+public class ExtPuchasePlanAttribute extends ExtPlanParent implements DxContextHolder ,DxObjFileLinkHolder ,DxLifecycleManageBaseHolder ,DxLogicDeleteHolder ,DxIterationHolder ,DxSecretHolder{
 
     /**
     * 扩展PO属性
@@ -71,12 +68,6 @@ public class ExtPuchasePlanAttribute extends IdOnlyEntity implements DxContextHo
     @Embedded()
     private DxLifecycleManageBaseEmbeddable dxLifecycleManageBaseEmbeddable;
     /**
-    * dao扩展对象
-    */
-    @DexEmbedded()
-    @Embedded()
-    private DxIdEntityEmbeddable dxIdEmbeddable;
-    /**
     * 扩展PO属性
     */
     @DexEmbedded()

dcs-plan-feign/src/main/java/com/yonde/dcs/plan/feign/ExtPlanParentServiceFeign.java

+package com.yonde.dcs.plan.feign;
+
+import com.yonde.dcs.plan.common.vo.ExtPlanParentVO;
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.feign.shadow.ExtPlanParentServiceFeignShadow;
+
+/**
+* @description: ExtPlanParent-Feign
+* @author: dexadmin
+* @version: V
+* @date: 2024-10-28 17:18:27
+**/
+@Api(tags = "ExtPlanParent-FEIGN")
+@FeignClient(value = "${dcs.feign.INET-PLAN}", path = "/ExtPlanParent")
+public interface ExtPlanParentServiceFeign<V extends ExtPlanParentVO> extends ExtPlanParentServiceFeignShadow<V> {
+
+}

dcs-plan-feign/src/main/java/com/yonde/dcs/plan/feign/shadow/ExtICMExternalInterfacePlanServiceFeignShadow.java

@@ -5,22 +5,20 @@ import io.swagger.annotations.Api;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 import com.yonde.dex.lcycle.plugin.feign.BaseLifecycleManageFeign;
-import com.yonde.dex.dao.service.remotes.BaseFeign;
 import com.yonde.dex.secretcode.plugin.feign.SecretCodeFeign;
+import com.yonde.dcs.plan.feign.ExtPlanParentServiceFeign;
 import com.yonde.dex.version.plugin.feign.BaseVersionFeign;
-
 import org.springframework.web.bind.annotation.*;
 import com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder;
 import com.yonde.dex.context.plugin.feign.ContextPluginFeign;
-import com.yonde.dex.logicdelete.plugin.feign.LogicDeleteFeign;
 
 /**
 * @description: ExtICMExternalInterfacePlan-Feign
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-14 10:04:11
+* @date: 2024-10-28 17:18:22
 **/
-public interface ExtICMExternalInterfacePlanServiceFeignShadow<V extends ExtICMExternalInterfacePlanVO> extends ContextPluginFeign<V> ,BaseLifecycleManageFeign<V> ,BaseFeign<V> ,LogicDeleteFeign<V> ,SecretCodeFeign<V> ,BaseVersionFeign<V> {
+public interface ExtICMExternalInterfacePlanServiceFeignShadow<V extends ExtICMExternalInterfacePlanVO> extends ExtPlanParentServiceFeign<V> ,ContextPluginFeign<V> ,BaseLifecycleManageFeign<V> ,SecretCodeFeign<V> ,BaseVersionFeign<V> {
 
     String BEAN_NAME = "extICMExternalInterfacePlanServiceFeign";
 

dcs-plan-feign/src/main/java/com/yonde/dcs/plan/feign/shadow/ExtIEDPlanServiceFeignShadow.java

 package com.yonde.dcs.plan.feign.shadow;
 
-
 import com.yonde.dcs.plan.common.vo.ExtIEDPlanVO;
-import com.yonde.dex.context.plugin.feign.ContextPluginFeign;
-import com.yonde.dex.dao.service.remotes.BaseFeign;
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
 import com.yonde.dex.lcycle.plugin.feign.BaseLifecycleManageFeign;
-import com.yonde.dex.logicdelete.plugin.feign.LogicDeleteFeign;
 import com.yonde.dex.secretcode.plugin.feign.SecretCodeFeign;
+import com.yonde.dcs.plan.feign.ExtPlanParentServiceFeign;
 import com.yonde.dex.version.plugin.feign.BaseVersionFeign;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder;
+import com.yonde.dex.context.plugin.feign.ContextPluginFeign;
+import com.yonde.dex.logicdelete.plugin.feign.LogicDeleteFeign;
 
 /**
 * @description: ExtIEDPlan-Feign
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-11 15:49:41
+* @date: 2024-10-28 17:18:22
 **/
-public interface ExtIEDPlanServiceFeignShadow<V extends ExtIEDPlanVO> extends ContextPluginFeign<V> ,BaseLifecycleManageFeign<V> ,BaseFeign<V> ,LogicDeleteFeign<V> ,SecretCodeFeign<V> ,BaseVersionFeign<V> {
+public interface ExtIEDPlanServiceFeignShadow<V extends ExtIEDPlanVO> extends ExtPlanParentServiceFeign<V> ,ContextPluginFeign<V> ,BaseLifecycleManageFeign<V> ,LogicDeleteFeign<V> ,SecretCodeFeign<V> ,BaseVersionFeign<V> {
 
     String BEAN_NAME = "extIEDPlanServiceFeign";
 

dcs-plan-feign/src/main/java/com/yonde/dcs/plan/feign/shadow/ExtPlanParentServiceFeignShadow.java

+package com.yonde.dcs.plan.feign.shadow;
+
+import com.yonde.dcs.plan.common.vo.ExtPlanParentVO;
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dex.dao.service.remotes.BaseFeign;
+
+/**
+* @description: ExtPlanParent-Feign
+* @author: dexadmin
+* @version: V
+* @date: 2024-10-28 17:18:27
+**/
+public interface ExtPlanParentServiceFeignShadow<V extends ExtPlanParentVO> extends BaseFeign<V> {
+
+    String BEAN_NAME = "extPlanParentServiceFeign";
+
+}

dcs-plan-feign/src/main/java/com/yonde/dcs/plan/feign/shadow/ExtPlanServiceFeignShadow.java

@@ -6,18 +6,21 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 import com.yonde.dex.tree.plugin.feign.TreePluginFeign;
 import com.yonde.dex.lcycle.plugin.feign.BaseLifecycleManageFeign;
-import com.yonde.dex.dao.service.remotes.BaseFeign;
+import com.yonde.dex.secretcode.plugin.feign.SecretCodeFeign;
+import com.yonde.dcs.plan.feign.ExtPlanParentServiceFeign;
 import com.yonde.dex.version.plugin.feign.BaseVersionFeign;
 import org.springframework.web.bind.annotation.*;
 import com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder;
+import com.yonde.dex.context.plugin.feign.ContextPluginFeign;
+import com.yonde.dex.logicdelete.plugin.feign.LogicDeleteFeign;
 
 /**
 * @description: ExtPlan-Feign
 * @author: dexadmin
 * @version: V
-* @date: 2024-7-26 9:34:06
+* @date: 2024-10-28 17:18:21
 **/
-public interface ExtPlanServiceFeignShadow<V extends ExtPlanVO> extends TreePluginFeign<V> ,BaseLifecycleManageFeign<V> ,BaseFeign<V> ,BaseVersionFeign<V> {
+public interface ExtPlanServiceFeignShadow<V extends ExtPlanVO> extends ExtPlanParentServiceFeign<V> ,ContextPluginFeign<V> ,TreePluginFeign<V> ,BaseLifecycleManageFeign<V> ,LogicDeleteFeign<V> ,BaseVersionFeign<V> ,SecretCodeFeign<V> {
 
     String BEAN_NAME = "extPlanServiceFeign";
 

dcs-plan-feign/src/main/java/com/yonde/dcs/plan/feign/shadow/ExtPuchasePlanAttributeServiceFeignShadow.java

@@ -5,8 +5,8 @@ import io.swagger.annotations.Api;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 import com.yonde.dex.lcycle.plugin.feign.BaseLifecycleManageFeign;
-import com.yonde.dex.dao.service.remotes.BaseFeign;
 import com.yonde.dex.secretcode.plugin.feign.SecretCodeFeign;
+import com.yonde.dcs.plan.feign.ExtPlanParentServiceFeign;
 import com.yonde.dex.version.plugin.feign.BaseVersionFeign;
 import org.springframework.web.bind.annotation.*;
 import com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder;
@@ -17,9 +17,9 @@ import com.yonde.dex.logicdelete.plugin.feign.LogicDeleteFeign;
 * @description: ExtPuchasePlanAttribute-Feign
 * @author: dexadmin
 * @version: V
-* @date: 2024-8-29 17:14:49
+* @date: 2024-10-28 17:18:22
 **/
-public interface ExtPuchasePlanAttributeServiceFeignShadow<V extends ExtPuchasePlanAttributeVO> extends ContextPluginFeign<V> ,BaseLifecycleManageFeign<V> ,BaseFeign<V> ,LogicDeleteFeign<V> ,BaseVersionFeign<V> ,SecretCodeFeign<V> {
+public interface ExtPuchasePlanAttributeServiceFeignShadow<V extends ExtPuchasePlanAttributeVO> extends ExtPlanParentServiceFeign<V> ,ContextPluginFeign<V> ,BaseLifecycleManageFeign<V> ,LogicDeleteFeign<V> ,BaseVersionFeign<V> ,SecretCodeFeign<V> {
 
     String BEAN_NAME = "extPuchasePlanAttributeServiceFeign";