From 0fbd7abc1059eb0d1ef3a7ee027bf1907b7da2da Mon Sep 17 00:00:00 2001 From: OTTO <731554297@qq.com> Date: Mon, 16 Dec 2024 08:49:14 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E9=9C=80=E6=B1=82=E9=87=8D=E6=9E=84):=20?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BA=A7=E5=93=81=E9=87=8C=E7=A8=8B=E7=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 查询需求规格列表时返回关联的产品计划 Signed-off-by: OTTO <731554297@qq.com> --- .../product/domain/vo/ProductReqSpecsDataVo.java | 4 ++++ .../product/domain/vo/ProductReqSpecsDetailVo.java | 4 ---- .../impl/PmsProductRequirementServiceImpl.java | 14 +++++++++----- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductReqSpecsDataVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductReqSpecsDataVo.java index a66072452..45491bb48 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductReqSpecsDataVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductReqSpecsDataVo.java @@ -3,6 +3,7 @@ package com.microservices.pms.product.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import com.microservices.common.core.utils.bean.BeanUtils; import com.microservices.pms.product.domain.PmsProductModule; +import com.microservices.pms.product.domain.PmsProductPlan; import com.microservices.system.api.domain.SimpleSysUser; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -43,6 +44,9 @@ public class ProductReqSpecsDataVo { @ApiModelProperty(value = "关联产品模块") private PmsProductModule pmsProductModule; + @ApiModelProperty(value = "关联产品里程碑") + private PmsProductPlan pmsProductPlan; + public ProductReqSpecsDetailVo toProductReqSpecsDetailVo() { ProductReqSpecsDetailVo target = new ProductReqSpecsDetailVo(); BeanUtils.copyProperties(this, target); diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductReqSpecsDetailVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductReqSpecsDetailVo.java index 7c23bad47..c5c557b7c 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductReqSpecsDetailVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductReqSpecsDetailVo.java @@ -2,7 +2,6 @@ package com.microservices.pms.product.domain.vo; import com.alibaba.fastjson2.JSONObject; import com.fasterxml.jackson.annotation.JsonFormat; -import com.microservices.pms.product.domain.PmsProductPlan; import com.microservices.pms.project.domain.PmsProject; import com.microservices.system.api.domain.SimpleSysUser; import com.microservices.system.api.domain.SysFileInfo; @@ -34,9 +33,6 @@ public class ProductReqSpecsDetailVo extends ProductReqSpecsDataVo { @ApiModelProperty(value = "关联项目") private PmsProject project; - @ApiModelProperty(value = "关联产品里程碑") - private PmsProductPlan pmsProductPlan; - @ApiModelProperty(value = "创建人") private SimpleSysUser createBy; diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductRequirementServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductRequirementServiceImpl.java index 0d8f94b13..be1773bac 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductRequirementServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductRequirementServiceImpl.java @@ -420,6 +420,15 @@ public class PmsProductRequirementServiceImpl implements IPmsProductRequirementS , pmsProductRequirement.getPmsProductModuleId()) ); } + // 设置产品计划 + if (pmsProductRequirement.getPmsProductPlanId() != null) { + productReqSpecsDataVo.setPmsProductPlan( + PmsUtils.getSelectObjectInCache( + hashMap + , x -> pmsProductPlanService.selectPmsProductPlanById(x, false) + , pmsProductRequirement.getPmsProductPlanId()) + ); + } // 设置创建人 productReqSpecsDataVo.setCreateBy( PmsUtils.getSelectObjectInCache( @@ -638,11 +647,6 @@ public class PmsProductRequirementServiceImpl implements IPmsProductRequirementS pmsProjectIssuesService.selectPmsProjectIssueById(pmsProductRequirement.getProjectReqId(), pmsProductRequirement.getPmsProjectId())); } } - // 设置产品计划 - if (pmsProductRequirement.getPmsProductPlanId() != null) { - productReqSpecsDetailVo.setPmsProductPlan( - pmsProductPlanService.selectPmsProductPlanById(pmsProductRequirement.getPmsProductPlanId(), false)); - } productReqSpecsDetailVo.setCreateBy(pmsCommonService.getSimpleSysUserByUsername(pmsProductRequirement.getCreateBy())); productReqSpecsDetailVo.setCreateTime(pmsProductRequirement.getCreateTime()); if (ProductReqStatus.CHANGING_REQ_SPECS.getKey().equals(pmsProductRequirement.getStatus())) {