Commit 087cdb96 authored by wangqiang's avatar wangqiang

生成采购计划代码导入工程中

parent 39057092
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.yonde.dcs</groupId> <groupId>com.yonde.dcs</groupId>
<artifactId>dcs-plan</artifactId> <artifactId>dcs-plan</artifactId>
<version>4.1-RELEASE</version> <version>4.1-20240826-RELEASE</version>
</parent> </parent>
<artifactId>dcs-plan-build-lib</artifactId> <artifactId>dcs-plan-build-lib</artifactId>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<dependency> <dependency>
<groupId>com.yonde.dcs</groupId> <groupId>com.yonde.dcs</groupId>
<artifactId>dcs-plan-core</artifactId> <artifactId>dcs-plan-core</artifactId>
<version>4.1-RELEASE</version> <version>4.1-20240826-RELEASE</version>
</dependency> </dependency>
</dependencies> </dependencies>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.yonde.dcs</groupId> <groupId>com.yonde.dcs</groupId>
<artifactId>dcs-plan</artifactId> <artifactId>dcs-plan</artifactId>
<version>4.1-RELEASE</version> <version>4.1-20240826-RELEASE</version>
</parent> </parent>
<artifactId>dcs-plan-build-thirdLib</artifactId> <artifactId>dcs-plan-build-thirdLib</artifactId>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<dependency> <dependency>
<groupId>com.yonde.dcs</groupId> <groupId>com.yonde.dcs</groupId>
<artifactId>dcs-plan-core</artifactId> <artifactId>dcs-plan-core</artifactId>
<version>4.1-RELEASE</version> <version>4.1-20240826-RELEASE</version>
</dependency> </dependency>
</dependencies> </dependencies>
......
...@@ -4,12 +4,12 @@ ...@@ -4,12 +4,12 @@
<parent> <parent>
<groupId>com.yonde.dcs</groupId> <groupId>com.yonde.dcs</groupId>
<artifactId>dcs-plan</artifactId> <artifactId>dcs-plan</artifactId>
<version>4.1-RELEASE</version> <version>4.1-20240826-RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>dcs-plan-common</artifactId> <artifactId>dcs-plan-common</artifactId>
<version>4.1-RELEASE</version> <version>4.1-20240826-RELEASE</version>
<properties> <properties>
<maven.compiler.source>8</maven.compiler.source> <maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target> <maven.compiler.target>8</maven.compiler.target>
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<dependency> <dependency>
<groupId>com.yonde.dcs</groupId> <groupId>com.yonde.dcs</groupId>
<artifactId>dcs-doc-expand-common</artifactId> <artifactId>dcs-doc-expand-common</artifactId>
<version>4.1-RELEASE</version> <version>4.1-20240826-RELEASE</version>
</dependency> </dependency>
......
...@@ -39,6 +39,8 @@ import com.yonde.dex.version.plugin.common.entity.DxIterationVOEmbeddable; ...@@ -39,6 +39,8 @@ import com.yonde.dex.version.plugin.common.entity.DxIterationVOEmbeddable;
import com.yonde.dex.basedata.entity.users.DxUserVO; 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.DxLifecycleManageBaseVOHolder;
import com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOEmbeddable; 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.basedata.entity.vo.IdVO;
import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOEmbeddable; import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOEmbeddable;
import com.yonde.dcs.plan.common.vo.ExtPurchasePlanDocLinkVO; import com.yonde.dcs.plan.common.vo.ExtPurchasePlanDocLinkVO;
...@@ -46,28 +48,35 @@ import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbedda ...@@ -46,28 +48,35 @@ import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbedda
import com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder; import com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder;
/** /**
* @description: ExtPurchasePlan-VO * @description: ExtPuchasePlanAttribute-VO
* @author: dexadmin * @author: dexadmin
* @version: V * @version: V
* @date: 2024-8-29 9:31:22 * @date: 2024-8-29 17:14:49
**/ **/
@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtPurchasePlanVO.class) @JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtPuchasePlanAttributeVO.class)
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
@ToString(callSuper = true) @ToString(callSuper = true)
public class ExtPurchasePlanVO extends IdOnlyVO implements IdVO ,DxIterationVOHolder<ExtPurchasePlanVO> ,DxContextVOHolder ,DxLifecycleManageBaseVOHolder ,DxObjFileLinkVOHolder ,DxSecretVOHolder{ public class ExtPuchasePlanAttributeVO extends IdOnlyVO implements DxIterationVOHolder<ExtPuchasePlanAttributeVO> ,IdVO ,DxContextVOHolder ,DxLifecycleManageBaseVOHolder ,DxObjFileLinkVOHolder ,DxLogicDeleteVOHolder ,DxSecretVOHolder{
public static final String DX_CONTEXT_EMBEDDABLE_PROP_NAME = "dxContextEmbeddable"; 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_OBJ_FILE_LINK_EMBEDDABLE_PROP_NAME = "dxObjFileLinkEmbeddable";
public static final String DX_LIFECYCLE_MANAGE_BASE_EMBEDDABLE_PROP_NAME = "dxLifecycleManageBaseEmbeddable"; 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_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
public static final String DX_SECRET_EMBEDDABLE_PROP_NAME = "dxSecretEmbeddable"; 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_ITERATION_EMBEDDABLE_PROP_NAME = "dxIterationEmbeddable";
public static final String DX_SECRET_EMBEDDABLE_PROP_NAME = "dxSecretEmbeddable";
public static final String CONTRACT_ACTUAL_DELIVERY_TIME_PROP_NAME = "contractActualDeliveryTime";
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_PURCHASE_PLAN_DOC_LINKS_PROP_NAME = "extPurchasePlanDocLinks"; public static final String EXT_PURCHASE_PLAN_DOC_LINKS_PROP_NAME = "extPurchasePlanDocLinks";
public static final String FILE_CODE_PROP_NAME = "fileCode"; public static final String OUTSOURCE_PROJECT_NAME_PROP_NAME = "outsourceProjectName";
public static final String FILE_NAME_PROP_NAME = "fileName"; public static final String PLAN_CODE_PROP_NAME = "planCode";
public static final String PROJECT_CODE_PROP_NAME = "projectCode"; public static final String PUR_DESIGN_FILE_ACTUAL_SUBMIT_TIME_PROP_NAME = "purDesignFileActualSubmitTime";
public static final String PURCHASE_PLAN_FILE_PROP_NAME = "purchasePlanFile"; public static final String PUR_DESIGN_FILE_MANAGER_PROP_NAME = "purDesignFileManager";
public static final String PUR_DESIGN_FILE_SUBMIT_TIME_PROP_NAME = "purDesignFileSubmitTime";
public static final String PURCHASE_BUDGET_PROP_NAME = "purchaseBudget";
/** /**
* 扩展VO属性 * 扩展VO属性
...@@ -102,14 +111,41 @@ public class ExtPurchasePlanVO extends IdOnlyVO implements IdVO ,DxIterationVOHo ...@@ -102,14 +111,41 @@ public class ExtPurchasePlanVO extends IdOnlyVO implements IdVO ,DxIterationVOHo
*/ */
@DexEmbedded() @DexEmbedded()
@JsonIgnore @JsonIgnore
private DxSecretVOEmbeddable dxSecretEmbeddable; private DxLogicDeleteVOEmbeddable dxLogicDeleteEmbeddable;
/**
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxIterationVOEmbeddable<ExtPuchasePlanAttributeVO> dxIterationEmbeddable;
/** /**
* 扩展VO属性 * 扩展VO属性
*/ */
@DexEmbedded() @DexEmbedded()
@JsonIgnore @JsonIgnore
private DxIterationVOEmbeddable<ExtPurchasePlanVO> dxIterationEmbeddable; private DxSecretVOEmbeddable dxSecretEmbeddable;
/**
* 合同实际交付时间
*/
private LocalDateTime contractActualDeliveryTime;
/**
* 合同实际签订时间
*/
private LocalDateTime contractActualSigningTime;
/**
* 合同交付时间
*/
private LocalDateTime contractDeliveryTime;
/**
* 合同签订时间
*/
private LocalDateTime contractSigningTime;
/** /**
* 采购计划文档关系集合 * 采购计划文档关系集合
...@@ -119,24 +155,34 @@ public class ExtPurchasePlanVO extends IdOnlyVO implements IdVO ,DxIterationVOHo ...@@ -119,24 +155,34 @@ public class ExtPurchasePlanVO extends IdOnlyVO implements IdVO ,DxIterationVOHo
private List<ExtPurchasePlanDocLinkVO> extPurchasePlanDocLinks; private List<ExtPurchasePlanDocLinkVO> extPurchasePlanDocLinks;
/** /**
* 文件编号 * 外协项目名称
*/
private String outsourceProjectName;
/**
* 计划编码
*/
private String planCode;
/**
* 采购技术文件实际提交时间
*/ */
private String fileCode; private LocalDateTime purDesignFileActualSubmitTime;
/** /**
* 文件名称 * 采购技术文件负责人
*/ */
private String fileName; private String purDesignFileManager;
/** /**
* 项目代号 * 采购技术文件提交时间
*/ */
private String projectCode; private LocalDateTime purDesignFileSubmitTime;
/** /**
* 采购计划文件 * 采购预算
*/ */
private String purchasePlanFile; private String purchaseBudget;
} }
......
...@@ -30,7 +30,7 @@ import com.yonde.dex.basedata.entity.vo.IdOnlyVO; ...@@ -30,7 +30,7 @@ import com.yonde.dex.basedata.entity.vo.IdOnlyVO;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.TypeReference; import cn.hutool.core.lang.TypeReference;
import com.yonde.dex.basedata.entity.data.VersionRelationType; import com.yonde.dex.basedata.entity.data.VersionRelationType;
import com.yonde.dcs.plan.common.vo.ExtPurchasePlanVO; import com.yonde.dcs.plan.common.vo.ExtPuchasePlanAttributeVO;
import com.yonde.dex.basedata.entity.vo.DxIdVOEmbeddable; import com.yonde.dex.basedata.entity.vo.DxIdVOEmbeddable;
import com.yonde.dex.basedata.entity.vo.IdVO; import com.yonde.dex.basedata.entity.vo.IdVO;
import com.yonde.dex.linkdata.plugin.common.DxLinkDataVOHolder; import com.yonde.dex.linkdata.plugin.common.DxLinkDataVOHolder;
...@@ -42,7 +42,7 @@ import com.yonde.dex.basedata.entity.users.DxUserVO; ...@@ -42,7 +42,7 @@ import com.yonde.dex.basedata.entity.users.DxUserVO;
* @description: ExtPurchasePlanDocLink-VO * @description: ExtPurchasePlanDocLink-VO
* @author: dexadmin * @author: dexadmin
* @version: V * @version: V
* @date: 2024-8-29 9:31:22 * @date: 2024-8-29 17:14:50
**/ **/
@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtPurchasePlanDocLinkVO.class) @JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtPurchasePlanDocLinkVO.class)
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
...@@ -50,7 +50,7 @@ import com.yonde.dex.basedata.entity.users.DxUserVO; ...@@ -50,7 +50,7 @@ import com.yonde.dex.basedata.entity.users.DxUserVO;
@ToString(callSuper = true) @ToString(callSuper = true)
@DexTypeVersionProp(propName = "target", join = @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.VERSION)) @DexTypeVersionProp(propName = "target", join = @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.VERSION))
@DexTypeVersionProp(propName = "source", join = @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.VERSION)) @DexTypeVersionProp(propName = "source", join = @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.VERSION))
public class ExtPurchasePlanDocLinkVO extends IdOnlyVO implements DxLinkDataVOHolder<ExtPurchasePlanVO, DxDocumentVO> ,IdVO{ public class ExtPurchasePlanDocLinkVO extends IdOnlyVO implements IdVO ,DxLinkDataVOHolder<ExtPuchasePlanAttributeVO, DxDocumentVO>{
public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable"; public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
public static final String DX_LINK_DATA_EMBEDDABLE_PROP_NAME = "dxLinkDataEmbeddable"; public static final String DX_LINK_DATA_EMBEDDABLE_PROP_NAME = "dxLinkDataEmbeddable";
...@@ -67,7 +67,7 @@ public class ExtPurchasePlanDocLinkVO extends IdOnlyVO implements DxLinkDataVOHo ...@@ -67,7 +67,7 @@ public class ExtPurchasePlanDocLinkVO extends IdOnlyVO implements DxLinkDataVOHo
*/ */
@DexEmbedded() @DexEmbedded()
@JsonIgnore @JsonIgnore
private DxLinkDataVOEmbeddable<ExtPurchasePlanVO, DxDocumentVO> dxLinkDataEmbeddable; private DxLinkDataVOEmbeddable<ExtPuchasePlanAttributeVO, DxDocumentVO> dxLinkDataEmbeddable;
} }
......
...@@ -4,12 +4,12 @@ ...@@ -4,12 +4,12 @@
<parent> <parent>
<groupId>com.yonde.dcs</groupId> <groupId>com.yonde.dcs</groupId>
<artifactId>dcs-plan</artifactId> <artifactId>dcs-plan</artifactId>
<version>4.1-RELEASE</version> <version>4.1-20240826-RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>dcs-plan-core</artifactId> <artifactId>dcs-plan-core</artifactId>
<version>4.1-RELEASE</version> <version>4.1-20240826-RELEASE</version>
<properties> <properties>
<maven.compiler.source>8</maven.compiler.source> <maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target> <maven.compiler.target>8</maven.compiler.target>
...@@ -19,12 +19,12 @@ ...@@ -19,12 +19,12 @@
<dependency> <dependency>
<groupId>com.yonde.dcs</groupId> <groupId>com.yonde.dcs</groupId>
<artifactId>dcs-plan-feign</artifactId> <artifactId>dcs-plan-feign</artifactId>
<version>4.1-RELEASE</version> <version>4.1-20240826-RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.yonde.dcs</groupId> <groupId>com.yonde.dcs</groupId>
<artifactId>dcs-plan-entity</artifactId> <artifactId>dcs-plan-entity</artifactId>
<version>4.1-RELEASE</version> <version>4.1-20240826-RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.yonde.dex</groupId> <groupId>com.yonde.dex</groupId>
......
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.ExtIDEPlanVO;
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.ExtIDEPlanService;
import com.yonde.dex.basedata.entity.api.ApiResult;
import com.yonde.dcs.plan.core.controller.shadow.ExtIDEPlanControllerShadow;
import javax.annotation.Resource;
import org.springframework.stereotype.Controller;
/**
* @description: ExtIDEPlan-Controller
* @author: dexadmin
* @version: V
* @date: 2024-8-29 17:14:49
**/
@Api(tags = "ExtIDEPlan管理服务")
@RequestMapping("/ExtIDEPlan")
@ResponseBody()
@Controller(ExtIDEPlanController.BEAN_NAME)
public class ExtIDEPlanController<V extends ExtIDEPlanVO, S extends ExtIDEPlanService<V>> extends ExtIDEPlanControllerShadow<V, S> {
}
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.ExtIEDPlanDocLinkVO;
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.ExtIEDPlanDocLinkService;
import com.yonde.dex.basedata.entity.api.ApiResult;
import com.yonde.dcs.plan.core.controller.shadow.ExtIEDPlanDocLinkControllerShadow;
import javax.annotation.Resource;
import com.yonde.dex.basedata.auth.annos.BasePermission;
import org.springframework.stereotype.Controller;
/**
* @description: ExtIEDPlanDocLink-Controller
* @author: dexadmin
* @version: V
* @date: 2024-8-29 17:14:49
**/
@Api(tags = "ExtIEDPlanDocLink管理服务")
@RequestMapping("/ExtIEDPlanDocLink")
@ResponseBody()
@Controller(ExtIEDPlanDocLinkController.BEAN_NAME)
@BasePermission("inet-plan:ExtIEDPlanDocLink")
public class ExtIEDPlanDocLinkController<V extends ExtIEDPlanDocLinkVO, S extends ExtIEDPlanDocLinkService<V>> extends ExtIEDPlanDocLinkControllerShadow<V, S> {
}
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.ExtPuchasePlanAttributeVO;
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.ExtPuchasePlanAttributeService;
import com.yonde.dex.basedata.entity.api.ApiResult;
import com.yonde.dcs.plan.core.controller.shadow.ExtPuchasePlanAttributeControllerShadow;
import javax.annotation.Resource;
import com.yonde.dex.basedata.auth.annos.BasePermission;
import org.springframework.stereotype.Controller;
/**
* @description: ExtPuchasePlanAttribute-Controller
* @author: dexadmin
* @version: V
* @date: 2024-8-29 17:14:49
**/
@Api(tags = "ExtPuchasePlanAttribute管理服务")
@RequestMapping("/ExtPuchasePlanAttribute")
@ResponseBody()
@BasePermission("inet-plan:ExtPuchasePlanAttribute")
@Controller(ExtPuchasePlanAttributeController.BEAN_NAME)
public class ExtPuchasePlanAttributeController<V extends ExtPuchasePlanAttributeVO, S extends ExtPuchasePlanAttributeService<V>> extends ExtPuchasePlanAttributeControllerShadow<V, S> {
}
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.ExtPurchasePlanDocLinkVO;
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.ExtPurchasePlanDocLinkService;
import com.yonde.dex.basedata.entity.api.ApiResult;
import com.yonde.dcs.plan.core.controller.shadow.ExtPurchasePlanDocLinkControllerShadow;
import javax.annotation.Resource;
import com.yonde.dex.basedata.auth.annos.BasePermission;
import org.springframework.stereotype.Controller;
/**
* @description: ExtPurchasePlanDocLink-Controller
* @author: dexadmin
* @version: V
* @date: 2024-8-29 17:14:50
**/
@Api(tags = "ExtPurchasePlanDocLink管理服务")
@RequestMapping("/ExtPurchasePlanDocLink")
@ResponseBody()
@BasePermission("inet-plan:ExtPurchasePlanDocLink")
@Controller(ExtPurchasePlanDocLinkController.BEAN_NAME)
public class ExtPurchasePlanDocLinkController<V extends ExtPurchasePlanDocLinkVO, S extends ExtPurchasePlanDocLinkService<V>> extends ExtPurchasePlanDocLinkControllerShadow<V, S> {
}
...@@ -3,13 +3,13 @@ package com.yonde.dcs.plan.core.controller.shadow; ...@@ -3,13 +3,13 @@ package com.yonde.dcs.plan.core.controller.shadow;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import java.util.List; import java.util.List;
import com.yonde.dcs.plan.common.vo.ExtPurchasePlanVO; import com.yonde.dcs.plan.common.vo.ExtPuchasePlanAttributeVO;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.yonde.dcs.plan.core.service.ExtPurchasePlanService; import com.yonde.dcs.plan.core.service.ExtPuchasePlanAttributeService;
import com.yonde.dcs.plan.core.service.impl.ExtPurchasePlanServiceImpl; import com.yonde.dcs.plan.core.service.impl.ExtPuchasePlanAttributeServiceImpl;
import com.yonde.dex.basedata.entity.api.ApiResult; import com.yonde.dex.basedata.entity.api.ApiResult;
import javax.annotation.Resource; import javax.annotation.Resource;
import com.yonde.dex.basedata.auth.annos.PermissionObject; import com.yonde.dex.basedata.auth.annos.PermissionObject;
...@@ -25,29 +25,29 @@ import com.yonde.dex.baseweb.AbstractBaseController; ...@@ -25,29 +25,29 @@ import com.yonde.dex.baseweb.AbstractBaseController;
import com.yonde.dex.basedata.entity.api.ApiResult; import com.yonde.dex.basedata.entity.api.ApiResult;
/** /**
* @description: ExtPurchasePlan-Controller * @description: ExtPuchasePlanAttribute-Controller
* @author: dexadmin * @author: dexadmin
* @version: V * @version: V
* @date: 2024-8-29 9:31:22 * @date: 2024-8-29 17:14:49
**/ **/
@BasePermission("inet-plan:ExtPurchasePlan") @BasePermission("inet-plan:ExtPuchasePlanAttribute")
public class ExtPurchasePlanControllerShadow<V extends ExtPurchasePlanVO, S extends ExtPurchasePlanService<V>> implements AbstractBaseController<V, S> ,AbstractLifecycleBaseController<V, S> ,AbstractVersionBaseController<V, S> ,DxObjFileLinkController<V, S>{ public class ExtPuchasePlanAttributeControllerShadow<V extends ExtPuchasePlanAttributeVO, S extends ExtPuchasePlanAttributeService<V>> implements AbstractBaseController<V, S> ,AbstractLifecycleBaseController<V, S> ,AbstractVersionBaseController<V, S> ,DxObjFileLinkController<V, S>{
public static final String BEAN_NAME = "extPurchasePlanController"; public static final String BEAN_NAME = "extPuchasePlanAttributeController";
/** /**
* 注入 * 注入
*/ */
@Resource(name = ExtPurchasePlanServiceImpl.BEAN_NAME) @Resource(name = ExtPuchasePlanAttributeServiceImpl.BEAN_NAME)
private ExtPurchasePlanService<V> extPurchasePlanService; private ExtPuchasePlanAttributeService<V> extPuchasePlanAttributeService;
/** /**
* getService * getService
*/ */
@Override @Override
public S getService() { public S getService() {
return (S)this.extPurchasePlanService; return (S)this.extPuchasePlanAttributeService;
} }
} }
......
...@@ -20,7 +20,7 @@ import com.yonde.dex.baseweb.AbstractBaseController; ...@@ -20,7 +20,7 @@ import com.yonde.dex.baseweb.AbstractBaseController;
* @description: ExtPurchasePlanDocLink-Controller * @description: ExtPurchasePlanDocLink-Controller
* @author: dexadmin * @author: dexadmin
* @version: V * @version: V
* @date: 2024-8-29 9:31:22 * @date: 2024-8-29 17:14:50
**/ **/
@BasePermission("inet-plan:ExtPurchasePlanDocLink") @BasePermission("inet-plan:ExtPurchasePlanDocLink")
public class ExtPurchasePlanDocLinkControllerShadow<V extends ExtPurchasePlanDocLinkVO, S extends ExtPurchasePlanDocLinkService<V>> implements AbstractBaseController<V, S> ,DxLinkDataController<V, S>{ public class ExtPurchasePlanDocLinkControllerShadow<V extends ExtPurchasePlanDocLinkVO, S extends ExtPurchasePlanDocLinkService<V>> implements AbstractBaseController<V, S> ,DxLinkDataController<V, S>{
......
package com.yonde.dcs.plan.core.repository;
import com.yonde.dcs.plan.entity.po.ExtPuchasePlanAttribute;
import com.yonde.dcs.plan.core.repository.shadow.ExtPuchasePlanAttributeRepositoryShadow;
/**
* @description: ExtPuchasePlanAttribute-repository
* @author: dexadmin
* @version: V
* @date: 2024-8-29 17:14:49
**/
public interface ExtPuchasePlanAttributeRepository<P extends ExtPuchasePlanAttribute> extends ExtPuchasePlanAttributeRepositoryShadow<P> {
}
...@@ -6,7 +6,7 @@ import com.yonde.dcs.plan.core.repository.shadow.ExtPurchasePlanDocLinkRepositor ...@@ -6,7 +6,7 @@ import com.yonde.dcs.plan.core.repository.shadow.ExtPurchasePlanDocLinkRepositor
* @description: ExtPurchasePlanDocLink-repository * @description: ExtPurchasePlanDocLink-repository
* @author: dexadmin * @author: dexadmin
* @version: V * @version: V
* @date: 2024-8-29 9:31:22 * @date: 2024-8-29 17:14:50
**/ **/
public interface ExtPurchasePlanDocLinkRepository<P extends ExtPurchasePlanDocLink> extends ExtPurchasePlanDocLinkRepositoryShadow<P> { public interface ExtPurchasePlanDocLinkRepository<P extends ExtPurchasePlanDocLink> extends ExtPurchasePlanDocLinkRepositoryShadow<P> {
} }
package com.yonde.dcs.plan.core.repository;
import com.yonde.dcs.plan.entity.po.ExtPurchasePlan;
import com.yonde.dcs.plan.core.repository.shadow.ExtPurchasePlanRepositoryShadow;
/**
* @description: ExtPurchasePlan-repository
* @author: dexadmin
* @version: V
* @date: 2024-8-29 9:31:22
**/
public interface ExtPurchasePlanRepository<P extends ExtPurchasePlan> extends ExtPurchasePlanRepositoryShadow<P> {
}
package com.yonde.dcs.plan.core.repository.shadow; package com.yonde.dcs.plan.core.repository.shadow;
import com.yonde.dcs.plan.entity.po.ExtPurchasePlan; import com.yonde.dcs.plan.entity.po.ExtPuchasePlanAttribute;
import org.springframework.data.repository.NoRepositoryBean; import org.springframework.data.repository.NoRepositoryBean;
import com.yonde.dex.context.plugin.core.repository.DxContextPluginRepository; 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.dao.business.repository.BaseRepository;
import com.yonde.dex.secretcode.plugin.core.repositroy.DxSecretCodePluginRepository; import com.yonde.dex.secretcode.plugin.core.repositroy.DxSecretCodePluginRepository;
import com.yonde.dex.version.plugin.core.repository.DxIterationRepository; import com.yonde.dex.version.plugin.core.repository.DxIterationRepository;
import com.yonde.dex.lcycle.plugin.core.repository.DxLifecycleManageBaseRepository; import com.yonde.dex.lcycle.plugin.core.repository.DxLifecycleManageBaseRepository;
import com.yonde.dex.dfs.objfilelink.plugin.core.repository.DxObjFileLinkPluginRepository; import com.yonde.dex.dfs.objfilelink.plugin.core.repository.DxObjFileLinkPluginRepository;
/** /**
* @description: ExtPurchasePlan-repository * @description: ExtPuchasePlanAttribute-repository
* @author: dexadmin * @author: dexadmin
* @version: V * @version: V
* @date: 2024-8-29 9:31:22 * @date: 2024-8-29 17:14:49
**/ **/
@NoRepositoryBean @NoRepositoryBean
public interface ExtPurchasePlanRepositoryShadow<P extends ExtPurchasePlan> extends DxContextPluginRepository<P> ,DxObjFileLinkPluginRepository<P> ,DxLifecycleManageBaseRepository<P> ,BaseRepository<P> ,DxSecretCodePluginRepository<P> ,DxIterationRepository<P> { public interface ExtPuchasePlanAttributeRepositoryShadow<P extends ExtPuchasePlanAttribute> extends DxContextPluginRepository<P> ,DxObjFileLinkPluginRepository<P> ,DxLifecycleManageBaseRepository<P> ,BaseRepository<P> ,DxLogicDeleteRepository<P> ,DxIterationRepository<P> ,DxSecretCodePluginRepository<P> {
String BEAN_NAME = "extPurchasePlanRepository"; String BEAN_NAME = "extPuchasePlanAttributeRepository";
} }
...@@ -8,7 +8,7 @@ import com.yonde.dex.linkdata.plugin.core.repository.DxLinkDataRepository; ...@@ -8,7 +8,7 @@ import com.yonde.dex.linkdata.plugin.core.repository.DxLinkDataRepository;
* @description: ExtPurchasePlanDocLink-repository * @description: ExtPurchasePlanDocLink-repository
* @author: dexadmin * @author: dexadmin
* @version: V * @version: V
* @date: 2024-8-29 9:31:22 * @date: 2024-8-29 17:14:50
**/ **/
@NoRepositoryBean @NoRepositoryBean
public interface ExtPurchasePlanDocLinkRepositoryShadow<P extends ExtPurchasePlanDocLink> extends BaseRepository<P> ,DxLinkDataRepository<P> { public interface ExtPurchasePlanDocLinkRepositoryShadow<P extends ExtPurchasePlanDocLink> extends BaseRepository<P> ,DxLinkDataRepository<P> {
......
package com.yonde.dcs.plan.core.service;
import com.yonde.dcs.plan.common.vo.ExtPuchasePlanAttributeVO;
import com.yonde.dcs.plan.core.service.shadow.ExtPuchasePlanAttributeServiceShadow;
/**
* @description: ExtPuchasePlanAttribute-service
* @author: dexadmin
* @version: V
* @date: 2024-8-29 17:14:49
**/
public interface ExtPuchasePlanAttributeService<V extends ExtPuchasePlanAttributeVO> extends ExtPuchasePlanAttributeServiceShadow<V> {
}
...@@ -6,7 +6,7 @@ import com.yonde.dcs.plan.core.service.shadow.ExtPurchasePlanDocLinkServiceShado ...@@ -6,7 +6,7 @@ import com.yonde.dcs.plan.core.service.shadow.ExtPurchasePlanDocLinkServiceShado
* @description: ExtPurchasePlanDocLink-service * @description: ExtPurchasePlanDocLink-service
* @author: dexadmin * @author: dexadmin
* @version: V * @version: V
* @date: 2024-8-29 9:31:22 * @date: 2024-8-29 17:14:50
**/ **/
public interface ExtPurchasePlanDocLinkService<V extends ExtPurchasePlanDocLinkVO> extends ExtPurchasePlanDocLinkServiceShadow<V> { public interface ExtPurchasePlanDocLinkService<V extends ExtPurchasePlanDocLinkVO> extends ExtPurchasePlanDocLinkServiceShadow<V> {
......
package com.yonde.dcs.plan.core.service;
import com.yonde.dcs.plan.common.vo.ExtPurchasePlanVO;
import com.yonde.dcs.plan.core.service.shadow.ExtPurchasePlanServiceShadow;
/**
* @description: ExtPurchasePlan-service
* @author: dexadmin
* @version: V
* @date: 2024-8-29 9:31:22
**/
public interface ExtPurchasePlanService<V extends ExtPurchasePlanVO> extends ExtPurchasePlanServiceShadow<V> {
}
...@@ -3,31 +3,31 @@ package com.yonde.dcs.plan.core.service.impl; ...@@ -3,31 +3,31 @@ package com.yonde.dcs.plan.core.service.impl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import java.util.List; import java.util.List;
import com.yonde.dcs.plan.common.vo.ExtPurchasePlanVO; import com.yonde.dcs.plan.common.vo.ExtPuchasePlanAttributeVO;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.yonde.dcs.plan.core.service.ExtPurchasePlanService; import com.yonde.dcs.plan.core.service.ExtPuchasePlanAttributeService;
import com.yonde.dcs.plan.core.repository.ExtPurchasePlanRepository; import com.yonde.dcs.plan.core.repository.ExtPuchasePlanAttributeRepository;
import com.yonde.dcs.plan.entity.po.ExtPurchasePlan; import com.yonde.dcs.plan.entity.po.ExtPuchasePlanAttribute;
import javax.annotation.Resource; import javax.annotation.Resource;
/** /**
* @description: ExtPurchasePlan-ServiceImpl * @description: ExtPuchasePlanAttribute-ServiceImpl
* @author: dexadmin * @author: dexadmin
* @version: V * @version: V
* @date: 2024-8-29 9:31:22 * @date: 2024-8-29 17:14:49
**/ **/
@Slf4j @Slf4j
@Service(ExtPurchasePlanServiceImpl.BEAN_NAME) @Service(ExtPuchasePlanAttributeServiceImpl.BEAN_NAME)
public class ExtPurchasePlanServiceImpl<V extends ExtPurchasePlanVO> implements ExtPurchasePlanService<V>{ public class ExtPuchasePlanAttributeServiceImpl<V extends ExtPuchasePlanAttributeVO> implements ExtPuchasePlanAttributeService<V>{
public static final String BEAN_NAME = "extPurchasePlanServiceImpl"; public static final String BEAN_NAME = "extPuchasePlanAttributeServiceImpl";
@Autowired @Autowired
ExtPurchasePlanRepository<ExtPurchasePlan> extPurchasePlanRepository; ExtPuchasePlanAttributeRepository<ExtPuchasePlanAttribute> extPuchasePlanAttributeRepository;
} }
......
package com.yonde.dcs.plan.core.service.shadow; package com.yonde.dcs.plan.core.service.shadow;
import com.yonde.dcs.plan.common.vo.ExtPurchasePlanVO; import com.yonde.dcs.plan.common.vo.ExtPuchasePlanAttributeVO;
import com.yonde.dcs.plan.feign.ExtPurchasePlanServiceFeign; import com.yonde.dcs.plan.feign.ExtPuchasePlanAttributeServiceFeign;
import com.yonde.dex.dao.service.BaseIdEntityService; import com.yonde.dex.dao.service.BaseIdEntityService;
import com.yonde.dex.secretcode.plugin.core.service.SecretCodePluginService; import com.yonde.dex.secretcode.plugin.core.service.SecretCodePluginService;
import com.yonde.dex.version.plugin.core.service.IterationService; import com.yonde.dex.version.plugin.core.service.IterationService;
import com.yonde.dex.context.plugin.core.service.ContextPluginService; import com.yonde.dex.context.plugin.core.service.ContextPluginService;
import com.yonde.dex.lcycle.plugin.core.service.LifecycleBaseService; 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.dfs.objfilelink.plugin.core.service.ObjFileLinkPluginService;
/** /**
* @description: ExtPurchasePlan-service * @description: ExtPuchasePlanAttribute-service
* @author: dexadmin * @author: dexadmin
* @version: V * @version: V
* @date: 2024-8-29 9:31:22 * @date: 2024-8-29 17:14:49
**/ **/
public interface ExtPurchasePlanServiceShadow<V extends ExtPurchasePlanVO> extends ExtPurchasePlanServiceFeign<V>, ContextPluginService<V> ,ObjFileLinkPluginService<V> ,LifecycleBaseService<V> ,BaseIdEntityService<V> ,SecretCodePluginService<V> ,IterationService<V> { public interface ExtPuchasePlanAttributeServiceShadow<V extends ExtPuchasePlanAttributeVO> extends ExtPuchasePlanAttributeServiceFeign<V>, ContextPluginService<V> ,ObjFileLinkPluginService<V> ,LifecycleBaseService<V> ,BaseIdEntityService<V> ,LogicDeleteService<V> ,IterationService<V> ,SecretCodePluginService<V> {
} }
...@@ -8,7 +8,7 @@ import com.yonde.dex.dao.service.BaseIdEntityService; ...@@ -8,7 +8,7 @@ import com.yonde.dex.dao.service.BaseIdEntityService;
* @description: ExtPurchasePlanDocLink-service * @description: ExtPurchasePlanDocLink-service
* @author: dexadmin * @author: dexadmin
* @version: V * @version: V
* @date: 2024-8-29 9:31:22 * @date: 2024-8-29 17:14:50
**/ **/
public interface ExtPurchasePlanDocLinkServiceShadow<V extends ExtPurchasePlanDocLinkVO> extends ExtPurchasePlanDocLinkServiceFeign<V>, BaseIdEntityService<V> ,DxLinkDataService<V> { public interface ExtPurchasePlanDocLinkServiceShadow<V extends ExtPurchasePlanDocLinkVO> extends ExtPurchasePlanDocLinkServiceFeign<V>, BaseIdEntityService<V> ,DxLinkDataService<V> {
......
...@@ -4,12 +4,12 @@ ...@@ -4,12 +4,12 @@
<parent> <parent>
<groupId>com.yonde.dcs</groupId> <groupId>com.yonde.dcs</groupId>
<artifactId>dcs-plan</artifactId> <artifactId>dcs-plan</artifactId>
<version>4.1-RELEASE</version> <version>4.1-20240826-RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>dcs-plan-entity</artifactId> <artifactId>dcs-plan-entity</artifactId>
<version>4.1-RELEASE</version> <version>4.1-20240826-RELEASE</version>
<properties> <properties>
<maven.compiler.source>8</maven.compiler.source> <maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target> <maven.compiler.target>8</maven.compiler.target>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<dependency> <dependency>
<groupId>com.yonde.dcs</groupId> <groupId>com.yonde.dcs</groupId>
<artifactId>dcs-plan-common</artifactId> <artifactId>dcs-plan-common</artifactId>
<version>4.1-RELEASE</version> <version>4.1-20240826-RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.yonde.dex</groupId> <groupId>com.yonde.dex</groupId>
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<dependency> <dependency>
<groupId>com.yonde.dex</groupId> <groupId>com.yonde.dex</groupId>
<artifactId>dex-context-plugin-entities</artifactId> <artifactId>dex-context-plugin-entities</artifactId>
<version>4.1-20240809-RELEASE</version> <version>4.1-20240826-RELEASE</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
......
...@@ -29,26 +29,28 @@ import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkEmbeddable; ...@@ -29,26 +29,28 @@ import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkEmbeddable;
import com.yonde.dex.context.plugin.entities.DxContextEmbeddable; import com.yonde.dex.context.plugin.entities.DxContextEmbeddable;
import com.yonde.dex.dao.entity.base.IdOnlyEntity; import com.yonde.dex.dao.entity.base.IdOnlyEntity;
import com.yonde.dex.version.plugin.entities.DxIterationHolder; 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 com.yonde.dex.dao.entity.base.IdEntity;
import javax.persistence.Column; import javax.persistence.Column;
import com.yonde.dex.secretcode.plugin.entities.DxSecretHolder; import com.yonde.dex.secretcode.plugin.entities.DxSecretHolder;
import com.yonde.dex.lcycle.plugin.entities.DxLifecycleManageBaseHolder; import com.yonde.dex.lcycle.plugin.entities.DxLifecycleManageBaseHolder;
import com.yonde.dex.dao.entity.base.DxIdEntityEmbeddable; import com.yonde.dex.dao.entity.base.DxIdEntityEmbeddable;
import com.yonde.dex.secretcode.plugin.entities.DxSecretEmbeddable; import com.yonde.dex.secretcode.plugin.entities.DxSecretEmbeddable;
import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteEmbeddable;
import com.yonde.dex.version.plugin.entities.DxIterationEmbeddable; import com.yonde.dex.version.plugin.entities.DxIterationEmbeddable;
/** /**
* @description: ExtPurchasePlan-PO实体 * @description: ExtPuchasePlanAttribute-PO实体
* @author: dexadmin * @author: dexadmin
* @version: V * @version: V
* @date: 2024-8-29 9:31:22 * @date: 2024-8-29 17:14:49
**/ **/
@Entity @Entity
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@NoArgsConstructor @NoArgsConstructor
@Data @Data
@Table(name = "EXT_PURCHASE_PLAN") @Table(name = "EXT_PUCHASE_PLAN_ATTRIBUTE")
public class ExtPurchasePlan extends IdOnlyEntity implements DxContextHolder ,DxObjFileLinkHolder ,DxLifecycleManageBaseHolder ,IdEntity ,DxSecretHolder ,DxIterationHolder{ public class ExtPuchasePlanAttribute extends IdOnlyEntity implements DxContextHolder ,DxObjFileLinkHolder ,DxLifecycleManageBaseHolder ,IdEntity ,DxLogicDeleteHolder ,DxIterationHolder ,DxSecretHolder{
/** /**
* 扩展PO属性 * 扩展PO属性
...@@ -79,7 +81,7 @@ public class ExtPurchasePlan extends IdOnlyEntity implements DxContextHolder ,Dx ...@@ -79,7 +81,7 @@ public class ExtPurchasePlan extends IdOnlyEntity implements DxContextHolder ,Dx
*/ */
@DexEmbedded() @DexEmbedded()
@Embedded() @Embedded()
private DxSecretEmbeddable dxSecretEmbeddable; private DxLogicDeleteEmbeddable dxLogicDeleteEmbeddable;
/** /**
* 扩展PO属性 * 扩展PO属性
*/ */
...@@ -87,21 +89,51 @@ public class ExtPurchasePlan extends IdOnlyEntity implements DxContextHolder ,Dx ...@@ -87,21 +89,51 @@ public class ExtPurchasePlan extends IdOnlyEntity implements DxContextHolder ,Dx
@Embedded() @Embedded()
private DxIterationEmbeddable dxIterationEmbeddable; private DxIterationEmbeddable dxIterationEmbeddable;
/** /**
* 文件编号 * 扩展PO属性
*/
@DexEmbedded()
@Embedded()
private DxSecretEmbeddable dxSecretEmbeddable;
/**
* 合同实际交付时间
*/
private LocalDateTime contractActualDeliveryTime;
/**
* 合同实际签订时间
*/
private LocalDateTime contractActualSigningTime;
/**
* 合同交付时间
*/
private LocalDateTime contractDeliveryTime;
/**
* 合同签订时间
*/
private LocalDateTime contractSigningTime;
/**
* 外协项目名称
*/
private String outsourceProjectName;
/**
* 计划编码
*/
private String planCode;
/**
* 采购技术文件实际提交时间
*/ */
private String fileCode; private LocalDateTime purDesignFileActualSubmitTime;
/** /**
* 文件名称 * 采购技术文件负责人
*/ */
private String fileName; private String purDesignFileManager;
/** /**
* 项目代号 * 采购技术文件提交时间
*/ */
private String projectCode; private LocalDateTime purDesignFileSubmitTime;
/** /**
* 采购计划文件 * 采购预算
*/ */
private String purchasePlanFile; private String purchaseBudget;
} }
...@@ -33,7 +33,7 @@ import com.yonde.dex.linkdata.plugin.entities.DxLinkDataEmbeddable; ...@@ -33,7 +33,7 @@ import com.yonde.dex.linkdata.plugin.entities.DxLinkDataEmbeddable;
* @description: ExtPurchasePlanDocLink-PO实体 * @description: ExtPurchasePlanDocLink-PO实体
* @author: dexadmin * @author: dexadmin
* @version: V * @version: V
* @date: 2024-8-29 9:31:22 * @date: 2024-8-29 17:14:50
**/ **/
@Entity @Entity
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.yonde.dcs</groupId> <groupId>com.yonde.dcs</groupId>
<artifactId>dcs-plan</artifactId> <artifactId>dcs-plan</artifactId>
<version>4.1-RELEASE</version> <version>4.1-20240826-RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<dependency> <dependency>
<groupId>com.yonde.dcs</groupId> <groupId>com.yonde.dcs</groupId>
<artifactId>dcs-plan-common</artifactId> <artifactId>dcs-plan-common</artifactId>
<version>4.1-RELEASE</version> <version>4.1-20240826-RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.yonde.dex</groupId> <groupId>com.yonde.dex</groupId>
...@@ -47,12 +47,12 @@ ...@@ -47,12 +47,12 @@
<dependency> <dependency>
<groupId>com.yonde.dcs</groupId> <groupId>com.yonde.dcs</groupId>
<artifactId>dcs-doc-feign</artifactId> <artifactId>dcs-doc-feign</artifactId>
<version>4.1-RELEASE</version> <version>4.1-20240826-RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.yonde.dex</groupId> <groupId>com.yonde.dex</groupId>
<artifactId>dex-basic-service-feign</artifactId> <artifactId>dex-basic-service-feign</artifactId>
<version>4.1-RELEASE</version> <version>4.1-20240826-RELEASE</version>
</dependency> </dependency>
</dependencies> </dependencies>
......
package com.yonde.dcs.plan.feign; package com.yonde.dcs.plan.feign;
import com.yonde.dcs.plan.common.vo.ExtPurchasePlanVO; import com.yonde.dcs.plan.common.vo.ExtPuchasePlanAttributeVO;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.yonde.dcs.plan.feign.shadow.ExtPurchasePlanServiceFeignShadow; import com.yonde.dcs.plan.feign.shadow.ExtPuchasePlanAttributeServiceFeignShadow;
/** /**
* @description: ExtPurchasePlan-Feign * @description: ExtPuchasePlanAttribute-Feign
* @author: dexadmin * @author: dexadmin
* @version: V * @version: V
* @date: 2024-8-29 9:31:22 * @date: 2024-8-29 17:14:49
**/ **/
@Api(tags = "ExtPurchasePlan-FEIGN") @Api(tags = "ExtPuchasePlanAttribute-FEIGN")
@FeignClient(value = "${dcs.feign.INET-PLAN}", path = "/ExtPurchasePlan") @FeignClient(value = "${dcs.feign.INET-PLAN}", path = "/ExtPuchasePlanAttribute")
public interface ExtPurchasePlanServiceFeign<V extends ExtPurchasePlanVO> extends ExtPurchasePlanServiceFeignShadow<V> { public interface ExtPuchasePlanAttributeServiceFeign<V extends ExtPuchasePlanAttributeVO> extends ExtPuchasePlanAttributeServiceFeignShadow<V> {
} }
...@@ -10,7 +10,7 @@ import com.yonde.dcs.plan.feign.shadow.ExtPurchasePlanDocLinkServiceFeignShadow; ...@@ -10,7 +10,7 @@ import com.yonde.dcs.plan.feign.shadow.ExtPurchasePlanDocLinkServiceFeignShadow;
* @description: ExtPurchasePlanDocLink-Feign * @description: ExtPurchasePlanDocLink-Feign
* @author: dexadmin * @author: dexadmin
* @version: V * @version: V
* @date: 2024-8-29 9:31:22 * @date: 2024-8-29 17:14:50
**/ **/
@Api(tags = "ExtPurchasePlanDocLink-FEIGN") @Api(tags = "ExtPurchasePlanDocLink-FEIGN")
@FeignClient(value = "${dcs.feign.INET-PLAN}", path = "/ExtPurchasePlanDocLink") @FeignClient(value = "${dcs.feign.INET-PLAN}", path = "/ExtPurchasePlanDocLink")
......
package com.yonde.dcs.plan.feign.shadow; package com.yonde.dcs.plan.feign.shadow;
import com.yonde.dcs.plan.common.vo.ExtPurchasePlanVO; import com.yonde.dcs.plan.common.vo.ExtPuchasePlanAttributeVO;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
...@@ -11,15 +11,16 @@ import com.yonde.dex.version.plugin.feign.BaseVersionFeign; ...@@ -11,15 +11,16 @@ import com.yonde.dex.version.plugin.feign.BaseVersionFeign;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder; import com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder;
import com.yonde.dex.context.plugin.feign.ContextPluginFeign; import com.yonde.dex.context.plugin.feign.ContextPluginFeign;
import com.yonde.dex.logicdelete.plugin.feign.LogicDeleteFeign;
/** /**
* @description: ExtPurchasePlan-Feign * @description: ExtPuchasePlanAttribute-Feign
* @author: dexadmin * @author: dexadmin
* @version: V * @version: V
* @date: 2024-8-29 9:31:22 * @date: 2024-8-29 17:14:49
**/ **/
public interface ExtPurchasePlanServiceFeignShadow<V extends ExtPurchasePlanVO> extends ContextPluginFeign<V> ,BaseLifecycleManageFeign<V> ,BaseFeign<V> ,SecretCodeFeign<V> ,BaseVersionFeign<V> { public interface ExtPuchasePlanAttributeServiceFeignShadow<V extends ExtPuchasePlanAttributeVO> extends ContextPluginFeign<V> ,BaseLifecycleManageFeign<V> ,BaseFeign<V> ,LogicDeleteFeign<V> ,BaseVersionFeign<V> ,SecretCodeFeign<V> {
String BEAN_NAME = "extPurchasePlanServiceFeign"; String BEAN_NAME = "extPuchasePlanAttributeServiceFeign";
} }
...@@ -11,7 +11,7 @@ import com.yonde.dex.linkdata.plugin.feign.DxLinkDataFeign; ...@@ -11,7 +11,7 @@ import com.yonde.dex.linkdata.plugin.feign.DxLinkDataFeign;
* @description: ExtPurchasePlanDocLink-Feign * @description: ExtPurchasePlanDocLink-Feign
* @author: dexadmin * @author: dexadmin
* @version: V * @version: V
* @date: 2024-8-29 9:31:22 * @date: 2024-8-29 17:14:50
**/ **/
public interface ExtPurchasePlanDocLinkServiceFeignShadow<V extends ExtPurchasePlanDocLinkVO> extends BaseFeign<V> ,DxLinkDataFeign<V> { public interface ExtPurchasePlanDocLinkServiceFeignShadow<V extends ExtPurchasePlanDocLinkVO> extends BaseFeign<V> ,DxLinkDataFeign<V> {
......
...@@ -4,12 +4,12 @@ ...@@ -4,12 +4,12 @@
<parent> <parent>
<groupId>com.yonde.dcs</groupId> <groupId>com.yonde.dcs</groupId>
<artifactId>dcs-plan</artifactId> <artifactId>dcs-plan</artifactId>
<version>4.1-RELEASE</version> <version>4.1-20240826-RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging> <packaging>jar</packaging>
<artifactId>dcs-plan-server</artifactId> <artifactId>dcs-plan-server</artifactId>
<version>4.1-RELEASE</version> <version>4.1-20240826-RELEASE</version>
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<dependency> <dependency>
<groupId>com.yonde.dcs</groupId> <groupId>com.yonde.dcs</groupId>
<artifactId>dcs-plan-core</artifactId> <artifactId>dcs-plan-core</artifactId>
<version>4.1-RELEASE</version> <version>4.1-20240826-RELEASE</version>
</dependency> </dependency>
<!--公共依赖--> <!--公共依赖-->
......
...@@ -4,12 +4,12 @@ ...@@ -4,12 +4,12 @@
<parent> <parent>
<groupId>com.yonde.dcs</groupId> <groupId>com.yonde.dcs</groupId>
<artifactId>dcs-integration-dependences</artifactId> <artifactId>dcs-integration-dependences</artifactId>
<version>4.1-20240809-RELEASE</version> <version>4.1-20240826-RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>
<artifactId>dcs-plan</artifactId> <artifactId>dcs-plan</artifactId>
<version>4.1-RELEASE</version> <version>4.1-20240826-RELEASE</version>
<groupId>com.yonde.dcs</groupId> <groupId>com.yonde.dcs</groupId>
<modules> <modules>
<module>dcs-plan-core</module> <module>dcs-plan-core</module>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment