From 53d7d12a645abee33d5fe891935eaaf9d5948bae Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Wed, 15 Nov 2023 17:30:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E4=BF=A1=E6=81=AF=20?= =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ConstructionController.java | 17 ++++ .../controller/DeclaredProjectController.java | 10 +++ .../projectdeclared/manage/ConstructionManage.java | 94 +++++++++++++++++++-- .../manage/DeclaredProjectManage.java | 20 ++++- .../model/dto/PaymentPlanSaveDTO.java | 6 ++ .../model/dto/PaymentPlanSupplementDTO.java | 34 ++++++++ .../projectdeclared/model/entity/PaymentPlan.java | 8 +- .../projectdeclared/model/entity/ProjectDraft.java | 3 + .../projectdeclared/model/vo/PaymentPlanVO.java | 9 +- .../model/vo/ProjectContractListVO.java | 95 ++++++++++++++++++++++ .../projectdeclared/model/vo/ProjectDraftVO.java | 3 + .../pmapi/projectlib/model/dto/ProjectDTO.java | 3 + .../pmapi/projectlib/model/entity/Project.java | 3 + .../pmapi/projectlib/model/vo/ProjectDetailVO.java | 3 + 14 files changed, 297 insertions(+), 11 deletions(-) create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/dto/PaymentPlanSupplementDTO.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectContractListVO.java diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/ConstructionController.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/ConstructionController.java index 88adb5c..bddfb55 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/ConstructionController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/ConstructionController.java @@ -5,9 +5,12 @@ import com.ningdatech.log.annotation.WebLog; import com.ningdatech.pmapi.common.util.ExcelDownUtil; import com.ningdatech.pmapi.projectdeclared.manage.ConstructionManage; import com.ningdatech.pmapi.projectdeclared.model.dto.ContractSaveDTO; +import com.ningdatech.pmapi.projectdeclared.model.dto.PaymentPlanSaveDTO; +import com.ningdatech.pmapi.projectdeclared.model.dto.PaymentPlanSupplementDTO; import com.ningdatech.pmapi.projectdeclared.model.dto.PreInsSaveDTO; import com.ningdatech.pmapi.projectdeclared.model.vo.ContractVO; import com.ningdatech.pmapi.projectdeclared.model.vo.PreInsVO; +import com.ningdatech.pmapi.projectdeclared.model.vo.ProjectContractListVO; import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq; import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO; import io.swagger.annotations.Api; @@ -17,6 +20,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * @Classname ConstructionController @@ -39,6 +43,12 @@ public class ConstructionController { return constructionManage.projectLibList(req); } + @ApiOperation(value = "已经完善合同信息的项目列表", notes = "已经完善合同信息的项目列表") + @GetMapping("/contract/project-list-perfect") + public PageVo projectlistPerfect(@ModelAttribute ProjectListReq req) { + return constructionManage.projectlistPerfect(req); + } + @GetMapping("/contract/export") @ApiOperation("待合同备案的项目列表导出") @WebLog("待合同备案的项目列表导出") @@ -59,6 +69,13 @@ public class ConstructionController { return constructionManage.submitContract(dto); } + @ApiOperation(value = "补充实际支付金额", notes = "补充实际支付金额") + @WebLog("补充实际支付金额") + @PostMapping("/supplement") + public String supplement(@Validated @RequestBody List plans) { + return constructionManage.supplement(plans); + } + @ApiOperation(value = "待初验备案的项目列表", notes = "待初验备案的项目列表") @GetMapping("/pre-ins/project-list") public PageVo preProjectList(@ModelAttribute ProjectListReq req) { diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/DeclaredProjectController.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/DeclaredProjectController.java index d7d8944..06a654c 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/DeclaredProjectController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/DeclaredProjectController.java @@ -3,6 +3,7 @@ package com.ningdatech.pmapi.projectdeclared.controller; import javax.servlet.http.HttpServletResponse; import com.ningdatech.log.annotation.WebLog; +import com.ningdatech.pmapi.gov.manage.GovProjectCollectionManage; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import com.alibaba.fastjson.JSONObject; @@ -39,6 +40,8 @@ public class DeclaredProjectController { private final ProjectAdjustmentManage projectAdjustmentManage; + private final GovProjectCollectionManage collectionManage; + @ApiOperation(value = "申报项目已申报列表", notes = "申报项目已申报列表") @GetMapping("/list") public PageVo list(@ModelAttribute ProjectListReq req) { @@ -94,4 +97,11 @@ public class DeclaredProjectController { public void exportList(ProjectListReq req, HttpServletResponse response){ ExcelDownUtil.downXls(response,req,declaredProjectManage::exportList); } + + @PostMapping("/remove/{projectCode}") + @ApiOperation("申报项目删除-预审失败") + @WebLog("申报项目删除-预审失败") + public String remove(@PathVariable String projectCode){ + return declaredProjectManage.removeProject(projectCode); + } } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionManage.java index d93e548..d9bd4a2 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionManage.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.collect.Lists; +import com.ningdatech.basic.exception.BizException; import com.ningdatech.basic.function.VUtils; import com.ningdatech.basic.model.PageVo; import com.ningdatech.basic.util.CollUtils; @@ -16,17 +17,12 @@ import com.ningdatech.pmapi.common.helper.UserInfoHelper; import com.ningdatech.pmapi.common.statemachine.util.StateMachineUtils; import com.ningdatech.pmapi.common.util.ExcelDownUtil; import com.ningdatech.pmapi.common.util.ExcelExportStyle; -import com.ningdatech.pmapi.projectdeclared.model.dto.ContractSaveDTO; -import com.ningdatech.pmapi.projectdeclared.model.dto.DeclaredProjectExportDTO; -import com.ningdatech.pmapi.projectdeclared.model.dto.PreInsSaveDTO; +import com.ningdatech.pmapi.projectdeclared.model.dto.*; import com.ningdatech.pmapi.projectdeclared.model.entity.Contract; import com.ningdatech.pmapi.projectdeclared.model.entity.PaymentPlan; import com.ningdatech.pmapi.projectdeclared.model.entity.PreInsAcceptancePerson; import com.ningdatech.pmapi.projectdeclared.model.entity.Purchase; -import com.ningdatech.pmapi.projectdeclared.model.vo.ContractVO; -import com.ningdatech.pmapi.projectdeclared.model.vo.PaymentPlanVO; -import com.ningdatech.pmapi.projectdeclared.model.vo.PreInsAcceptancePersonVO; -import com.ningdatech.pmapi.projectdeclared.model.vo.PreInsVO; +import com.ningdatech.pmapi.projectdeclared.model.vo.*; import com.ningdatech.pmapi.projectdeclared.service.IContractService; import com.ningdatech.pmapi.projectdeclared.service.IPaymentPlanService; import com.ningdatech.pmapi.projectdeclared.service.IPreInsAcceptancePersonService; @@ -129,6 +125,66 @@ public class ConstructionManage { return PageVo.of(records, total); } + /** + * 已完善合同信息的列表 + * @param req + * @return + */ + public PageVo projectlistPerfect(ProjectListReq req) { + UserFullInfoDTO user = userInfoHelper.getUserFullInfo(LoginUserUtil.getUserId()); + VUtils.isTrue(Objects.isNull(user)).throwMessage("获取登录用户失败!"); + LambdaQueryWrapper query = ProjectHelper.projectQuery(req); + //建设中状态以后的 都是 + query.gt(Project::getStatus, ProjectStatusEnum.UNDER_CONSTRUCTION.getCode()); + query.eq(Project::getNewest, Boolean.TRUE); + //只能看自己单位的 + query.eq(Project::getBuildOrgCode,user.getEmpPosUnitCode()); + query.orderByAsc(Project::getTransactionTime); + Page page = projectService.page(req.page(), query); + + if (CollUtil.isEmpty(page.getRecords())) { + return PageVo.empty(); + } + + List projects = page.getRecords(); + List projectCodes = projects.stream().map(Project::getProjectCode) + .collect(Collectors.toList()); + List paymentPlans = paymentPlanService.list(Wrappers.lambdaQuery(PaymentPlan.class) + .in(PaymentPlan::getProjectCode, projectCodes)); + Map> paymentMap = paymentPlans.stream() + .collect(Collectors.groupingBy(PaymentPlan::getProjectCode)); + + List records = CollUtils.convert(page.getRecords(), w -> { + ProjectContractListVO item = BeanUtil.copyProperties(w,ProjectContractListVO.class); + item.setBuildOrg(w.getBuildOrgName()); + item.setSupplemented(checkIsSupplement(w,paymentMap)); + return item; + }); + return PageVo.of(records, page.getTotal()); + } + + /** + * 判断 是否需要补充 + * @param w + * @param paymentMap + * @return + */ + private Boolean checkIsSupplement(Project w, Map> paymentMap) { + if(paymentMap.containsKey(w.getProjectCode())){ + List paymentPlans = paymentMap.get(w.getProjectCode()); + if(CollUtil.isEmpty(paymentPlans)){ + return Boolean.FALSE; + } + for (PaymentPlan plan : paymentPlans){ + if(Objects.isNull(plan.getActualPaymentAmount())){ + return Boolean.FALSE; + } + } + return Boolean.TRUE; + } + return Boolean.FALSE; + } + public void exportList(HttpServletResponse response, ProjectListReq param) { UserFullInfoDTO user = userInfoHelper.getUserFullInfo(LoginUserUtil.getUserId()); VUtils.isTrue(Objects.isNull(user)).throwMessage("获取登录用户失败!"); @@ -266,6 +322,7 @@ public class ConstructionManage { List payments = dto.getPayments().stream().map(d -> { PaymentPlan plan = BeanUtil.copyProperties(d, PaymentPlan.class); plan.setProjectId(projectId); + plan.setProjectCode(project.getProjectCode()); plan.setCreateOn(LocalDateTime.now()); plan.setUpdateOn(LocalDateTime.now()); plan.setCreateBy(employeeCode); @@ -482,4 +539,27 @@ public class ConstructionManage { return "填写成功"; } + + /** + * 补充项目 合同 实际支付信息 + * @param plans + * @return + */ + public String supplement(List plans) { + if(CollUtil.isEmpty(plans)){ + throw new BizException("入参"); + } + + for(PaymentPlanSupplementDTO plan : plans){ + PaymentPlan paymentPlan = paymentPlanService.getById(plan.getId()); + VUtils.isTrue(Objects.isNull(paymentPlan)) + .throwMessage("保存失败 该支付信息不存在 :" + plan.getId()); + VUtils.isTrue(Objects.nonNull(paymentPlan.getActualPaymentAmount())) + .throwMessage("保存失败 该支付信息已经保存过 实际支付金额 :" + plan.getId() + "," + paymentPlan.getActualPaymentAmount()); + paymentPlan.setActualPaymentAmount(plan.getActualPaymentAmount()); + paymentPlanService.updateById(paymentPlan); + } + + return "保存成功"; + } } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java index 816064b..c0960fd 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java @@ -9,6 +9,7 @@ import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.google.common.collect.Lists; import com.ningdatech.basic.function.VUtils; import com.ningdatech.basic.model.PageVo; import com.ningdatech.basic.util.CollUtils; @@ -22,6 +23,7 @@ import com.ningdatech.pmapi.common.helper.RegionCacheHelper; import com.ningdatech.pmapi.common.helper.UserInfoHelper; import com.ningdatech.pmapi.common.util.ExcelDownUtil; import com.ningdatech.pmapi.common.util.ExcelExportStyle; +import com.ningdatech.pmapi.gov.manage.GovProjectCollectionManage; import com.ningdatech.pmapi.irs.manage.ProjectIrsManage; import com.ningdatech.pmapi.irs.model.entity.ProjectCoreBiz; import com.ningdatech.pmapi.irs.service.IProjectCoreBizService; @@ -100,7 +102,7 @@ public class DeclaredProjectManage { private final ProjectIrsManage projectIrsManage; - private final IProjectCoreBizService coreBizService; + private final GovProjectCollectionManage collectionManage; @Value("${spring.profiles.active}") private String active; @@ -496,4 +498,20 @@ public class DeclaredProjectManage { } return jsonObject; } + + /** + * 预审失败的时候 可以删除项目 + * @param projectCode + */ + @Transactional + public String removeProject(String projectCode) { + Project project = projectService.getProjectByCode(projectCode); + VUtils.isTrue(Objects.isNull(project)) + .throwMessage("该项目不存在"); + VUtils.isTrue(Objects.isNull(project.getStatus()) || + !ProjectStatusEnum.PREQUALIFICATION_FAILED.getCode().equals(project.getStatus())) + .throwMessage("不是预审不通过 状态 不能删除！"); + + return collectionManage.removeProject(Lists.newArrayList(projectCode)); + } } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/dto/PaymentPlanSaveDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/dto/PaymentPlanSaveDTO.java index cac0f09..8135244 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/dto/PaymentPlanSaveDTO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/dto/PaymentPlanSaveDTO.java @@ -23,12 +23,18 @@ public class PaymentPlanSaveDTO { @ApiModelProperty("项目ID") private Long projectId; + @ApiModelProperty("项目编号") + private String projectCode; + @ApiModelProperty("付款计划") private String planAmount; @ApiModelProperty("支付金额") private BigDecimal paymentAmount; + @ApiModelProperty("实际支付金额") + private BigDecimal actualPaymentAmount; + @ApiModelProperty("支付时间") @JsonFormat(pattern = "yyyy-MM-dd") private LocalDateTime paymentTime; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/dto/PaymentPlanSupplementDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/dto/PaymentPlanSupplementDTO.java new file mode 100644 index 0000000..bbee7c7 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/dto/PaymentPlanSupplementDTO.java @@ -0,0 +1,34 @@ +package com.ningdatech.pmapi.projectdeclared.model.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * @Classname PaymentPlan + * @Description + * @Date 2023/5/30 16:11 + * @Author PoffyZhang + */ +@Data +@ApiModel(value = "PaymentPlanSupplementDTO", description = "") +public class PaymentPlanSupplementDTO { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("id") + @NotNull(message = "id必传") + private Long id; + + @ApiModelProperty("项目编号") + private String projectCode; + + @ApiModelProperty("实际支付金额") + private BigDecimal actualPaymentAmount; + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/PaymentPlan.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/PaymentPlan.java index 08dff7a..c3e99ec 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/PaymentPlan.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/PaymentPlan.java @@ -44,9 +44,15 @@ public class PaymentPlan { @ApiModelProperty("付款计划") private String planAmount; - @ApiModelProperty("支付金额") + @ApiModelProperty("项目编号") + private String projectCode; + + @ApiModelProperty("计划支付金额") private BigDecimal paymentAmount; + @ApiModelProperty("实际支付金额") + private BigDecimal actualPaymentAmount; + @ApiModelProperty("支付时间") private LocalDateTime paymentTime; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/ProjectDraft.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/ProjectDraft.java index 9a23022..b3c0a9b 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/ProjectDraft.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/ProjectDraft.java @@ -355,4 +355,7 @@ public class ProjectDraft implements Serializable { @ApiModelProperty("评审清单") private String reviewChecklist; + + @ApiModelProperty("是否推送省里") + private Boolean push; } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/PaymentPlanVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/PaymentPlanVO.java index 774cf2a..e87c2e6 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/PaymentPlanVO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/PaymentPlanVO.java @@ -2,7 +2,6 @@ package com.ningdatech.pmapi.projectdeclared.model.vo; import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.*; -import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -45,9 +44,15 @@ public class PaymentPlanVO { @ApiModelProperty("付款计划") private String planAmount; - @ApiModelProperty("支付金额") + @ApiModelProperty("项目编号") + private String projectCode; + + @ApiModelProperty("计划支付金额") private BigDecimal paymentAmount; + @ApiModelProperty("实际支付金额") + private BigDecimal actualPaymentAmount; + @ApiModelProperty("支付比例") private String ratio; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectContractListVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectContractListVO.java new file mode 100644 index 0000000..43d30bc --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectContractListVO.java @@ -0,0 +1,95 @@ +package com.ningdatech.pmapi.projectdeclared.model.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ningdatech.pmapi.common.compare.Compare; +import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeNewEnum; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Builder; +import lombok.Data; +import lombok.experimental.Tolerate; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.Objects; +import java.util.Optional; + +/** + *

+ * ProjectContractListVO + *

+ * + * @author ZPF + * @since 15:13 2023/11/15 + */ +@Data +@Builder +@ApiModel("合同项目库列表视图") +public class ProjectContractListVO { + + @Tolerate + public ProjectContractListVO() { + } + + @ApiModelProperty("项目ID") + private Long id; + + @ApiModelProperty("项目编号") + private String projectCode; + + @ApiModelProperty("区域") + private String area; + + @ApiModelProperty("区域Code") + private String areaCode; + + @ApiModelProperty("项目名称") + private String projectName; + + @ApiModelProperty("项目类型 01:首次建设 02:迭代升级 03:结转建设 04新运维 05续运维") + @Compare("项目类型") + private String projectType; + + @ApiModelProperty("项目阶段") + private Integer stage; + + @ApiModelProperty("项目状态") + private Integer status; + + @ApiModelProperty("申报年度") + private Integer projectYear; + + @ApiModelProperty("申报单位") + private String buildOrg; + + @ApiModelProperty("建设单位名称") + private String buildOrgName; + + private String projectTypeName; + + @ApiModelProperty("合同总金额") + private BigDecimal contractAmount; + + @ApiModelProperty("年度支付计划-年度支付计划(元)") + private BigDecimal annualPlanAmount; + + public String getProjectTypeName() { + if (Objects.nonNull(this.projectType)) { + Optional.ofNullable(ProjectTypeNewEnum.getDesc(this.projectType)) + .ifPresent(desc -> this.projectTypeName = desc); + } + return this.projectTypeName; + } + + @ApiModelProperty("创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") + private LocalDateTime createOn; + + @ApiModelProperty("修改时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") + private LocalDateTime updateOn; + + @ApiModelProperty("能否能补充") + private Boolean supplemented = Boolean.FALSE; + + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDraftVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDraftVO.java index 14ca3f0..422107b 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDraftVO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDraftVO.java @@ -358,4 +358,7 @@ public class ProjectDraftVO implements Serializable { private Long createBy; private Long updateBy; + + @ApiModelProperty("是否推送省里") + private Boolean push; } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java index ff71266..9e424a4 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java @@ -367,4 +367,7 @@ public class ProjectDTO implements Serializable { @ApiModelProperty("评审清单") private String reviewChecklist; + + @ApiModelProperty("是否推送省里") + private Boolean push; } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java index f681d4b..f03d0fa 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java @@ -564,4 +564,7 @@ public class Project implements Serializable { @ApiModelProperty("是否完成清单合并") private Boolean reviewCheckFinish; + + @ApiModelProperty("是否推送省里") + private Boolean push; } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java index 4244268..fcdc5da 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java @@ -546,4 +546,7 @@ public class ProjectDetailVO { @ApiModelProperty("是否开启评审清单") private Boolean reviewCheckFinish; + + @ApiModelProperty("是否推送省里") + private Boolean push; }