Gitlink
/
microservices
0
1
Fork 12
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(组织工作台):产品统计状态修正

This commit is contained in:
wanjia 2024-12-26 11:40:03 +08:00
parent 15e656fb4d
commit a9a75dc100
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/dashboard/controller/PmsDashboardController.java
View File

@ -39,6 +39,8 @@ import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static com.microservices.pms.utils.PmsConstants.PRODUCT_PLAN_CLOSED_STATUS_NAME;
@RestController
@RequestMapping("/{enterpriseIdentifier}/dashboard")
@Api(tags = "项目管理-工作台")
@ -223,8 +225,7 @@ public class PmsDashboardController extends BaseController {
PmsRequirementStatResVo pmsRequirementStatResVo = buildPmsRequirementStatResVo(
productIdentifier,
getReqSpecsList(),
ProductReqStatus.REVIEWED_REQ_SPECS);
ProductReqStatus.COMPLETED_REQ_SPECS);
return R.ok(pmsRequirementStatResVo);
}
@ -237,7 +238,7 @@ public class PmsDashboardController extends BaseController {
PmsProductStatus pmsProductStatus = new PmsProductStatus();
pmsProductStatus.setType(1);
List<PmsTypeDataVo> pmsTypeDataVos = pmsProductStatusService.selectPmsProductStatusList(pmsProductStatus);
List<ReqStatusStatVo> statusStatVos = pmsTypeDataVos.stream().map(e -> {
List<ReqStatusStatVo> statusStatVos = pmsTypeDataVos.stream().filter(e -> !PRODUCT_PLAN_CLOSED_STATUS_NAME.equals(e.getName())).map(e -> {
ReqStatusStatVo vo = new ReqStatusStatVo();
vo.setKey(String.valueOf(e.getId()));
vo.setNum(status2NumMap.getOrDefault(String.valueOf(e.getId()), 0));
@ -258,10 +259,9 @@ public class PmsDashboardController extends BaseController {
private List<String> getReqSpecsList() {
return Stream.of(ProductReqStatus.PENDING_REVIEW_REQ_SPECS.getKey(),
ProductReqStatus.PLANNED_REQ_SPECS.getKey(),
ProductReqStatus.REJECTED_CHANGE_REQ_SPECS.getKey(),
ProductReqStatus.REJECTED_REQ_SPECS.getKey(),
ProductReqStatus.REVIEWED_REQ_SPECS.getKey(),
ProductReqStatus.COMPLETED_REQ_SPECS.getKey(),
ProductReqStatus.CHANGED_REQ_SPECS.getKey())
ProductReqStatus.COMPLETED_REQ_SPECS.getKey())
.collect(Collectors.toList());
}