项目状态

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

@@ -1944,25 +1944,38 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         if (!ObjectUtils.isEmpty(everyStatusNum) && everyStatusNum.size() > 0) {
             for (StatisticalChartsResVo vo : everyStatusNum) {
                 switch (vo.getColumnName()) {
-                    // TODO
-//                    case "9":
-//                        vo.setColumnName(PmProjectStatus.WAIT_SELECT_AGENT.getInfo());
-//                        break;
-//                    case "10":
-//                        vo.setColumnName(PmProjectStatus.WAIT_UPLOAD_BID_FILE.getInfo());
-//                        break;
-//                    case "11":
-//                        vo.setColumnName(PmProjectStatus.WAIT_ANNOUNCEMENT.getInfo());
-//                        break;
-//                    case "12":
-//                        vo.setColumnName(PmProjectStatus.WAIT_OPEN_BID.getInfo());
-//                        break;
-//                    case "13":
-//                        vo.setColumnName(PmProjectStatus.WAIT_BID_ANNOUNCEMENT.getInfo());
-//                        break;
-//                    case "14":
-//                        vo.setColumnName(PmProjectStatus.BIDDING_PUBLICITY.getInfo());
-//                        break;
+
+                    case "9":
+                        vo.setColumnName(PmProjectStatus.PURCHASE_DEMAND_DOCKING.getInfo());
+                        break;
+                    case "10":
+                        vo.setColumnName(PmProjectStatus.EXPERT_FEEDBACK.getInfo());
+                        break;
+                    case "11":
+                        vo.setColumnName(PmProjectStatus.PROCUREMENT_DOCUMENTS_REVIEW.getInfo());
+                        break;
+                    case "12":
+                        vo.setColumnName(PmProjectStatus.PROCUREMENT_ANNOUNCEMENT.getInfo());
+                        break;
+                    case "13":
+                        vo.setColumnName(PmProjectStatus.PRE_BID_QUERY.getInfo());
+                        break;
+                    case "14":
+                        vo.setColumnName(PmProjectStatus.WAIT_OPEN_BID.getInfo());
+                        break;
+                    case "15":
+                        vo.setColumnName(PmProjectStatus.BID_RESULT_ANNOUNCEMENT.getInfo());
+                        break;
+                    case "16":
+                        vo.setColumnName(PmProjectStatus.WASTE_BID_HANDLE.getInfo());
+                        break;
+                    case "17":
+                        vo.setColumnName(PmProjectStatus.POST_BID_QUERY.getInfo());
+                    case "18":
+                        vo.setColumnName(PmProjectStatus.WASTE_BID_RETURN.getInfo());
+                    case "19":
+                        vo.setColumnName(PmProjectStatus.CONTRACT_WAIT_FILL.getInfo());
+                        break;
                     default: {
                     }
                 }
@@ -2278,6 +2291,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         xqjd.add("6");
         xqjd.add("7");
         xqjd.add("8");
+        xqjd.add("18");
         pmDemandReqVo.setProjectStatusList(xqjd);
         Map<String, String> returnMapxqjd = pmDemandMapper.purchaseProjectDistribution(pmDemandReqVo);
         returnMapxqjd.put("name", "需求管理");
@@ -2295,21 +2309,24 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         cgzx.add("13");
         cgzx.add("14");
         cgzx.add("15");
+        cgzx.add("16");
+        cgzx.add("17");
+        cgzx.add("19");
         pmDemandReqVo.setProjectStatusList(cgzx);
         Map<String, String> returnMapcgzx = pmDemandMapper.purchaseProjectDistribution(pmDemandReqVo);
         returnMapcgzx.put("name", "采购执行");
-        // 合同管理 15之后（不包括15）
+        // 合同管理 19之后（不包括19）
         List<String> htxx = new ArrayList<>();
-        htxx.add("16");
+        htxx.add("20");
         pmDemandReqVo.setProjectStatusList(htxx);
         Map<String, String> returnMaphtxx = pmDemandMapper.purchaseProjectDistribution(pmDemandReqVo);
         returnMaphtxx.put("name", "合同管理");
-        // 项目建设 17
+        // 项目建设 21
         List<String> xmjs = new ArrayList<>();
-        xmjs.add("16");
+        xmjs.add("21");
         pmDemandReqVo.setProjectStatusList(xmjs);
         Map<String, String> returnMapxmjs = pmDemandMapper.purchaseProjectDistribution(pmDemandReqVo);
-        returnMapxmjs.put("name", "合同管理");
+        returnMapxmjs.put("name", "项目建设");
 
         List<Map<String, String>> returnMap = new ArrayList<>();
         returnMap.add(returnMapxmjh);