From da27fed59d48c084cb978333b1a4086797185a20 Mon Sep 17 00:00:00 2001 From: OTTO <731554297@qq.com> Date: Fri, 29 Nov 2024 10:20:00 +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=E4=B8=AD=E7=9A=84=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E9=9C=80=E6=B1=82=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新增接口：获取用户需求详细信息 Signed-off-by: OTTO <731554297@qq.com> --- .../controller/ProductUserReqController.java | 4 ++-- .../product/domain/vo/ProductUserReqDataVo.java | 4 ++-- ...DetailVo.java => ProductUserReqDetailVo.java} | 2 +- .../service/IPmsProductRequirementService.java | 2 +- .../impl/PmsProductRequirementServiceImpl.java | 16 ++++++++-------- 5 files changed, 14 insertions(+), 14 deletions(-) rename microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/{ProductReqUserDetailVo.java => ProductUserReqDetailVo.java} (90%) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/controller/ProductUserReqController.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/controller/ProductUserReqController.java index 1bb6bdfa1..7cf044d32 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/controller/ProductUserReqController.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/controller/ProductUserReqController.java @@ -4,8 +4,8 @@ import com.microservices.common.core.web.controller.BaseController; import com.microservices.common.core.web.domain.GenericsAjaxResult; import com.microservices.common.core.web.page.GenericsTableDataInfo; import com.microservices.common.security.annotation.RequiresPermissions; -import com.microservices.pms.product.domain.vo.ProductReqUserDetailVo; import com.microservices.pms.product.domain.vo.ProductUserReqDataVo; +import com.microservices.pms.product.domain.vo.ProductUserReqDetailVo; import com.microservices.pms.product.domain.vo.ProductUserReqSearchVo; import com.microservices.pms.product.service.IPmsProductModuleService; import com.microservices.pms.product.service.IPmsProductRequirementService; @@ -55,7 +55,7 @@ public class ProductUserReqController extends BaseController { @RequiresPermissions("pms:pmsProduct:show") @GetMapping(value = "/{id}") @ApiOperation(value = "获取用户需求详细信息") - public GenericsAjaxResult getInfo(@PathVariable("id") Long id) { + public GenericsAjaxResult getInfo(@PathVariable("id") Long id) { return genericsSuccess(pmsProductRequirementService.selectUserReqDetailById(id)); } } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductUserReqDataVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductUserReqDataVo.java index a27d8233d..9b34527e7 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductUserReqDataVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductUserReqDataVo.java @@ -52,8 +52,8 @@ public class ProductUserReqDataVo extends BaseEntityVo { @ApiModelProperty(value = "需求来源单位") private String sourceCompany; - public ProductReqUserDetailVo toProductReqUserDetailVo() { - ProductReqUserDetailVo target = new ProductReqUserDetailVo(); + public ProductUserReqDetailVo toProductReqUserDetailVo() { + ProductUserReqDetailVo target = new ProductUserReqDetailVo(); BeanUtils.copyProperties(this, target); return target; } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductReqUserDetailVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductUserReqDetailVo.java similarity index 90% rename from microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductReqUserDetailVo.java rename to microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductUserReqDetailVo.java index a6cfeaf35..f1969d0fc 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductReqUserDetailVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductUserReqDetailVo.java @@ -15,7 +15,7 @@ import java.util.List; */ @Data @ApiModel("用户需求详细数据对象") -public class ProductReqUserDetailVo extends ProductUserReqDataVo { +public class ProductUserReqDetailVo extends ProductUserReqDataVo { /** * 正文 */ diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/IPmsProductRequirementService.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/IPmsProductRequirementService.java index 0bd8c4285..675fb38d9 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/IPmsProductRequirementService.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/IPmsProductRequirementService.java @@ -140,5 +140,5 @@ public interface IPmsProductRequirementService */ GenericsTableDataInfo selectUserReqList(String enterpriseIdentifier, ProductUserReqSearchVo productUserReqSearchVo); - ProductReqUserDetailVo selectUserReqDetailById(Long id); + ProductUserReqDetailVo selectUserReqDetailById(Long id); } 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 23a162b12..d5407f230 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 @@ -191,24 +191,24 @@ public class PmsProductRequirementServiceImpl implements IPmsProductRequirementS } @Override - public ProductReqUserDetailVo selectUserReqDetailById(Long id) { + public ProductUserReqDetailVo selectUserReqDetailById(Long id) { PmsProductRequirement pmsProductRequirement = selectPmsProductRequirementById(id, false); - return toProductUserReqDetailVo(pmsProductRequirement)); + return toProductUserReqDetailVo(pmsProductRequirement); } - private ProductUserReqDataVo toProductUserReqDetailVo(PmsProductRequirement pmsProductRequirement) { + private ProductUserReqDetailVo toProductUserReqDetailVo(PmsProductRequirement pmsProductRequirement) { ProductUserReqDataVo productUserReqDataVo = toProductUserReqDataVo(pmsProductRequirement); - ProductReqUserDetailVo productReqUserDetailVo = productUserReqDataVo.toProductReqUserDetailVo(); - productReqUserDetailVo.setContent(pmsProductRequirement.getContent()); + ProductUserReqDetailVo productUserReqDetailVo = productUserReqDataVo.toProductReqUserDetailVo(); + productUserReqDetailVo.setContent(pmsProductRequirement.getContent()); // 设置文件列表 - productReqUserDetailVo.setFileList(pmsCommonService.getAllFileByFileIdentifiers(pmsProductRequirement.getFileIdentifiers()) + productUserReqDetailVo.setFileList(pmsCommonService.getAllFileByFileIdentifiers(pmsProductRequirement.getFileIdentifiers()) ); // 设置产品模块 if (pmsProductRequirement.getPmsProductModuleId() != null) { - productReqUserDetailVo.setPmsProductModule( + productUserReqDetailVo.setPmsProductModule( pmsProductModuleService.selectPmsProductModuleById(pmsProductRequirement.getPmsProductModuleId(), false)); } - return productUserReqDataVo; + return productUserReqDetailVo; } /**