DeBugDeBugDeBug

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

@@ -1788,72 +1788,86 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
 
     @Override
     public List<PmDemandResVo> demandWaitCommit() {
-        return getListByStatus(PmProjectStatus.DEMAND_WAIT_COMMIT.getCode());
+        List<PmDemand> byStatus = getListByStatus(PmProjectStatus.DEMAND_WAIT_COMMIT.getCode());
+        return listToVoList(byStatus);
     }
 
     @Override
     public List<PmDemandResVo> contractWaitFilled() {
-        return getListByStatus(PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
+        List<PmDemand> byStatus = getListByStatus(PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
+        return listToVoList(byStatus);
     }
 
     @Override
     public List<PmDemandResVo> projectWaitFinish() {
-        return getListByStatus(PmProjectStatus.UNDER_CONSTRUCTION.getCode());
+        List<PmDemand> byStatus = getListByStatus(PmProjectStatus.UNDER_CONSTRUCTION.getCode());
+        return listToVoList(byStatus);
     }
 
     @Override
     public List<PmDemandResVo> demandWaitExamine() {
-        return getListByStatus(PmProjectStatus.DEMAND_WAIT_AUDIT.getCode());
+        List<PmDemand> byStatus = getListByStatus(PmProjectStatus.DEMAND_WAIT_AUDIT.getCode());
+        return listToVoList(byStatus);
     }
 
     @Override
     public List<PmDemandResVo> taskWaitRelease() {
-        return getListByStatus(PmProjectStatus.TASK_WAIT_RELEASE.getCode());
+        List<PmDemand> byStatus = getListByStatus(PmProjectStatus.TASK_WAIT_RELEASE.getCode());
+        return listToVoList(byStatus);
     }
 
     @Override
     public List<PmDemandResVo> purchaseDemandDocking() {
-        return getListByStatus(PmProjectStatus.PURCHASE_DEMAND_DOCKING.getCode());
+        List<PmDemand> byStatus = getListByStatus(PmProjectStatus.PURCHASE_DEMAND_DOCKING.getCode());
+        return listToVoList(byStatus);
     }
 
     @Override
     public List<PmDemandResVo> expertFeedback() {
-        return getListByStatus(PmProjectStatus.EXPERT_FEEDBACK.getCode());
+        List<PmDemand> byStatus = getListByStatus(PmProjectStatus.EXPERT_FEEDBACK.getCode());
+        return listToVoList(byStatus);
     }
 
     @Override
     public List<PmDemandResVo> procurementDocumentsReview() {
-        return getListByStatus(PmProjectStatus.PROCUREMENT_DOCUMENTS_REVIEW.getCode());
+        List<PmDemand> byStatus = getListByStatus(PmProjectStatus.PROCUREMENT_DOCUMENTS_REVIEW.getCode());
+        return listToVoList(byStatus);
     }
 
     @Override
     public List<PmDemandResVo> procurementAnnouncement() {
-        return getListByStatus(PmProjectStatus.PROCUREMENT_ANNOUNCEMENT.getCode());
+        List<PmDemand> byStatus = getListByStatus(PmProjectStatus.PROCUREMENT_ANNOUNCEMENT.getCode());
+        return listToVoList(byStatus);
     }
 
     @Override
     public List<PmDemandResVo> preBidQuery() {
-        return getListByStatus(PmProjectStatus.PRE_BID_QUERY.getCode());
+        List<PmDemand> byStatus = getListByStatus(PmProjectStatus.PRE_BID_QUERY.getCode());
+        return listToVoList(byStatus);
     }
 
     @Override
     public List<PmDemandResVo> waitOpenBid() {
-        return getListByStatus(PmProjectStatus.WAIT_OPEN_BID.getCode());
+        List<PmDemand> byStatus = getListByStatus(PmProjectStatus.WAIT_OPEN_BID.getCode());
+        return listToVoList(byStatus);
     }
 
     @Override
     public List<PmDemandResVo> bidResultAnnouncement() {
-        return getListByStatus(PmProjectStatus.BID_RESULT_ANNOUNCEMENT.getCode());
+        List<PmDemand> byStatus = getListByStatus(PmProjectStatus.BID_RESULT_ANNOUNCEMENT.getCode());
+        return listToVoList(byStatus);
     }
 
     @Override
     public List<PmDemandResVo> wasteBidHandle() {
-        return getListByStatus(PmProjectStatus.WASTE_BID_HANDLE.getCode());
+        List<PmDemand> byStatus = getListByStatus(PmProjectStatus.WASTE_BID_HANDLE.getCode());
+        return listToVoList(byStatus);
     }
 
     @Override
     public List<PmDemandResVo> postBidQuery() {
-        return getListByStatus(PmProjectStatus.POST_BID_QUERY.getCode());
+        List<PmDemand> byStatus = getListByStatus(PmProjectStatus.POST_BID_QUERY.getCode());
+        return listToVoList(byStatus);
     }
 
     @Override
@@ -1861,15 +1875,17 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         List<HomeToDoQueryResVo> homeRes = new ArrayList<>();
         // 采购需求对接,专家意见反馈,采购文件编制审核,采购公告发布,标前质疑投诉,待开标,评标结果公告,流废标处置,标后质疑
         List<PmDemandResVo> demandRes = new ArrayList<>();
-        demandRes.addAll(getListByStatus(PmProjectStatus.PURCHASE_DEMAND_DOCKING.getCode()));
-        demandRes.addAll(getListByStatus(PmProjectStatus.EXPERT_FEEDBACK.getCode()));
-        demandRes.addAll(getListByStatus(PmProjectStatus.PROCUREMENT_DOCUMENTS_REVIEW.getCode()));
-        demandRes.addAll(getListByStatus(PmProjectStatus.PROCUREMENT_ANNOUNCEMENT.getCode()));
-        demandRes.addAll(getListByStatus(PmProjectStatus.PRE_BID_QUERY.getCode()));
-        demandRes.addAll(getListByStatus(PmProjectStatus.WAIT_OPEN_BID.getCode()));
-        demandRes.addAll(getListByStatus(PmProjectStatus.BID_RESULT_ANNOUNCEMENT.getCode()));
-        demandRes.addAll(getListByStatus(PmProjectStatus.WASTE_BID_HANDLE.getCode()));
-        demandRes.addAll(getListByStatus(PmProjectStatus.POST_BID_QUERY.getCode()));
+        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<PlanQuarterResponseVo> planRes = planYearsService.willSendLetter();
@@ -3858,7 +3874,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
     }
 
     //查询不同状态下的项目数据
-    public List<PmDemandResVo> getListByStatus(String projectStatus) {
+    public List<PmDemand> getListByStatus(String projectStatus) {
         LambdaQueryWrapper<PmDemand> lw = new LambdaQueryWrapper<PmDemand>();
         //  4 (合同信息管理)、 0(需求单位管理) 、 5(项目建设管理)  需求单位
         //  1(需求需求审核) 、2 (任务下达管理)      采购管理部门
@@ -3875,7 +3891,11 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         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;
+    }
+
+    //数据转换
+    public List<PmDemandResVo> listToVoList(List<PmDemand> demandList) {
         List<PmDemandResVo> pmDemandResponseVoList = new ArrayList<>();
         if (!ObjectUtils.isEmpty(demandList) && demandList.size() > 0) {
             pmDemandResponseVoList = demandChangeTo(demandList);