更新版本

dex-basic-service-expand-common/pom.xml

@@ -59,11 +59,11 @@
                 <groupId>com.yonde.dex</groupId>
                 <artifactId>dex-context-plugin-common</artifactId>
             </dependency>
-            <dependency>
-                <groupId>com.yonde.dcs</groupId>
-                <artifactId>dcs-doc-expand-common</artifactId>
-                    <version>4.1-20240919-RELEASE</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>com.yonde.dcs</groupId>-->
+<!--                <artifactId>dcs-doc-expand-common</artifactId>-->
+<!--                    <version>4.1-20240919-RELEASE</version>-->
+<!--            </dependency>-->
     </dependencies>
 
 

dex-basic-service-expand-common/src/main/java/com/yonde/dex/basic/common/vo/ExtProgramProjectLinkVO.java

@@ -43,7 +43,7 @@ import com.yonde.dex.basedata.entity.users.DxUserVO;
 * @description: ExtProgramProjectLink-VO
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 @JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtProgramProjectLinkVO.class)
 @EqualsAndHashCode(callSuper = true)

dex-basic-service-expand-common/src/main/java/com/yonde/dex/basic/common/vo/ExtProgramVO.java

@@ -4,7 +4,6 @@ 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;
@@ -13,22 +12,16 @@ import com.yonde.dex.user.common.vo.DxOrganizationVO;
 import com.yonde.dex.user.common.vo.DxUserInfoVO;
 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;
@@ -51,16 +44,16 @@ import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbedda
 import com.yonde.dex.basedata.entity.users.DxUserVO;
 
 /**
- * @description: ExtProgram-VO
- * @author: dexadmin
- * @version: V
- * @date: 2024-9-11 9:52:59
- **/
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtProgramVO.class)
+* @description: ExtProgram-VO
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-20 10:26:39
+**/
+@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtProgramVO.class)
 @EqualsAndHashCode(callSuper = true)
 @Data
 @ToString(callSuper = true)
-public class ExtProgramVO extends IdOnlyVO implements IdVO, DxLifecycleManageBaseVOHolder, DxObjFileLinkVOHolder, DxSecretVOHolder {
+public class ExtProgramVO extends IdOnlyVO implements IdVO ,DxLifecycleManageBaseVOHolder ,DxObjFileLinkVOHolder ,DxSecretVOHolder{
 
     public static final String DX_OBJ_FILE_LINK_EMBEDDABLE_PROP_NAME = "dxObjFileLinkEmbeddable";
     public static final String DX_LIFECYCLE_MANAGE_BASE_EMBEDDABLE_PROP_NAME = "dxLifecycleManageBaseEmbeddable";
@@ -87,134 +80,134 @@ public class ExtProgramVO extends IdOnlyVO implements IdVO, DxLifecycleManageBas
     public static final String TOTAL_BUDGET_PROP_NAME = "totalBudget";
 
     /**
-     * 扩展VO属性
-     */
+    * 扩展VO属性
+    */
     @DexEmbedded()
     @JsonIgnore
     private DxObjFileLinkVOEmbeddable dxObjFileLinkEmbeddable;
 
     /**
-     * 扩展VO属性
-     */
+    * 扩展VO属性
+    */
     @DexEmbedded()
     @JsonIgnore
     private DxLifecycleManageBaseVOEmbeddable dxLifecycleManageBaseEmbeddable;
 
     /**
-     * dao扩展对象
-     */
+    * dao扩展对象
+    */
     @DexEmbedded()
     @JsonIgnore
     private DxIdVOEmbeddable dxIdEmbeddable;
 
     /**
-     * 扩展VO属性
-     */
+    * 扩展VO属性
+    */
     @DexEmbedded()
     @JsonIgnore
     private DxSecretVOEmbeddable dxSecretEmbeddable;
 
     /**
-     * 外协项目预算总额
-     */
+    * 外协项目预算总额
+    */
     private String budgetAmount;
 
     /**
-     * 客户单位
-     */
+    * 客户单位
+    */
     private String customUnit;
 
     /**
-     * 计划结束时间
-     */
+    * 计划结束时间
+    */
     private LocalDateTime endTime;
 
     /**
-     * 项目群项目关联link集合
-     */
+    * 项目群项目关联link集合
+    */
     @RelationProperty(refProperty = "source")
     @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
     private List<ExtProgramProjectLinkVO> extProgramProjectLinks;
 
     /**
-     * 经费来源
-     */
+    * 经费来源
+    */
     private String fundSource;
 
     /**
-     * 负责人
-     */
+    * 负责人
+    */
     @ReferenceProperty(baseProperty = "headerId")
     @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
     private DxUserInfoVO header;
 
     /**
-     * 负责人
-     */
+    * 负责人
+    */
     private Long headerId;
 
     /**
-     * 负责人
-     */
+    * 负责人
+    */
     private String headerIdType;
 
     /**
-     * 项目主管
-     */
+    * 项目主管
+    */
     @ReferenceProperty(baseProperty = "managerId")
     @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
     private DxUserInfoVO manager;
 
     /**
-     * 项目主管
-     */
+    * 项目主管
+    */
     private Long managerId;
 
     /**
-     * 项目主管
-     */
+    * 项目主管
+    */
     private String managerIdType;
 
     /**
-     * 主管部门
-     */
+    * 主管部门
+    */
     @ReferenceProperty(baseProperty = "managerOrgId")
     @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
     private DxOrganizationVO managerOrg;
 
     /**
-     * 主管部门
-     */
+    * 主管部门
+    */
     private Long managerOrgId;
 
     /**
-     * 主管部门
-     */
+    * 主管部门
+    */
     private String managerOrgIdType;
 
     /**
-     * 项目名称
-     */
+    * 项目名称
+    */
     private String name;
 
     /**
-     * 项目代号
-     */
+    * 项目代号
+    */
     private String number;
 
     /**
-     * 项目类型
-     */
+    * 项目类型
+    */
     private String proType;
 
     /**
-     * 计划开始时间
-     */
+    * 计划开始时间
+    */
     private LocalDateTime startTime;
 
     /**
-     * 总经费
-     */
+    * 总经费
+    */
     private String totalBudget;
 
 }

dex-basic-service-expand-common/src/main/java/com/yonde/dex/basic/expand/entity/DxViewVOExpand.java

@@ -20,7 +20,7 @@ import com.yonde.dex.basic.expand.plugin.DxViewVOPluginExpand;
 * @description: DxView-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 @EqualsAndHashCode
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/basic/expand/plugin/DxViewVOPluginExpand.java

 package com.yonde.dex.basic.expand.plugin;
 import com.yonde.dex.basedata.entity.vo.IdVO;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dex.basic.expand.entity.DxViewVOExpand;
 /**
 * @description: DxView-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 public interface DxViewVOPluginExpand<V extends DxViewVOPluginExpand> {
 

dex-basic-service-expand-common/src/main/java/com/yonde/dex/context/expand/entity/DxContextEnterpriseVOExpand.java

@@ -21,7 +21,7 @@ import com.yonde.dex.context.expand.entity.DxContextVOExpand;
 * @description: DxContextEnterprise-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 @EqualsAndHashCode
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/context/expand/entity/DxContextLibraryVOExpand.java

@@ -21,7 +21,7 @@ import com.yonde.dex.context.expand.entity.DxContextVOExpand;
 * @description: DxContextLibrary-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:23
+* @date: 2024-9-20 10:26:39
 **/
 @EqualsAndHashCode
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/context/expand/entity/DxContextProductionVOExpand.java

@@ -21,7 +21,7 @@ import com.yonde.dex.context.expand.entity.DxContextVOExpand;
 * @description: DxContextProduction-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 @EqualsAndHashCode
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/context/expand/entity/DxContextProjectVOExpand.java

@@ -21,7 +21,7 @@ import com.yonde.dex.context.expand.entity.DxContextVOExpand;
 * @description: DxContextProject-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 @EqualsAndHashCode
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/context/expand/entity/DxContextTeamMemberVOExpand.java

@@ -20,7 +20,7 @@ import com.yonde.dex.context.expand.plugin.DxContextTeamMemberVOPluginExpand;
 * @description: DxContextTeamMember-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:23
+* @date: 2024-9-20 10:26:38
 **/
 @EqualsAndHashCode
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/context/expand/entity/DxContextTeamVOExpand.java

@@ -20,7 +20,7 @@ import com.yonde.dex.context.expand.plugin.DxContextTeamVOPluginExpand;
 * @description: DxContextTeam-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:23
+* @date: 2024-9-20 10:26:38
 **/
 @EqualsAndHashCode
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/context/expand/entity/DxContextVOExpand.java

@@ -5,38 +5,32 @@ import com.yonde.dex.user.common.vo.DxUserInfoVO;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
-
 import java.io.Serializable;
 import java.math.BigInteger;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
-
 import java.util.Date;
-
 import com.yonde.dex.basedata.entity.annotation.*;
 import com.yonde.dex.basedata.entity.data.VersionRelationType;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.TypeReference;
-
 import java.util.List;
-
 import com.yonde.dex.context.expand.plugin.DxContextVOPluginExpand;
 import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOEmbeddable;
 import com.yonde.dex.basic.common.vo.ExtProgramProjectLinkVO;
 import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbeddable;
 
 /**
- * @description: DxContext-VOExpand扩展实体
- * @author: dexadmin
- * @version: V
- * @date: 2024-9-9 11:04:23
- **/
+* @description: DxContext-VOExpand扩展实体
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-20 10:26:39
+**/
 @EqualsAndHashCode
 @Data
 @ToString(callSuper = true)
-public class DxContextVOExpand<V extends DxContextVOPluginExpand> implements Serializable {
+public class DxContextVOExpand<V extends DxContextVOPluginExpand> implements Serializable{
     public static final String DX_OBJ_FILE_LINK_EMBEDDABLE_PROP_NAME = "dxObjFileLinkEmbeddable";
     public static final String DX_SECRET_EMBEDDABLE_PROP_NAME = "dxSecretEmbeddable";
     public static final String BUDGET_AMOUNT_PROP_NAME = "budgetAmount";
@@ -59,115 +53,115 @@ public class DxContextVOExpand<V extends DxContextVOPluginExpand> implements Ser
     public static final String TOTAL_BUDGET_PROP_NAME = "totalBudget";
 
     /**
-     * 扩展VO属性
-     */
+    * 扩展VO属性
+    */
     @DexEmbedded()
     @JsonIgnore
     private DxObjFileLinkVOEmbeddable dxObjFileLinkEmbeddable;
 
     /**
-     * 扩展VO属性
-     */
+    * 扩展VO属性
+    */
     @DexEmbedded()
     @JsonIgnore
     private DxSecretVOEmbeddable dxSecretEmbeddable;
 
     /**
-     * 外协项目预算总额
-     */
+    * 外协项目预算总额
+    */
     private Integer budgetAmount;
 
     /**
-     * 客户单位
-     */
+    * 客户单位
+    */
     private String customUnit;
 
     /**
-     * 计划结束时间
-     */
+    * 计划结束时间
+    */
     private LocalDateTime endTime;
 
     /**
-     * 项目群项目关联link集合
-     */
+    * 项目群项目关联link集合
+    */
     @RelationProperty(refProperty = "target")
     @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
     private List<ExtProgramProjectLinkVO> extProgramProjectLinks;
 
     /**
-     * 经费来源
-     */
+    * 经费来源
+    */
     private String fundSource;
 
     /**
-     * 负责人
-     */
+    * 负责人
+    */
     @ReferenceProperty(baseProperty = "headerId")
     @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
     private DxUserInfoVO header;
 
     /**
-     * 负责人
-     */
+    * 负责人
+    */
     private Long headerId;
 
     /**
-     * 负责人
-     */
+    * 负责人
+    */
     private String headerIdType;
 
     /**
-     * 项目主管
-     */
+    * 项目主管
+    */
     @ReferenceProperty(baseProperty = "managerId")
     @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
     private DxUserInfoVO manager;
 
     /**
-     * 项目主管
-     */
+    * 项目主管
+    */
     private Long managerId;
 
     /**
-     * 项目主管
-     */
+    * 项目主管
+    */
     private String managerIdType;
 
     /**
-     * 主管部门
-     */
+    * 主管部门
+    */
     @ReferenceProperty(baseProperty = "managerOrgId")
     @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
     private DxOrganizationVO managerOrg;
 
     /**
-     * 主管部门
-     */
+    * 主管部门
+    */
     private Long managerOrgId;
 
     /**
-     * 主管部门
-     */
+    * 主管部门
+    */
     private String managerOrgIdType;
 
     /**
-     * 项目代号
-     */
+    * 项目代号
+    */
     private String number;
 
     /**
-     * 项目类型
-     */
+    * 项目类型
+    */
     private String proType;
 
     /**
-     * 计划开始时间
-     */
+    * 计划开始时间
+    */
     private LocalDateTime startTime;
 
     /**
-     * 总经费
-     */
+    * 总经费
+    */
     private String totalBudget;
 
 }

dex-basic-service-expand-common/src/main/java/com/yonde/dex/context/expand/plugin/DxContextEnterpriseVOPluginExpand.java

 package com.yonde.dex.context.expand.plugin;
 import com.yonde.dex.basedata.entity.vo.IdVO;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dex.context.expand.entity.DxContextEnterpriseVOExpand;
 import com.yonde.dex.context.expand.plugin.DxContextVOPluginExpand;
 /**
 * @description: DxContextEnterprise-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 public interface DxContextEnterpriseVOPluginExpand<V extends DxContextEnterpriseVOPluginExpand> {
 

dex-basic-service-expand-common/src/main/java/com/yonde/dex/context/expand/plugin/DxContextLibraryVOPluginExpand.java

 package com.yonde.dex.context.expand.plugin;
 import com.yonde.dex.basedata.entity.vo.IdVO;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dex.context.expand.entity.DxContextLibraryVOExpand;
 import com.yonde.dex.context.expand.plugin.DxContextVOPluginExpand;
 /**
 * @description: DxContextLibrary-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:23
+* @date: 2024-9-20 10:26:39
 **/
 public interface DxContextLibraryVOPluginExpand<V extends DxContextLibraryVOPluginExpand> {
 

dex-basic-service-expand-common/src/main/java/com/yonde/dex/context/expand/plugin/DxContextProductionVOPluginExpand.java

 package com.yonde.dex.context.expand.plugin;
 import com.yonde.dex.basedata.entity.vo.IdVO;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dex.context.expand.entity.DxContextProductionVOExpand;
 import com.yonde.dex.context.expand.plugin.DxContextVOPluginExpand;
 /**
 * @description: DxContextProduction-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 public interface DxContextProductionVOPluginExpand<V extends DxContextProductionVOPluginExpand> {
 

dex-basic-service-expand-common/src/main/java/com/yonde/dex/context/expand/plugin/DxContextProjectVOPluginExpand.java

 package com.yonde.dex.context.expand.plugin;
 import com.yonde.dex.basedata.entity.vo.IdVO;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dex.context.expand.entity.DxContextProjectVOExpand;
 import com.yonde.dex.context.expand.plugin.DxContextVOPluginExpand;
 /**
 * @description: DxContextProject-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 public interface DxContextProjectVOPluginExpand<V extends DxContextProjectVOPluginExpand> {
 

dex-basic-service-expand-common/src/main/java/com/yonde/dex/context/expand/plugin/DxContextTeamMemberVOPluginExpand.java

 package com.yonde.dex.context.expand.plugin;
 import com.yonde.dex.basedata.entity.vo.IdVO;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dex.context.expand.entity.DxContextTeamMemberVOExpand;
 /**
 * @description: DxContextTeamMember-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:23
+* @date: 2024-9-20 10:26:38
 **/
 public interface DxContextTeamMemberVOPluginExpand<V extends DxContextTeamMemberVOPluginExpand> {
 

dex-basic-service-expand-common/src/main/java/com/yonde/dex/context/expand/plugin/DxContextTeamVOPluginExpand.java

 package com.yonde.dex.context.expand.plugin;
 import com.yonde.dex.basedata.entity.vo.IdVO;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dex.context.expand.entity.DxContextTeamVOExpand;
 /**
 * @description: DxContextTeam-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:23
+* @date: 2024-9-20 10:26:38
 **/
 public interface DxContextTeamVOPluginExpand<V extends DxContextTeamVOPluginExpand> {
 

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/entity/DxGroupLinkVOExpand.java

@@ -20,7 +20,7 @@ import com.yonde.dex.user.expand.plugin.DxGroupLinkVOPluginExpand;
 * @description: DxGroupLink-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 @EqualsAndHashCode
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/entity/DxGroupMemberLinkVOExpand.java

@@ -20,7 +20,7 @@ import com.yonde.dex.user.expand.plugin.DxGroupMemberLinkVOPluginExpand;
 * @description: DxGroupMemberLink-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 @EqualsAndHashCode
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/entity/DxGroupVOExpand.java

@@ -21,7 +21,7 @@ import com.yonde.dex.user.expand.entity.DxPrincipalVOExpand;
 * @description: DxGroup-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:23
+* @date: 2024-9-20 10:26:38
 **/
 @EqualsAndHashCode
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/entity/DxOrganizationGroupLinkVOExpand.java

@@ -20,7 +20,7 @@ import com.yonde.dex.user.expand.plugin.DxOrganizationGroupLinkVOPluginExpand;
 * @description: DxOrganizationGroupLink-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 @EqualsAndHashCode
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/entity/DxOrganizationVOExpand.java

@@ -21,7 +21,7 @@ import com.yonde.dex.user.expand.entity.DxPrincipalVOExpand;
 * @description: DxOrganization-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:23
+* @date: 2024-9-20 10:26:38
 **/
 @EqualsAndHashCode
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/entity/DxPostMemberLinkVOExpand.java

@@ -20,7 +20,7 @@ import com.yonde.dex.user.expand.plugin.DxPostMemberLinkVOPluginExpand;
 * @description: DxPostMemberLink-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 @EqualsAndHashCode
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/entity/DxPostVOExpand.java

@@ -20,7 +20,7 @@ import com.yonde.dex.user.expand.plugin.DxPostVOPluginExpand;
 * @description: DxPost-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 @EqualsAndHashCode
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/entity/DxPrincipalLinkVOExpand.java

@@ -20,7 +20,7 @@ import com.yonde.dex.user.expand.plugin.DxPrincipalLinkVOPluginExpand;
 * @description: DxPrincipalLink-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:23
+* @date: 2024-9-20 10:26:38
 **/
 @EqualsAndHashCode
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/entity/DxPrincipalVOExpand.java

@@ -20,7 +20,7 @@ import com.yonde.dex.user.expand.plugin.DxPrincipalVOPluginExpand;
 * @description: DxPrincipal-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 @EqualsAndHashCode
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/entity/DxUserInfoVOExpand.java

@@ -21,7 +21,7 @@ import com.yonde.dex.user.expand.entity.DxPrincipalVOExpand;
 * @description: DxUserInfo-VOExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 @EqualsAndHashCode
 @Data

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/plugin/DxGroupLinkVOPluginExpand.java

 package com.yonde.dex.user.expand.plugin;
 import com.yonde.dex.basedata.entity.vo.IdVO;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dex.user.expand.entity.DxGroupLinkVOExpand;
 /**
 * @description: DxGroupLink-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 public interface DxGroupLinkVOPluginExpand<V extends DxGroupLinkVOPluginExpand> {
 

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/plugin/DxGroupMemberLinkVOPluginExpand.java

 package com.yonde.dex.user.expand.plugin;
 import com.yonde.dex.basedata.entity.vo.IdVO;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dex.user.expand.entity.DxGroupMemberLinkVOExpand;
 /**
 * @description: DxGroupMemberLink-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 public interface DxGroupMemberLinkVOPluginExpand<V extends DxGroupMemberLinkVOPluginExpand> {
 

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/plugin/DxGroupVOPluginExpand.java

 package com.yonde.dex.user.expand.plugin;
 import com.yonde.dex.basedata.entity.vo.IdVO;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dex.user.expand.entity.DxGroupVOExpand;
 import com.yonde.dex.user.expand.plugin.DxPrincipalVOPluginExpand;
 /**
 * @description: DxGroup-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:23
+* @date: 2024-9-20 10:26:38
 **/
 public interface DxGroupVOPluginExpand<V extends DxGroupVOPluginExpand> {
 

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/plugin/DxOrganizationGroupLinkVOPluginExpand.java

 package com.yonde.dex.user.expand.plugin;
 import com.yonde.dex.basedata.entity.vo.IdVO;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dex.user.expand.entity.DxOrganizationGroupLinkVOExpand;
 /**
 * @description: DxOrganizationGroupLink-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 public interface DxOrganizationGroupLinkVOPluginExpand<V extends DxOrganizationGroupLinkVOPluginExpand> {
 

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/plugin/DxOrganizationVOPluginExpand.java

 package com.yonde.dex.user.expand.plugin;
 import com.yonde.dex.basedata.entity.vo.IdVO;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dex.user.expand.entity.DxOrganizationVOExpand;
 import com.yonde.dex.user.expand.plugin.DxPrincipalVOPluginExpand;
 /**
 * @description: DxOrganization-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:23
+* @date: 2024-9-20 10:26:38
 **/
 public interface DxOrganizationVOPluginExpand<V extends DxOrganizationVOPluginExpand> {
 

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/plugin/DxPostMemberLinkVOPluginExpand.java

 package com.yonde.dex.user.expand.plugin;
 import com.yonde.dex.basedata.entity.vo.IdVO;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dex.user.expand.entity.DxPostMemberLinkVOExpand;
 /**
 * @description: DxPostMemberLink-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 public interface DxPostMemberLinkVOPluginExpand<V extends DxPostMemberLinkVOPluginExpand> {
 

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/plugin/DxPostVOPluginExpand.java

 package com.yonde.dex.user.expand.plugin;
 import com.yonde.dex.basedata.entity.vo.IdVO;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dex.user.expand.entity.DxPostVOExpand;
 /**
 * @description: DxPost-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 public interface DxPostVOPluginExpand<V extends DxPostVOPluginExpand> {
 

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/plugin/DxPrincipalLinkVOPluginExpand.java

 package com.yonde.dex.user.expand.plugin;
 import com.yonde.dex.basedata.entity.vo.IdVO;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dex.user.expand.entity.DxPrincipalLinkVOExpand;
 /**
 * @description: DxPrincipalLink-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:23
+* @date: 2024-9-20 10:26:38
 **/
 public interface DxPrincipalLinkVOPluginExpand<V extends DxPrincipalLinkVOPluginExpand> {
 

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/plugin/DxPrincipalVOPluginExpand.java

 package com.yonde.dex.user.expand.plugin;
 import com.yonde.dex.basedata.entity.vo.IdVO;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dex.user.expand.entity.DxPrincipalVOExpand;
 /**
 * @description: DxPrincipal-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 public interface DxPrincipalVOPluginExpand<V extends DxPrincipalVOPluginExpand> {
 

dex-basic-service-expand-common/src/main/java/com/yonde/dex/user/expand/plugin/DxUserInfoVOPluginExpand.java

 package com.yonde.dex.user.expand.plugin;
 import com.yonde.dex.basedata.entity.vo.IdVO;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dex.user.expand.entity.DxUserInfoVOExpand;
 import com.yonde.dex.user.expand.plugin.DxPrincipalVOPluginExpand;
 /**
 * @description: DxUserInfo-扩展VO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 public interface DxUserInfoVOPluginExpand<V extends DxUserInfoVOPluginExpand> {
 

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/config/DexBasicServiceAppServiceConfig.java

@@ -10,7 +10,7 @@ import com.yonde.dex.context.core.service.ContextService;
 
 /**
 * @description: dex-bmodel-core-CONFIG
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 @Component
 public class DexBasicServiceAppServiceConfig extends AbstractDexAppServiceReplacer {

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/controller/ExtProgramController.java

 package com.yonde.dex.basic.core.controller;
 
-import com.yonde.dex.basedata.auth.annos.PermissionObject;
-import com.yonde.dex.basedata.auth.annos.SubPermission;
 import com.yonde.dex.basedata.data.search.SearchQueryCondition;
 import org.springframework.stereotype.Controller;
 import io.swagger.annotations.ApiOperation;
@@ -26,7 +24,7 @@ import org.springframework.stereotype.Controller;
  * @description: ExtProgram-Controller
  * @author: dexadmin
  * @version: V
- * @date: 2024-9-9 11:04:24
+ * @date: 2024-9-20 10:26:39
  **/
 @Api(tags = "ExtProgram管理服务")
 @RequestMapping("/ExtProgram")
@@ -34,7 +32,7 @@ import org.springframework.stereotype.Controller;
 @Controller(ExtProgramController.BEAN_NAME)
 public class ExtProgramController<V extends ExtProgramVO, S extends ExtProgramService<V>> extends ExtProgramControllerShadow<V, S> {
 
-    @ApiOperation("项目群查询")
+
     @PostMapping({"/search/props"})
     public ApiResult searchProps(@RequestBody SearchQueryCondition searchQueryCondition) {
         return ApiResult.ok(this.getService().searchProps(searchQueryCondition));

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/controller/ExtProgramProjectLinkController.java

@@ -19,7 +19,7 @@ import org.springframework.stereotype.Controller;
 * @description: ExtProgramProjectLink-Controller
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 @Api(tags = "ExtProgramProjectLink管理服务")
 @RequestMapping("/ExtProgramProjectLink")

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/controller/expand/ExtDxContextController.java

@@ -19,7 +19,7 @@ import com.yonde.dex.context.core.controller.ContextController;
 * @description: DxContext-Controller
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:23
+* @date: 2024-9-20 10:26:39
 **/
 @Api(tags = "DxContext管理服务")
 @RequestMapping("/DxContext")

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/controller/expand/shadow/ExtDxContextControllerShadow.java

@@ -19,7 +19,7 @@ import com.yonde.dex.dfs.objfilelink.plugin.core.controller.DxObjFileLinkControl
 * @description: DxContext-Controller
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:23
+* @date: 2024-9-20 10:26:39
 **/
 public class ExtDxContextControllerShadow<V extends DxContextVO, S extends ExtDxContextService<V>> extends ContextController<V, S> implements DxObjFileLinkController<V, S>{
 

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/controller/shadow/ExtProgramControllerShadow.java

@@ -20,7 +20,7 @@ import com.yonde.dex.baseweb.AbstractBaseController;
 * @description: ExtProgram-Controller
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 public class ExtProgramControllerShadow<V extends ExtProgramVO, S extends ExtProgramService<V>> implements AbstractBaseController<V, S> ,AbstractLifecycleBaseController<V, S> ,DxObjFileLinkController<V, S>{
 

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/controller/shadow/ExtProgramProjectLinkControllerShadow.java

@@ -19,7 +19,7 @@ import com.yonde.dex.baseweb.AbstractBaseController;
 * @description: ExtProgramProjectLink-Controller
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 public class ExtProgramProjectLinkControllerShadow<V extends ExtProgramProjectLinkVO, S extends ExtProgramProjectLinkService<V>> implements AbstractBaseController<V, S> ,DxLinkDataController<V, S>{
 

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/repository/ExtProgramProjectLinkRepository.java

@@ -6,7 +6,7 @@ import com.yonde.dex.basic.core.repository.shadow.ExtProgramProjectLinkRepositor
 * @description: ExtProgramProjectLink-repository
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 public interface ExtProgramProjectLinkRepository<P extends ExtProgramProjectLink> extends ExtProgramProjectLinkRepositoryShadow<P> {
 }

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/repository/ExtProgramRepository.java

@@ -6,7 +6,7 @@ import com.yonde.dex.basic.core.repository.shadow.ExtProgramRepositoryShadow;
 * @description: ExtProgram-repository
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 public interface ExtProgramRepository<P extends ExtProgram> extends ExtProgramRepositoryShadow<P> {
 }

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/repository/shadow/ExtProgramProjectLinkRepositoryShadow.java

@@ -9,7 +9,7 @@ import com.yonde.dex.linkdata.plugin.core.repository.DxLinkDataRepository;
 * @description: ExtProgramProjectLink-repository
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 @NoRepositoryBean
 public interface ExtProgramProjectLinkRepositoryShadow<P extends ExtProgramProjectLink> extends BaseRepository<P> ,DxLogicDeleteRepository<P> ,DxLinkDataRepository<P> {

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/repository/shadow/ExtProgramRepositoryShadow.java

@@ -10,7 +10,7 @@ import com.yonde.dex.dfs.objfilelink.plugin.core.repository.DxObjFileLinkPluginR
 * @description: ExtProgram-repository
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 @NoRepositoryBean
 public interface ExtProgramRepositoryShadow<P extends ExtProgram> extends DxObjFileLinkPluginRepository<P> ,DxLifecycleManageBaseRepository<P> ,BaseRepository<P> ,DxSecretCodePluginRepository<P> {

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/service/ExtProgramProjectLinkService.java

@@ -6,7 +6,7 @@ import com.yonde.dex.basic.core.service.shadow.ExtProgramProjectLinkServiceShado
 * @description: ExtProgramProjectLink-service
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 public interface ExtProgramProjectLinkService<V extends ExtProgramProjectLinkVO> extends ExtProgramProjectLinkServiceShadow<V> {
 

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/service/ExtProgramService.java

@@ -9,11 +9,10 @@ import org.springframework.data.domain.Page;
 * @description: ExtProgram-service
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 public interface ExtProgramService<V extends ExtProgramVO> extends ExtProgramServiceShadow<V> {
 
-
     /**
      * @description: 项目群查询展开
      * @param: [searchQueryCondition]

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/service/expand/ExtDxContextService.java

@@ -6,7 +6,7 @@ import com.yonde.dex.basic.core.service.expand.shadow.ExtDxContextServiceShadow;
 * @description: DxContext-service
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:23
+* @date: 2024-9-20 10:26:39
 **/
 public interface ExtDxContextService<V extends DxContextVO> extends ExtDxContextServiceShadow<V> {
 

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/service/expand/shadow/ExtDxContextServiceShadow.java

@@ -9,7 +9,7 @@ import com.yonde.dex.dfs.objfilelink.plugin.core.service.ObjFileLinkPluginServic
 * @description: DxContext-service
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:23
+* @date: 2024-9-20 10:26:39
 **/
 public interface ExtDxContextServiceShadow<V extends DxContextVO> extends ExtDxContextServiceFeign<V>, ContextService<V> ,ObjFileLinkPluginService<V> ,SecretCodePluginService<V> {
 

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/service/impl/ExtProgramProjectLinkServiceImpl.java

@@ -17,7 +17,7 @@ import javax.annotation.Resource;
 * @description: ExtProgramProjectLink-ServiceImpl
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 @Slf4j
 @Service(ExtProgramProjectLinkServiceImpl.BEAN_NAME)

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/service/impl/ExtProgramServiceImpl.java

 package com.yonde.dex.basic.core.service.impl;
 
-import cn.hutool.core.collection.CollectionUtil;
 import com.yonde.dex.basedata.data.search.SearchItem;
-import com.yonde.dex.basedata.data.search.SearchQueryBuilder;
 import com.yonde.dex.basedata.data.search.SearchQueryCondition;
-import com.yonde.dex.basedata.entity.data.DxPageImpl;
 import com.yonde.dex.basic.common.vo.ExtProgramProjectLinkVO;
 import com.yonde.dex.basic.core.service.ExtProgramProjectLinkService;
 import com.yonde.dex.basic.core.service.expand.ExtDxContextService;
 import com.yonde.dex.basic.core.util.SearchUtil;
 import com.yonde.dex.context.common.vo.DxContextProjectVO;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
 import org.springframework.stereotype.Service;
 import io.swagger.annotations.ApiOperation;
-
 import java.util.List;
-
 import com.yonde.dex.basic.common.vo.ExtProgramVO;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,18 +18,19 @@ import org.springframework.web.bind.annotation.*;
 import com.yonde.dex.basic.core.service.ExtProgramService;
 import com.yonde.dex.basic.core.repository.ExtProgramRepository;
 import com.yonde.dex.basic.entity.po.ExtProgram;
-
 import javax.annotation.Resource;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
 
 /**
- * @description: ExtProgram-ServiceImpl
- * @author: dexadmin
- * @version: V
- * @date: 2024-9-9 11:04:24
- **/
+* @description: ExtProgram-ServiceImpl
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-20 10:26:39
+**/
 @Slf4j
 @Service(ExtProgramServiceImpl.BEAN_NAME)
-public class ExtProgramServiceImpl<V extends ExtProgramVO> implements ExtProgramService<V> {
+public class ExtProgramServiceImpl<V extends ExtProgramVO> implements ExtProgramService<V>{
 
 
     public static final String BEAN_NAME = "extProgramServiceImpl";
@@ -44,16 +38,13 @@ public class ExtProgramServiceImpl<V extends ExtProgramVO> implements ExtProgram
     @Autowired
     ExtProgramRepository<ExtProgram> extProgramRepository;
 
+
     @Autowired
     ExtProgramProjectLinkService extProgramProjectLinkService;
 
     @Autowired
     ExtDxContextService extDxContextService;
 
-    public void test() {
-        this.findRecursion(new SearchQueryCondition());
-    }
-
     @Override
     public Page<V> searchProps(SearchQueryCondition searchQueryCondition) {
         Page<V> page = search(searchQueryCondition);
@@ -73,6 +64,7 @@ public class ExtProgramServiceImpl<V extends ExtProgramVO> implements ExtProgram
 //        Page<V> result = new PageImpl<>(page.getContent(), page.getPageable(), page.getTotalElements());
         return page;
     }
+
 }
 
 

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/service/impl/expand/ExtDxContextServiceImpl.java

@@ -18,7 +18,7 @@ import com.yonde.dex.context.core.service.impl.ContextServiceImpl;
 * @description: DxContext-ServiceImpl
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:23
+* @date: 2024-9-20 10:26:39
 **/
 @Slf4j
 @Service(ContextServiceImpl.BEAN_NAME)

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/service/shadow/ExtProgramProjectLinkServiceShadow.java

@@ -9,7 +9,7 @@ import com.yonde.dex.logicdelete.plugin.core.service.LogicDeleteService;
 * @description: ExtProgramProjectLink-service
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 public interface ExtProgramProjectLinkServiceShadow<V extends ExtProgramProjectLinkVO> extends ExtProgramProjectLinkServiceFeign<V>, BaseIdEntityService<V> ,LogicDeleteService<V> ,DxLinkDataService<V> {
 

dex-basic-service-expand-core/src/main/java/com/yonde/dex/basic/core/service/shadow/ExtProgramServiceShadow.java

@@ -10,7 +10,7 @@ import com.yonde.dex.dfs.objfilelink.plugin.core.service.ObjFileLinkPluginServic
 * @description: ExtProgram-service
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 public interface ExtProgramServiceShadow<V extends ExtProgramVO> extends ExtProgramServiceFeign<V>, ObjFileLinkPluginService<V> ,LifecycleBaseService<V> ,BaseIdEntityService<V> ,SecretCodePluginService<V> {
 

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/basic/entity/po/ExtProgram.java

 package com.yonde.dex.basic.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.lcycle.plugin.entities.DxLifecycleManageBaseEmbeddable;
 import com.yonde.dex.dao.entity.base.IdEntity;
-
 import javax.persistence.Column;
-
 import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkHolder;
 import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkEmbeddable;
 import com.yonde.dex.secretcode.plugin.entities.DxSecretHolder;
@@ -44,101 +34,101 @@ import com.yonde.dex.secretcode.plugin.entities.DxSecretEmbeddable;
 import com.yonde.dex.dao.entity.base.IdOnlyEntity;
 
 /**
- * @description: ExtProgram-PO实体
- * @author: dexadmin
- * @version: V
- * @date: 2024-9-11 9:52:59
- **/
+* @description: ExtProgram-PO实体
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-20 10:26:39
+**/
 @Entity
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @Data
 @Table(name = "EXT_PROGRAM")
-public class ExtProgram extends IdOnlyEntity implements DxObjFileLinkHolder, DxLifecycleManageBaseHolder, IdEntity, DxSecretHolder {
+public class ExtProgram extends IdOnlyEntity implements DxObjFileLinkHolder ,DxLifecycleManageBaseHolder ,IdEntity ,DxSecretHolder{
 
     /**
-     * 扩展PO属性
-     */
+    * 扩展PO属性
+    */
     @DexEmbedded()
     @Embedded()
     private DxObjFileLinkEmbeddable dxObjFileLinkEmbeddable;
     /**
-     * 扩展PO属性
-     */
+    * 扩展PO属性
+    */
     @DexEmbedded()
     @Embedded()
     private DxLifecycleManageBaseEmbeddable dxLifecycleManageBaseEmbeddable;
     /**
-     * dao扩展对象
-     */
+    * dao扩展对象
+    */
     @DexEmbedded()
     @Embedded()
     private DxIdEntityEmbeddable dxIdEmbeddable;
     /**
-     * 扩展PO属性
-     */
+    * 扩展PO属性
+    */
     @DexEmbedded()
     @Embedded()
     private DxSecretEmbeddable dxSecretEmbeddable;
     /**
-     * 外协项目预算总额
-     */
+    * 外协项目预算总额
+    */
     private String budgetAmount;
     /**
-     * 客户单位
-     */
+    * 客户单位
+    */
     private String customUnit;
     /**
-     * 计划结束时间
-     */
+    * 计划结束时间
+    */
     private LocalDateTime endTime;
     /**
-     * 经费来源
-     */
+    * 经费来源
+    */
     private String fundSource;
     /**
-     * 负责人的id
-     */
+    * 负责人的id
+    */
     private Long headerId;
     /**
-     * 负责人的类型
-     */
+    * 负责人的类型
+    */
     private String headerIdType;
     /**
-     * 项目主管的id
-     */
+    * 项目主管的id
+    */
     private Long managerId;
     /**
-     * 项目主管的类型
-     */
+    * 项目主管的类型
+    */
     private String managerIdType;
     /**
-     * 主管部门的id
-     */
+    * 主管部门的id
+    */
     private Long managerOrgId;
     /**
-     * 主管部门的类型
-     */
+    * 主管部门的类型
+    */
     private String managerOrgIdType;
     /**
-     * 项目名称
-     */
+    * 项目名称
+    */
     private String name;
     /**
-     * 项目代号
-     */
+    * 项目代号
+    */
     private String number;
     /**
-     * 项目类型
-     */
+    * 项目类型
+    */
     private String proType;
     /**
-     * 计划开始时间
-     */
+    * 计划开始时间
+    */
     private LocalDateTime startTime;
     /**
-     * 总经费
-     */
+    * 总经费
+    */
     private String totalBudget;
 }
 

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/basic/entity/po/ExtProgramProjectLink.java

@@ -35,7 +35,7 @@ import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteEmbeddable;
 * @description: ExtProgramProjectLink-PO实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 @Entity
 @EqualsAndHashCode(callSuper = true)

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/basic/expand/entity/DxViewExpand.java

@@ -17,7 +17,7 @@ import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
 * @description: DxView-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/basic/expand/plugin/DxViewPluginExpand.java

 package com.yonde.dex.basic.expand.plugin;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dex.basic.expand.entity.DxViewExpand;
 /**
 * @description: DxView-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 public interface DxViewPluginExpand {
 

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/context/expand/entity/DxContextEnterpriseExpand.java

@@ -18,7 +18,7 @@ import com.yonde.dex.context.expand.entity.DxContextExpand;
 * @description: DxContextEnterprise-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/context/expand/entity/DxContextExpand.java

@@ -19,7 +19,7 @@ import com.yonde.dex.secretcode.plugin.entities.DxSecretEmbeddable;
 * @description: DxContext-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:23
+* @date: 2024-9-20 10:26:39
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/context/expand/entity/DxContextLibraryExpand.java

@@ -18,7 +18,7 @@ import com.yonde.dex.context.expand.entity.DxContextExpand;
 * @description: DxContextLibrary-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:23
+* @date: 2024-9-20 10:26:38
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/context/expand/entity/DxContextProductionExpand.java

@@ -18,7 +18,7 @@ import com.yonde.dex.context.expand.entity.DxContextExpand;
 * @description: DxContextProduction-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/context/expand/entity/DxContextProjectExpand.java

@@ -18,7 +18,7 @@ import com.yonde.dex.context.expand.entity.DxContextExpand;
 * @description: DxContextProject-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/context/expand/entity/DxContextTeamExpand.java

@@ -17,7 +17,7 @@ import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
 * @description: DxContextTeam-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:23
+* @date: 2024-9-20 10:26:38
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/context/expand/entity/DxContextTeamMemberExpand.java

@@ -17,7 +17,7 @@ import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
 * @description: DxContextTeamMember-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:23
+* @date: 2024-9-20 10:26:38
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/context/expand/plugin/DxContextEnterprisePluginExpand.java

 package com.yonde.dex.context.expand.plugin;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dex.context.expand.entity.DxContextEnterpriseExpand;
 import com.yonde.dex.context.expand.plugin.DxContextPluginExpand;
 /**
 * @description: DxContextEnterprise-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 public interface DxContextEnterprisePluginExpand {
 

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/context/expand/plugin/DxContextLibraryPluginExpand.java

 package com.yonde.dex.context.expand.plugin;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dex.context.expand.entity.DxContextLibraryExpand;
 import com.yonde.dex.context.expand.plugin.DxContextPluginExpand;
 /**
 * @description: DxContextLibrary-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:23
+* @date: 2024-9-20 10:26:38
 **/
 public interface DxContextLibraryPluginExpand {
 

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/context/expand/plugin/DxContextProductionPluginExpand.java

 package com.yonde.dex.context.expand.plugin;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dex.context.expand.entity.DxContextProductionExpand;
 import com.yonde.dex.context.expand.plugin.DxContextPluginExpand;
 /**
 * @description: DxContextProduction-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 public interface DxContextProductionPluginExpand {
 

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/context/expand/plugin/DxContextProjectPluginExpand.java

 package com.yonde.dex.context.expand.plugin;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dex.context.expand.entity.DxContextProjectExpand;
 import com.yonde.dex.context.expand.plugin.DxContextPluginExpand;
 /**
 * @description: DxContextProject-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 public interface DxContextProjectPluginExpand {
 

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/context/expand/plugin/DxContextTeamMemberPluginExpand.java

 package com.yonde.dex.context.expand.plugin;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dex.context.expand.entity.DxContextTeamMemberExpand;
 /**
 * @description: DxContextTeamMember-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:23
+* @date: 2024-9-20 10:26:38
 **/
 public interface DxContextTeamMemberPluginExpand {
 

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/context/expand/plugin/DxContextTeamPluginExpand.java

 package com.yonde.dex.context.expand.plugin;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dex.context.expand.entity.DxContextTeamExpand;
 /**
 * @description: DxContextTeam-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:23
+* @date: 2024-9-20 10:26:38
 **/
 public interface DxContextTeamPluginExpand {
 

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/entity/DxGroupExpand.java

@@ -18,7 +18,7 @@ import com.yonde.dex.user.expand.entity.DxPrincipalExpand;
 * @description: DxGroup-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:23
+* @date: 2024-9-20 10:26:38
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/entity/DxGroupLinkExpand.java

@@ -17,7 +17,7 @@ import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
 * @description: DxGroupLink-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/entity/DxGroupMemberLinkExpand.java

@@ -17,7 +17,7 @@ import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
 * @description: DxGroupMemberLink-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/entity/DxOrganizationExpand.java

@@ -18,7 +18,7 @@ import com.yonde.dex.user.expand.entity.DxPrincipalExpand;
 * @description: DxOrganization-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:23
+* @date: 2024-9-20 10:26:38
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/entity/DxOrganizationGroupLinkExpand.java

@@ -17,7 +17,7 @@ import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
 * @description: DxOrganizationGroupLink-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/entity/DxPostExpand.java

@@ -17,7 +17,7 @@ import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
 * @description: DxPost-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/entity/DxPostMemberLinkExpand.java

@@ -17,7 +17,7 @@ import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
 * @description: DxPostMemberLink-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/entity/DxPrincipalExpand.java

@@ -17,7 +17,7 @@ import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
 * @description: DxPrincipal-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/entity/DxPrincipalLinkExpand.java

@@ -17,7 +17,7 @@ import com.yonde.dex.basedata.entity.annotation.DexEmbedded;
 * @description: DxPrincipalLink-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:23
+* @date: 2024-9-20 10:26:38
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/entity/DxUserInfoExpand.java

@@ -18,7 +18,7 @@ import com.yonde.dex.user.expand.entity.DxPrincipalExpand;
 * @description: DxUserInfo-POExpand扩展实体
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 @ToString
 @Embeddable

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/plugin/DxGroupLinkPluginExpand.java

 package com.yonde.dex.user.expand.plugin;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dex.user.expand.entity.DxGroupLinkExpand;
 /**
 * @description: DxGroupLink-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 public interface DxGroupLinkPluginExpand {
 

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/plugin/DxGroupMemberLinkPluginExpand.java

 package com.yonde.dex.user.expand.plugin;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dex.user.expand.entity.DxGroupMemberLinkExpand;
 /**
 * @description: DxGroupMemberLink-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 public interface DxGroupMemberLinkPluginExpand {
 

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/plugin/DxGroupPluginExpand.java

 package com.yonde.dex.user.expand.plugin;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dex.user.expand.entity.DxGroupExpand;
 import com.yonde.dex.user.expand.plugin.DxPrincipalPluginExpand;
 /**
 * @description: DxGroup-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:23
+* @date: 2024-9-20 10:26:38
 **/
 public interface DxGroupPluginExpand {
 

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/plugin/DxOrganizationGroupLinkPluginExpand.java

 package com.yonde.dex.user.expand.plugin;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dex.user.expand.entity.DxOrganizationGroupLinkExpand;
 /**
 * @description: DxOrganizationGroupLink-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 public interface DxOrganizationGroupLinkPluginExpand {
 

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/plugin/DxOrganizationPluginExpand.java

 package com.yonde.dex.user.expand.plugin;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dex.user.expand.entity.DxOrganizationExpand;
 import com.yonde.dex.user.expand.plugin.DxPrincipalPluginExpand;
 /**
 * @description: DxOrganization-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:23
+* @date: 2024-9-20 10:26:38
 **/
 public interface DxOrganizationPluginExpand {
 

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/plugin/DxPostMemberLinkPluginExpand.java

 package com.yonde.dex.user.expand.plugin;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dex.user.expand.entity.DxPostMemberLinkExpand;
 /**
 * @description: DxPostMemberLink-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 public interface DxPostMemberLinkPluginExpand {
 

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/plugin/DxPostPluginExpand.java

 package com.yonde.dex.user.expand.plugin;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dex.user.expand.entity.DxPostExpand;
 /**
 * @description: DxPost-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 public interface DxPostPluginExpand {
 

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/plugin/DxPrincipalLinkPluginExpand.java

 package com.yonde.dex.user.expand.plugin;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dex.user.expand.entity.DxPrincipalLinkExpand;
 /**
 * @description: DxPrincipalLink-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:23
+* @date: 2024-9-20 10:26:38
 **/
 public interface DxPrincipalLinkPluginExpand {
 

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/plugin/DxPrincipalPluginExpand.java

 package com.yonde.dex.user.expand.plugin;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dex.user.expand.entity.DxPrincipalExpand;
 /**
 * @description: DxPrincipal-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 public interface DxPrincipalPluginExpand {
 

dex-basic-service-expand-entity/src/main/java/com/yonde/dex/user/expand/plugin/DxUserInfoPluginExpand.java

 package com.yonde.dex.user.expand.plugin;
 import com.yonde.dex.basedata.utils.obj.DxExpandUtils;
+import java.util.List;
+import java.util.Date;
+import java.math.BigInteger;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import com.yonde.dex.user.expand.entity.DxUserInfoExpand;
 import com.yonde.dex.user.expand.plugin.DxPrincipalPluginExpand;
 /**
 * @description: DxUserInfo-扩展PO插件接口
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 public interface DxUserInfoPluginExpand {
 

dex-basic-service-expand-feign/pom.xml

@@ -9,6 +9,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dex-basic-service-expand-feign</artifactId>
+    <version>4.1-20240919-RELEASE</version>
+
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
@@ -63,11 +65,11 @@
                 <groupId>com.yonde.dex</groupId>
                 <artifactId>dex-context-plugin-feign</artifactId>
             </dependency>
-            <dependency>
-                <groupId>com.yonde.dcs</groupId>
-                <artifactId>dcs-doc-expand-feign</artifactId>
-                    <version>4.1-20240919-RELEASE</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>com.yonde.dcs</groupId>-->
+<!--                <artifactId>dcs-doc-expand-feign</artifactId>-->
+<!--                    <version>4.1-20240919-RELEASE</version>-->
+<!--            </dependency>-->
     </dependencies>
 
 </project>

dex-basic-service-expand-feign/src/main/java/com/yonde/dex/basic/feign/ExtProgramProjectLinkServiceFeign.java

@@ -10,7 +10,7 @@ import com.yonde.dex.basic.feign.shadow.ExtProgramProjectLinkServiceFeignShadow;
 * @description: ExtProgramProjectLink-Feign
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 @Api(tags = "ExtProgramProjectLink-FEIGN")
 @FeignClient(value = "${dex.feign.DEX-BASIC-SERVICE}", path = "/ExtProgramProjectLink")

dex-basic-service-expand-feign/src/main/java/com/yonde/dex/basic/feign/ExtProgramServiceFeign.java

@@ -10,7 +10,7 @@ import com.yonde.dex.basic.feign.shadow.ExtProgramServiceFeignShadow;
 * @description: ExtProgram-Feign
 * @author: dexadmin
 * @version: V
-* @date: 2024-9-9 11:04:24
+* @date: 2024-9-20 10:26:39
 **/
 @Api(tags = "ExtProgram-FEIGN")
 @FeignClient(value = "${dex.feign.DEX-BASIC-SERVICE}", path = "/ExtProgram")