DeBugDeBugDeBug

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

@@ -1876,16 +1876,17 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         // 采购需求对接,专家意见反馈,采购文件编制审核,采购公告发布,标前质疑投诉,待开标,评标结果公告,流废标处置,标后质疑
         List<PmDemandResVo> demandRes = new ArrayList<>();
         List<PmDemand> byStatus = new ArrayList<>();
-        byStatus.addAll(getListByStatus(PmProjectStatus.PURCHASE_DEMAND_DOCKING.getCode()));
-        byStatus.addAll(getListByStatus(PmProjectStatus.EXPERT_FEEDBACK.getCode()));
-        byStatus.addAll(getListByStatus(PmProjectStatus.PROCUREMENT_DOCUMENTS_REVIEW.getCode()));
-        byStatus.addAll(getListByStatus(PmProjectStatus.PROCUREMENT_ANNOUNCEMENT.getCode()));
-        byStatus.addAll(getListByStatus(PmProjectStatus.PRE_BID_QUERY.getCode()));
-        byStatus.addAll(getListByStatus(PmProjectStatus.WAIT_OPEN_BID.getCode()));
-        byStatus.addAll(getListByStatus(PmProjectStatus.BID_RESULT_ANNOUNCEMENT.getCode()));
-        byStatus.addAll(getListByStatus(PmProjectStatus.WASTE_BID_HANDLE.getCode()));
-        byStatus.addAll(getListByStatus(PmProjectStatus.POST_BID_QUERY.getCode()));
-        demandRes = listToVoList(byStatus);
+        List<String> projectStatus = new ArrayList<>();
+        projectStatus.add(PmProjectStatus.PURCHASE_DEMAND_DOCKING.getCode());
+        projectStatus.add(PmProjectStatus.EXPERT_FEEDBACK.getCode());
+        projectStatus.add(PmProjectStatus.PROCUREMENT_DOCUMENTS_REVIEW.getCode());
+        projectStatus.add(PmProjectStatus.PROCUREMENT_ANNOUNCEMENT.getCode());
+        projectStatus.add(PmProjectStatus.PRE_BID_QUERY.getCode());
+        projectStatus.add(PmProjectStatus.WAIT_OPEN_BID.getCode());
+        projectStatus.add(PmProjectStatus.BID_RESULT_ANNOUNCEMENT.getCode());
+        projectStatus.add(PmProjectStatus.WASTE_BID_HANDLE.getCode());
+        projectStatus.add(PmProjectStatus.POST_BID_QUERY.getCode());
+        demandRes = listToVoList(getListByStatusTotal(projectStatus));
 
         //计划数据--发函催告
         List<PlanQuarterResponseVo> planRes = planYearsService.willSendLetter();
@@ -3890,8 +3891,27 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         lw.eq(PmDemand::getProjectStatus, projectStatus);
         lw.eq(PmDemand::getPurchaseDeptId, SecurityUtils.getDeptId());
         lw.last(" order by project_status, plan_demand_sub_time");
-        List<PmDemand> demandList = this.baseMapper.selectList(lw);
-        return demandList;
+        return this.baseMapper.selectList(lw);
+    }
+
+    //查询不同状态下的项目数据
+    public List<PmDemand> getListByStatusTotal(List<String> projectStatus) {
+        LambdaQueryWrapper<PmDemand> lw = new LambdaQueryWrapper<PmDemand>();
+        //  4 (合同信息管理)、 0(需求单位管理) 、 5(项目建设管理)  需求单位
+        //  1(需求需求审核) 、2 (任务下达管理)      采购管理部门
+        //  3(采购执行管理)   采购办
+        List<PmAuditDeptRef> list = new ArrayList<>();
+        LambdaQueryWrapper<PmAuditDeptRef> l = new LambdaQueryWrapper<>();
+        l.eq(PmAuditDeptRef::getDeptId, SecurityUtils.getDeptId());
+        l.eq(PmAuditDeptRef::getRefType, "2");
+        list = pmAuditDeptRefService.list(l);
+        if (!ObjectUtils.isEmpty(list) && !SysUser.isAdmin(SecurityUtils.getUserId())) {
+            lw.in(PmDemand::getDemandId, list.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList()));
+        }
+        lw.in(PmDemand::getProjectStatus, projectStatus);
+        lw.eq(PmDemand::getPurchaseDeptId, SecurityUtils.getDeptId());
+        lw.last(" order by project_status, plan_demand_sub_time");
+        return this.baseMapper.selectList(lw);
     }
 
     //数据转换