项目状态

purchase-admin/src/main/java/com/ozs/web/controller/base/BaseAgencyController.java

@@ -223,7 +223,7 @@ public class BaseAgencyController extends BaseController {
                                       @RequestBody BasePolicyPageReqVo vo) {
         LambdaQueryWrapper<MonthlyReconciliation> lw = new LambdaQueryWrapper<>();
         lw.isNull(MonthlyReconciliation::getAgencyId);
-        lw.eq(MonthlyReconciliation::getProjectStatus, PmProjectStatus.BID_INFO_WAIT_FILL.getCode());
+       // lw.eq(MonthlyReconciliation::getProjectStatus, PmProjectStatus.BID_INFO_WAIT_FILL.getCode()); //TODO
         if (!StringUtils.isBlank(vo.getName())) {
             lw.like(MonthlyReconciliation::getProjectName, vo.getName());
         }

purchase-common/src/main/java/com/ozs/common/enums/PmProjectStatus.java

@@ -1,7 +1,7 @@
 package com.ozs.common.enums;
 
 /**
- * 项目审核状态
+ * 项目管理的项目状态
  *
  * @author buzhanyi
  */
@@ -11,10 +11,15 @@ public enum PmProjectStatus {
     DEMAND_WAIT_AUDIT("6", "需求待审核"),
     DEMAND_AUDIT_RETURN("7", "需求已退回"),
     TASK_WAIT_RELEASE("8", "任务待下达"),
-    BID_INFO_WAIT_FILL("9", "中标信息待填制"),
-    CONTRACT_WAIT_FILL("10", "合同待填制"),
-    UNDER_CONSTRUCTION("11", "项目建设中"),
-    COMPLETION_CONSTRUCTION("12", "项目已完成");
+    WAIT_SELECT_AGENT("9", "待选取代理"),
+    WAIT_UPLOAD_BID_FILE("10", "待上传招标文件"),
+    WAIT_ANNOUNCEMENT("11", "待发布公告"),
+    WAIT_OPEN_BID("12", "待开标"),
+    WAIT_BID_ANNOUNCEMENT("13", "待发布中标公告"),
+    BIDDING_PUBLICITY("14", "中标公示中"),
+    CONTRACT_WAIT_FILL("15", "合同待填制"),
+    UNDER_CONSTRUCTION("16", "项目建设中"),
+    COMPLETION_CONSTRUCTION("17", "项目已完成");
 
     private final String code;
     private final String info;

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

@@ -680,7 +680,14 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                                 .eq(PmDemand::getIsExcess, IsExcess.NO_EXCESS.getCode()))
                         .or(wrapper -> wrapper.lambda().in(PmDemand::getPurchaseDeptId, collect)
                                 .eq(PmDemand::getIsExcess, IsExcess.EXCESS.getCode()))
-                        .in("project_status",PmProjectStatus.TASK_WAIT_RELEASE.getCode(),PmProjectStatus.BID_INFO_WAIT_FILL.getCode());
+                        .in("project_status",PmProjectStatus.TASK_WAIT_RELEASE.getCode(),
+                                PmProjectStatus.WAIT_SELECT_AGENT.getCode(),
+                                PmProjectStatus.WAIT_UPLOAD_BID_FILE.getCode(),
+                                PmProjectStatus.WAIT_ANNOUNCEMENT.getCode(),
+                                PmProjectStatus.WAIT_OPEN_BID.getCode(),
+                                PmProjectStatus.WAIT_BID_ANNOUNCEMENT.getCode(),
+                                PmProjectStatus.BIDDING_PUBLICITY.getCode()
+                        );
                 pmDemands = pmDemandMapper.selectList(queryWrapper);
             }
         } catch (Exception e) {
@@ -709,7 +716,14 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                                 .eq(PmDemand::getIsExcess, IsExcess.NO_EXCESS.getCode()))
                         .or(wrapper -> wrapper.lambda().in(PmDemand::getPurchaseDeptId, collect)
                                 .eq(PmDemand::getIsExcess, IsExcess.EXCESS.getCode()))
-                        .in("project_status",PmProjectStatus.BID_INFO_WAIT_FILL.getCode(),PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
+                        .in("project_status",
+                                PmProjectStatus.WAIT_SELECT_AGENT.getCode(),
+                                PmProjectStatus.WAIT_UPLOAD_BID_FILE.getCode(),
+                                PmProjectStatus.WAIT_ANNOUNCEMENT.getCode(),
+                                PmProjectStatus.WAIT_OPEN_BID.getCode(),
+                                PmProjectStatus.WAIT_BID_ANNOUNCEMENT.getCode(),
+                                PmProjectStatus.BIDDING_PUBLICITY.getCode(),
+                                PmProjectStatus.CONTRACT_WAIT_FILL.getCode());
                 pmDemands = pmDemandMapper.selectList(queryWrapper);
             }
         } catch (Exception e) {

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

@@ -639,7 +639,6 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         PmDemand pmDemand = pmDemandMapper.selectPmDemandByDemandId(demandId);
         String projectStatus = String.valueOf(pmDemand.getProjectStatus());
         String moduleName = null;
-        //todo
         if (PmProjectStatus.DEMAND_WAIT_FILL.getCode().equals(projectStatus) || PmProjectStatus.DEMAND_AUDIT_RETURN.getCode().equals(projectStatus)) {
             moduleName = "需求填制";
         } else if(PmProjectStatus.DEMAND_WAIT_COMMIT.getCode().equals(projectStatus)) {
@@ -648,8 +647,18 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
             moduleName = "需求审核";
         } else if(PmProjectStatus.TASK_WAIT_RELEASE.getCode().equals(projectStatus)) {
             moduleName = "任务下达";
-        } else if(PmProjectStatus.BID_INFO_WAIT_FILL.getCode().equals(projectStatus)) {
-            moduleName = "中标情况填制";
+        } else if(PmProjectStatus.WAIT_SELECT_AGENT.getCode().equals(projectStatus)) {
+            moduleName = "选取代理";
+        } else if(PmProjectStatus.WAIT_UPLOAD_BID_FILE.getCode().equals(projectStatus)) {
+            moduleName = "上传招标文件";
+        } else if(PmProjectStatus.WAIT_ANNOUNCEMENT.getCode().equals(projectStatus)) {
+            moduleName = "发布公告";
+        } else if(PmProjectStatus.WAIT_OPEN_BID.getCode().equals(projectStatus)) {
+            moduleName = "填写专家信息,填写开标信息";
+        } else if(PmProjectStatus.WAIT_BID_ANNOUNCEMENT.getCode().equals(projectStatus)) {
+            moduleName = "填写中标信息";
+        } else if(PmProjectStatus.BIDDING_PUBLICITY.getCode().equals(projectStatus)) {
+            moduleName = "质疑处理,上传中标通知书";
         } else if(PmProjectStatus.CONTRACT_WAIT_FILL.getCode().equals(projectStatus)) {
             moduleName = "合同填制";
         } else if(PmProjectStatus.UNDER_CONSTRUCTION.getCode().equals(projectStatus)) {
@@ -817,7 +826,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
     public int releaseTask(PmDemandReqVo pmDemandReqVo) {
         PmDemand pmDemand = new PmDemand();
         pmDemand.setDemandId(pmDemandReqVo.getDemandId());
-        pmDemand.setProjectStatus(Long.parseLong(PmProjectStatus.BID_INFO_WAIT_FILL.getCode()));
+        pmDemand.setProjectStatus(Long.parseLong(PmProjectStatus.WAIT_SELECT_AGENT.getCode()));
         List<SysFileRef> sysFileRefs = pmDemandReqVo.getSysFileRefs();
         if (!ObjectUtils.isEmpty(sysFileRefs)) {
             for (SysFileRef ref : sysFileRefs) {