diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductReqSpecsSearchVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductReqSpecsSearchVo.java index d50ab0b22..8b287ed87 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductReqSpecsSearchVo.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/vo/ProductReqSpecsSearchVo.java @@ -36,9 +36,12 @@ public class ProductReqSpecsSearchVo { @ApiModelProperty(value = "关联产品模块ID(传0查询不属于任何模块的需求)") private Long pmsProductModuleId; - @ApiModelProperty(value = "产品需求状态(全部状态请传空)") + @ApiModelProperty(value = "产品需求状态(全部状态请传空)(可通过逗号分割传多个状态)") private String status; + @ApiModelProperty(value = "产品需求状态(数组)", hidden = true) + private String[] statusList; + @ApiModelProperty(value = "产品需求类型") private String type; 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 c19bd9d74..06dcd9e52 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 @@ -394,6 +394,9 @@ public class PmsProductRequirementServiceImpl implements IPmsProductRequirementS List moduleIdList = pmsProductModuleService.selectChildrenPmsProductModuleIdList(productReqSpecsSearchVo.getPmsProductModuleId()); productReqSpecsSearchVo.setChildrenModuleIdList(moduleIdList); } + if (StringUtils.isNotEmpty(productReqSpecsSearchVo.getStatus())) { + productReqSpecsSearchVo.setStatusList(productReqSpecsSearchVo.getStatus().split(",")); + } startPage(); List userReqList = pmsProductRequirementMapper.selectReqSpecsList(productReqSpecsSearchVo); HashMap hashMap = new HashMap<>(); 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 7afb4aad4..80876e48c 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 @@ -204,7 +204,11 @@ and title like concat('%', #{title}, '%') and pms_product_identifier = #{pmsProductIdentifier} - and `status` = #{status} + and `status` in + + #{item} + + and `type` = #{type}