合伙招商后台

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

@@ -115,37 +115,44 @@ public class PartnerProjectInfoServiceImpl implements IPartnerProjectInfoService
 
         //更新项目的信息
         PartnerProjectInfo partnerProjectInfoUp = new PartnerProjectInfo();
+        partnerProjectInfoUp.setId(changeStatusVO.getProjectId());
         partnerProjectInfoUp.setTodoStatus(PartnerProjectToDoEnum.TODOSTATUS_1.getCode());
         partnerProjectInfoUp.setTodoStatusDescription(PartnerProjectToDoEnum.TODOSTATUS_1.getMessage());
+        partnerProjectInfoUp.setStatus(changeStatusVO.getStatus());
+        partnerProjectInfoUp.setStatusDescription(PartnerProjectExamineEnum.getValueByCode(changeStatusVO.getStatus()));
 
         //更新当前节点
         PartnerProjectStatusChangeLog statusChange  = new PartnerProjectStatusChangeLog();
         statusChange.setId(changeStatusVO.getId());
         statusChange.setDescription(changeStatusVO.getFeedBack());
+        statusChange.setTodoStatus(PartnerProjectToDoEnum.TODOSTATUS_1.getCode());
+        statusChange.setTodoStatusDescription(PartnerProjectToDoEnum.TODOSTATUS_1.getMessage());
         statusChange.setCurrentNodeStatus(PartnerProjectStatusEnum.CURRENT_NODES_END.getCode());
         if(changeStatusVO.getStatus() == PartnerProjectExamineEnum.PROJECTSTATUS2.getCode()){
             if(changeStatusVO.getRepeateType() == PartnerProjectStatusEnum.PROJECT_REPRATE.getCode()){
                 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()));
+                partnerProjectInfoUp.setStatus(PartnerProjectExamineEnum.PROJECTSTATUS1.getCode());
+                partnerProjectInfoUp.setStatusDescription(PartnerProjectExamineEnum.getValueByCode(PartnerProjectExamineEnum.PROJECTSTATUS1.getCode()));
             }
         }
         if(changeStatusVO.getStatus() == PartnerProjectExamineEnum.PROJECTSTATUS7.getCode()){
-            if(changeStatusVO.getProjectInfoConfirm() == PartnerProjectStatusEnum.PROJECTINFO_NO_CONFIRM.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()));
-            }
+                statusChange.setTodoStatusDescription(PartnerProjectToDoEnum.getValueByCode(PartnerProjectToDoEnum.TODOSTATUS1.getCode()));
+
+                partnerProjectInfoUp.setTodoStatus(PartnerProjectToDoEnum.TODOSTATUS1.getCode());
+                partnerProjectInfoUp.setTodoStatusDescription(PartnerProjectToDoEnum.getValueByCode(PartnerProjectToDoEnum.TODOSTATUS1.getCode()));
+//            }
         }
+        //更新当前节点
         projectStatusChangeService.updatePartnerProjectStatusChangeLog(statusChange);
 
         //更新项目信息
-        partnerProjectInfoUp.setStatus(changeStatusVO.getStatus());
-        partnerProjectInfoUp.setStatusDescription(PartnerProjectExamineEnum.getValueByCode(changeStatusVO.getStatus()));
-        partnerProjectInfoUp.setId(changeStatusVO.getProjectId());
         partnerProjectInfoMapper.updatePartnerProjectInfo(partnerProjectInfoUp);
 
         //关联产业知道id