合伙招商后台

ruoyi-system/src/main/java/com/ruoyi/system/enumerate/PartnerProjectToDoEnum.java

@@ -3,6 +3,7 @@ package com.ruoyi.system.enumerate;
 public enum PartnerProjectToDoEnum {
 
 //    0-项目查重确认 1-确认项目所属 2-确认佣金比例
+    TODOSTATUS_1(-1,"暂无状态"),
     TODOSTATUS0(0,"项目查重确认"),
     TODOSTATUS1(1,"确认项目所属"),
     TODOSTATUS2(2,"确认佣金比例");

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PartnerProjectInfoServiceImpl.java

@@ -115,10 +115,8 @@ public class PartnerProjectInfoServiceImpl implements IPartnerProjectInfoService
 
         //更新项目的信息
         PartnerProjectInfo partnerProjectInfoUp = new PartnerProjectInfo();
-        partnerProjectInfoUp.setStatus(changeStatusVO.getStatus());
-        partnerProjectInfoUp.setStatusDescription(PartnerProjectExamineEnum.getValueByCode(changeStatusVO.getStatus()));
-        partnerProjectInfoUp.setId(changeStatusVO.getProjectId());
-        partnerProjectInfoMapper.updatePartnerProjectInfo(partnerProjectInfoUp);
+        partnerProjectInfoUp.setTodoStatus(PartnerProjectToDoEnum.TODOSTATUS_1.getCode());
+        partnerProjectInfoUp.setTodoStatusDescription(PartnerProjectToDoEnum.TODOSTATUS_1.getMessage());
 
         //更新当前节点
         PartnerProjectStatusChangeLog statusChange  = new PartnerProjectStatusChangeLog();
@@ -130,17 +128,25 @@ public class PartnerProjectInfoServiceImpl implements IPartnerProjectInfoService
                 statusChange.setTodoStatus(PartnerProjectToDoEnum.TODOSTATUS0.getCode());
                 statusChange.setTodoStatusDescription(PartnerProjectToDoEnum.getValueByCode(PartnerProjectToDoEnum.TODOSTATUS0.getCode()));
                 statusChange.setCurrentNodeStatus(PartnerProjectStatusEnum.CURRENT_NODES_STARTING.getCode());
+                partnerProjectInfoUp.setTodoStatus(PartnerProjectToDoEnum.TODOSTATUS0.getCode());
+                partnerProjectInfoUp.setTodoStatusDescription(PartnerProjectToDoEnum.getValueByCode(PartnerProjectToDoEnum.TODOSTATUS0.getCode()));
             }
         }
         if(changeStatusVO.getStatus() == PartnerProjectExamineEnum.PROJECTSTATUS7.getCode()){
             if(changeStatusVO.getProjectInfoConfirm() == PartnerProjectStatusEnum.PROJECTINFO_NO_CONFIRM.getCode()){
                 statusChange.setTodoStatus(PartnerProjectToDoEnum.TODOSTATUS1.getCode());
                 statusChange.setTodoStatusDescription(PartnerProjectToDoEnum.getValueByCode(PartnerProjectToDoEnum.TODOSTATUS0.getCode()));
+                partnerProjectInfoUp.setTodoStatus(PartnerProjectToDoEnum.TODOSTATUS0.getCode());
+                partnerProjectInfoUp.setTodoStatusDescription(PartnerProjectToDoEnum.getValueByCode(PartnerProjectToDoEnum.TODOSTATUS0.getCode()));
             }
-
         }
         projectStatusChangeService.updatePartnerProjectStatusChangeLog(statusChange);
 
+        //更新项目信息
+        partnerProjectInfoUp.setStatus(changeStatusVO.getStatus());
+        partnerProjectInfoUp.setStatusDescription(PartnerProjectExamineEnum.getValueByCode(changeStatusVO.getStatus()));
+        partnerProjectInfoUp.setId(changeStatusVO.getProjectId());
+        partnerProjectInfoMapper.updatePartnerProjectInfo(partnerProjectInfoUp);
 
         //关联产业知道id
         if(changeStatusVO.getStatus() == PartnerProjectExamineEnum.PROJECTSTATUS4.getCode()){
@@ -158,6 +164,7 @@ public class PartnerProjectInfoServiceImpl implements IPartnerProjectInfoService
         statusChangeNext.setProjectStatus(nextCode);
         statusChangeNext.setProjectId(changeStatusVO.getProjectId());
         List<PartnerProjectStatusChangeLog> partnerProjectStatusChangeLogs = projectStatusChangeService.selectPartnerProjectStatusChangeLogList(statusChangeNext);
+
         //更新下一个节点
         PartnerProjectStatusChangeLog partnerProjectStatusChangeLog = partnerProjectStatusChangeLogs.get(0);
         partnerProjectStatusChangeLog.setCurrentNodeStatus(PartnerProjectStatusEnum.CURRENT_NODES_STARTING.getCode());