添加相关收入合同代码

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

@@ -262,7 +262,7 @@ public class ExtInComeContractVO extends IdOnlyVO implements DxIterationVOHolder
     /**
     * 经办人
     */
-    private String operator;
+    private String undertaker;
 
     /**
     * 付款方式

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

+package com.yonde.dcs.plan.core.controller;
+
+import org.springframework.stereotype.Controller;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import java.util.List;
+import com.yonde.dcs.plan.common.vo.ExtInComeContractVO;
+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.ExtInComeContractService;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import com.yonde.dcs.plan.core.controller.shadow.ExtInComeContractControllerShadow;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Controller;
+
+/**
+* @description: ExtInComeContract-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:58
+**/
+@Api(tags = "ExtInComeContract管理服务")
+@RequestMapping("/ExtInComeContract")
+@ResponseBody()
+@Controller(ExtInComeContractController.BEAN_NAME)
+public class ExtInComeContractController<V extends ExtInComeContractVO, S extends ExtInComeContractService<V>> extends ExtInComeContractControllerShadow<V, S> {
+
+
+}
+
+

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/shadow/ExtInComeContractControllerShadow.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.ExtInComeContractVO;
+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.ExtInComeContractService;
+import com.yonde.dcs.plan.core.service.impl.ExtInComeContractServiceImpl;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+import javax.annotation.Resource;
+import com.yonde.dex.basedata.auth.annos.PermissionObject;
+import com.yonde.dex.version.plugin.core.controller.AbstractVersionBaseController;
+import com.yonde.dex.basedata.auth.annos.SubPermission;
+import com.yonde.entity.annotation.SandBoxOpen;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dex.dfs.objfilelink.plugin.core.controller.DxObjFileLinkController;
+import com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder;
+import com.yonde.dex.lcycle.plugin.core.controller.AbstractLifecycleBaseController;
+import com.yonde.dex.baseweb.AbstractBaseController;
+import com.yonde.dex.basedata.entity.api.ApiResult;
+
+/**
+* @description: ExtInComeContract-Controller
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:58
+**/
+public class ExtInComeContractControllerShadow<V extends ExtInComeContractVO, S extends ExtInComeContractService<V>> implements AbstractBaseController<V, S> ,AbstractLifecycleBaseController<V, S> ,AbstractVersionBaseController<V, S> ,DxObjFileLinkController<V, S>{
+
+    public static final String BEAN_NAME = "extInComeContractController";
+
+
+    /**
+    * 注入
+    */
+    @Resource(name = ExtInComeContractServiceImpl.BEAN_NAME)
+    private ExtInComeContractService<V> extInComeContractService;
+
+    /**
+        * getService
+    */
+    @Override
+    public S getService() {
+        return (S)this.extInComeContractService;
+    }
+}
+
+

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

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

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

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

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

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

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

+package com.yonde.dcs.plan.core.repository.shadow;
+
+import com.yonde.dcs.plan.entity.po.ExtInComeContract;
+import org.springframework.data.repository.NoRepositoryBean;
+import com.yonde.dex.context.plugin.core.repository.DxContextPluginRepository;
+import com.yonde.dex.logicdelete.plugin.core.repository.DxLogicDeleteRepository;
+import com.yonde.dex.dao.business.repository.BaseRepository;
+import com.yonde.dex.secretcode.plugin.core.repositroy.DxSecretCodePluginRepository;
+import com.yonde.dex.version.plugin.core.repository.DxIterationRepository;
+import com.yonde.dex.lcycle.plugin.core.repository.DxLifecycleManageBaseRepository;
+import com.yonde.dex.dfs.objfilelink.plugin.core.repository.DxObjFileLinkPluginRepository;
+/**
+* @description: ExtInComeContract-repository
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:58
+**/
+@NoRepositoryBean
+public interface ExtInComeContractRepositoryShadow<P extends ExtInComeContract> extends DxContextPluginRepository<P> ,DxObjFileLinkPluginRepository<P> ,DxLifecycleManageBaseRepository<P> ,BaseRepository<P> ,DxLogicDeleteRepository<P> ,DxIterationRepository<P> ,DxSecretCodePluginRepository<P> {
+
+    String BEAN_NAME = "extInComeContractRepository";
+}

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

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

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/impl/ExtInComeContractServiceImpl.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.ExtInComeContractVO;
+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.ExtInComeContractService;
+import com.yonde.dcs.plan.core.repository.ExtInComeContractRepository;
+import com.yonde.dcs.plan.entity.po.ExtInComeContract;
+import javax.annotation.Resource;
+
+/**
+* @description: ExtInComeContract-ServiceImpl
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:58
+**/
+@Slf4j
+@Service(ExtInComeContractServiceImpl.BEAN_NAME)
+public class ExtInComeContractServiceImpl<V extends ExtInComeContractVO> implements ExtInComeContractService<V>{
+
+
+    public static final String BEAN_NAME = "extInComeContractServiceImpl";
+
+    @Autowired
+    ExtInComeContractRepository<ExtInComeContract> extInComeContractRepository;
+
+}
+
+

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

+package com.yonde.dcs.plan.core.service.shadow;
+
+import com.yonde.dcs.plan.common.vo.ExtInComeContractVO;
+import com.yonde.dcs.plan.feign.ExtInComeContractServiceFeign;
+import com.yonde.dex.dao.service.BaseIdEntityService;
+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: ExtInComeContract-service
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:58
+**/
+public interface ExtInComeContractServiceShadow<V extends ExtInComeContractVO> extends ExtInComeContractServiceFeign<V>, ContextPluginService<V> ,ObjFileLinkPluginService<V> ,LifecycleBaseService<V> ,BaseIdEntityService<V> ,LogicDeleteService<V> ,IterationService<V> ,SecretCodePluginService<V> {
+
+}

dcs-plan-entity/src/main/java/com/yonde/dcs/plan/entity/po/ExtICMExternalInterfacePlanCurrent.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.dcs.plan.entity.po.ExtICMExternalInterfacePlan;
-import com.yonde.dex.basedata.entity.annotation.HistoryEntity;
-import com.yonde.dex.history.plugin.entities.DxCurDataPO;
-
-/**
-* @description: ExtICMExternalInterfacePlan-PO实体
-* @author: dexadmin
-* @version: V
-* @date: 2024-9-24 16:48:57
-**/
-@Entity
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@Data
-@HistoryEntity(value="ExtICMExternalInterfacePlanCurrent")
-@Table(name = "EXT_ICM_EXTERNAL_INTERFACE_PLAN_CURRENT")
-public class ExtICMExternalInterfacePlanCurrent extends ExtICMExternalInterfacePlan implements DxCurDataPO{
-
-}
-
-

dcs-plan-entity/src/main/java/com/yonde/dcs/plan/entity/po/ExtICMExternalInterfacePlanHistory.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.dcs.plan.entity.po.ExtICMExternalInterfacePlan;
-import com.yonde.dex.history.plugin.entities.DxHistoryPO;
-import com.yonde.dex.basedata.entity.annotation.HistoryEntity;
-
-/**
-* @description: ExtICMExternalInterfacePlan-PO实体
-* @author: dexadmin
-* @version: V
-* @date: 2024-9-24 16:48:57
-**/
-@Entity
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@Data
-@HistoryEntity(value="ExtICMExternalInterfacePlanHistory")
-@Table(name = "EXT_ICM_EXTERNAL_INTERFACE_PLAN_HISTORY")
-public class ExtICMExternalInterfacePlanHistory extends ExtICMExternalInterfacePlan implements DxHistoryPO{
-
-}
-
-

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

+package com.yonde.dcs.plan.feign;
+
+import com.yonde.dcs.plan.common.vo.ExtInComeContractVO;
+import io.swagger.annotations.Api;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+import com.yonde.dcs.plan.feign.shadow.ExtInComeContractServiceFeignShadow;
+
+/**
+* @description: ExtInComeContract-Feign
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:58
+**/
+@Api(tags = "ExtInComeContract-FEIGN")
+@FeignClient(value = "${dcs.feign.INET-PLAN}", path = "/ExtInComeContract")
+public interface ExtInComeContractServiceFeign<V extends ExtInComeContractVO> extends ExtInComeContractServiceFeignShadow<V> {
+
+}

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

+package com.yonde.dcs.plan.feign.shadow;
+
+import com.yonde.dcs.plan.common.vo.ExtInComeContractVO;
+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.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: ExtInComeContract-Feign
+* @author: dexadmin
+* @version: V
+* @date: 2024-9-24 16:48:58
+**/
+public interface ExtInComeContractServiceFeignShadow<V extends ExtInComeContractVO> extends ContextPluginFeign<V> ,BaseLifecycleManageFeign<V> ,BaseFeign<V> ,LogicDeleteFeign<V> ,BaseVersionFeign<V> ,SecretCodeFeign<V> {
+
+    String BEAN_NAME = "extInComeContractServiceFeign";
+
+}