From 9a4e79098c343e234967c0ed3ea71eadd0ca4d01 Mon Sep 17 00:00:00 2001 From: OTTO <731554297@qq.com> Date: Fri, 20 Dec 2024 11:53:01 +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=9C=80=E6=B1=82=E8=A7=84?= =?UTF-8?q?=E6=A0=BC=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 全部模块和无所属模块需求数量统计错误 Signed-off-by: OTTO <731554297@qq.com> --- .../dashboard/controller/PmsDashboardController.java | 8 ++------ .../product/mapper/PmsProductRequirementMapper.java | 3 +-- .../service/IPmsProductRequirementService.java | 2 +- .../service/impl/PmsProductModuleServiceImpl.java | 4 ++-- .../impl/PmsProductRequirementServiceImpl.java | 4 ++-- .../mapper/pms/PmsProductRequirementMapper.xml | 12 ++++++++---- 6 files changed, 16 insertions(+), 17 deletions(-) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/dashboard/controller/PmsDashboardController.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/dashboard/controller/PmsDashboardController.java index 9645e37b5..40a25a3e7 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/dashboard/controller/PmsDashboardController.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/dashboard/controller/PmsDashboardController.java @@ -27,12 +27,8 @@ import com.microservices.pms.project.service.IPmsProjectSprintService; import com.microservices.pms.project.service.PmsProjectIssuesService; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; @@ -86,7 +82,7 @@ public class PmsDashboardController extends BaseController { PmsProductRequirement pmsProductRequirement = new PmsProductRequirement(); pmsProductRequirement.setProductIdentifierList(pmsProductList.stream().map(PmsProduct::getProductIdentifier).collect(Collectors.toList())); pmsProductRequirement.setCreateBy(SecurityUtils.getUsername()); - Integer requirementCount = pmsProductRequirementService.selectPmsProductRequirementCount(pmsProductRequirement); + Integer requirementCount = pmsProductRequirementService.selectProductReqSpecsCount(pmsProductRequirement); myDashboardVo.setProductRequirementCount(requirementCount); } return success(myDashboardVo); diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/mapper/PmsProductRequirementMapper.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/mapper/PmsProductRequirementMapper.java index 13b332c64..e480e6a76 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/mapper/PmsProductRequirementMapper.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/mapper/PmsProductRequirementMapper.java @@ -9,7 +9,6 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Map; /** * 产品需求Mapper接口 @@ -74,7 +73,7 @@ public interface PmsProductRequirementMapper * @param pmsProductRequirementSearch * @return */ - Integer selectPmsProductRequirementCount(PmsProductRequirement pmsProductRequirementSearch); + Integer selectProductReqSpecsCount(PmsProductRequirement pmsProductRequirementSearch); /** * 获取当前产品下需求的最大索引值 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 42093dc2b..15ad4c0d0 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 @@ -55,7 +55,7 @@ public interface IPmsProductRequirementService * @param pmsProductRequirement 产品需求查询字段 * @return 数量 */ - Integer selectPmsProductRequirementCount(PmsProductRequirement pmsProductRequirement); + Integer selectProductReqSpecsCount(PmsProductRequirement pmsProductRequirement); /** * 删除产品下所有需求 diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductModuleServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductModuleServiceImpl.java index 433757849..0a8a03eea 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductModuleServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductModuleServiceImpl.java @@ -286,11 +286,11 @@ public class PmsProductModuleServiceImpl implements IPmsProductModuleService // 计算全部需求数量 PmsProductRequirement pmsProductRequirementSearch = new PmsProductRequirement(); pmsProductRequirementSearch.setPmsProductIdentifier(pmsProductModule.getPmsProductIdentifier()); - allNodeDataCount = pmsProductRequirementService.selectPmsProductRequirementCount(pmsProductRequirementSearch); + allNodeDataCount = pmsProductRequirementService.selectProductReqSpecsCount(pmsProductRequirementSearch); // 计算无所属模块的需求数量 pmsProductRequirementSearch.setPmsProductModuleId(0L); - noModuleNodeDataCount = pmsProductRequirementService.selectPmsProductRequirementCount(pmsProductRequirementSearch); + noModuleNodeDataCount = pmsProductRequirementService.selectProductReqSpecsCount(pmsProductRequirementSearch); } else if (type == PmsConstants.TESTSHEET_TAG_AND_MODULE_TYPE) { // 设置各节点数量为测试单执行用例数量 moduleList.forEach(x -> x.setNodeDataCount(x.getTestsheetCasesCount())); 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 9050d67b2..3e718ca36 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 @@ -815,8 +815,8 @@ public class PmsProductRequirementServiceImpl implements IPmsProductRequirementS } @Override - public Integer selectPmsProductRequirementCount(PmsProductRequirement pmsProductRequirementSearch) { - return pmsProductRequirementMapper.selectPmsProductRequirementCount(pmsProductRequirementSearch); + public Integer selectProductReqSpecsCount(PmsProductRequirement pmsProductRequirementSearch) { + return pmsProductRequirementMapper.selectProductReqSpecsCount(pmsProductRequirementSearch); } /** diff --git a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProductRequirementMapper.xml b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProductRequirementMapper.xml index 5ad5f6bbb..a704a6c06 100644 --- a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProductRequirementMapper.xml +++ b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProductRequirementMapper.xml @@ -114,9 +114,9 @@ order by update_time desc - select count(0) from pms_product_requirement - + @@ -202,6 +202,11 @@ + + and title like concat('%', #{title}, '%') and create_by = #{createBy} @@ -232,8 +237,7 @@ and (`status`= 'pendingReviewReqSpecs' or `status`= 'plannedReqSpecs' or `status` = 'rejectedReqSpecs' or `status` = 'reviewedReqSpecs' or `status` = 'completedReqSpecs' or `status` = 'changingReqSpecs') - order by update_time desc - +