待办事项加上待填制

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanYearsServiceImpl.java

@@ -848,7 +848,8 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         //计划待提交，需求待提交，合同待填制，项目建设待完成
         String isAd = "false";
         Integer numByProjectStatus = getNumByProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode(), isAd);
-        Integer numByStatus = demandService.getNumByStatus(PmProjectStatus.DEMAND_WAIT_COMMIT.getCode());
+        Integer numByStatus = demandService.getNumByStatus(PmProjectStatus.DEMAND_WAIT_FILL.getCode()) +
+                demandService.getNumByStatus(PmProjectStatus.DEMAND_WAIT_COMMIT.getCode());
         Integer numByStatus1 = demandService.getNumByStatus(PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
         Integer numByStatus2 = demandService.getNumByStatus(PmProjectStatus.UNDER_CONSTRUCTION.getCode());
         StatisticalChartsResVo chartsResVo = new StatisticalChartsResVo();

purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandServiceImpl.java

@@ -4028,7 +4028,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
     public Integer getNumByStatus(String projectStatus) {
         LambdaQueryWrapper<PmDemand> lw = new LambdaQueryWrapper<PmDemand>();
         ///需求待提交时不用查审核
-        if (!projectStatus.equals("5")) {
+        if (!projectStatus.equals("5") && !projectStatus.equals("4")) {
             List<PmAuditDeptRef> list = new ArrayList<>();
             LambdaQueryWrapper<PmAuditDeptRef> l = new LambdaQueryWrapper<>();
             l.eq(PmAuditDeptRef::getDeptId, SecurityUtils.getDeptId());