合伙招商后台

ruoyi-system/src/main/java/com/ruoyi/system/controller/PartnerProjectInfoController.java

@@ -12,6 +12,7 @@ import com.ruoyi.system.VO.ProjectInfoVO;
 import com.ruoyi.system.domain.PartnerProjectStatusChangeLog;
 import com.ruoyi.system.domain.ProjectInfo;
 import com.ruoyi.system.enumerate.PartnerProjectExamineEnum;
+import com.ruoyi.system.enumerate.PartnerProjectPushEnum;
 import com.ruoyi.system.service.*;
 import com.ruoyi.system.util.BussinessUtils;
 import org.apache.commons.lang3.ObjectUtils;
@@ -52,7 +53,6 @@ public class PartnerProjectInfoController extends BaseController
 
 
 
-    @RequiresPermissions("partnerProject:info:view")
     @GetMapping()
     public String info()
     {
@@ -159,6 +159,36 @@ public class PartnerProjectInfoController extends BaseController
         return prefix + "/editProjectInfo";
     }
 
+    /**
+     * 修改合伙人项目
+     */
+    @GetMapping("/editPushProjectInfo/{id}")
+    public String editPushProjectInfo(@PathVariable("id") Long id, ModelMap mmap)
+    {
+        PartnerProjectInfo partnerProjectInfo = partnerProjectInfoService.selectPartnerProjectInfoById(id);
+
+        PartnerProjectStatusChangeLogVO statusChangeLog = new PartnerProjectStatusChangeLogVO();
+        statusChangeLog.setProjectId(id);
+        List<Integer> array = new ArrayList<>();
+        for(PartnerProjectPushEnum ppe: PartnerProjectPushEnum.values()){
+            array.add(ppe.getCode());
+        }
+        statusChangeLog.setProjectStatus(array);
+        List<PartnerProjectStatusChangeLog> partnerProjectStatusChangeLogs = projectStatusChangeService.selectStatusChangeLogList(statusChangeLog);
+        mmap.put("partnerProjectInfo", partnerProjectInfo);
+//        mmap.put("partnerProjectStatusChangeLogs", partnerProjectStatusChangeLogs);
+        if(partnerProjectStatusChangeLogs != null && partnerProjectStatusChangeLogs.size()==6){
+            mmap.put("status9", partnerProjectStatusChangeLogs.get(0));
+            mmap.put("status10", partnerProjectStatusChangeLogs.get(1));
+            mmap.put("status11", partnerProjectStatusChangeLogs.get(2));
+            mmap.put("status12", partnerProjectStatusChangeLogs.get(3));
+            mmap.put("status13", partnerProjectStatusChangeLogs.get(4));
+            mmap.put("status14", partnerProjectStatusChangeLogs.get(5));
+        }
+
+        return prefix + "/editPushProjectInfo";
+    }
+
     /**
      * 修改保存合伙人项目
      */

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

@@ -13,7 +13,8 @@ public enum PartnerProjectStatusEnum {
     PROJECTINFO_CONFIRM(1,"已确认"),
     CURRENT_NODES_START(0,"未进行"),
     CURRENT_NODES_STARTING(1,"进行中"),
-    CURRENT_NODES_END(2,"已完成");
+    CURRENT_NODES_END(2,"已完成")
+    ;
     private int code;
     private String message;
 

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

@@ -124,9 +124,11 @@ public class PartnerProjectInfoServiceImpl implements IPartnerProjectInfoService
         PartnerProjectStatusChangeLog statusChange  = new PartnerProjectStatusChangeLog();
         statusChange.setId(changeStatusVO.getId());
         statusChange.setDescription(changeStatusVO.getFeedBack());
+        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.setCurrentNodeStatus(PartnerProjectStatusEnum.CURRENT_NODES_STARTING.getCode());
             }
             if(changeStatusVO.getRepeateType() == PartnerProjectStatusEnum.PROJECT_NO_REPRATE.getCode()){
                 statusChange.setTodoStatus(null);
@@ -140,8 +142,9 @@ public class PartnerProjectInfoServiceImpl implements IPartnerProjectInfoService
                 statusChange.setTodoStatus(null);
             }
         }
-        statusChange.setCurrentNodeStatus(PartnerProjectStatusEnum.CURRENT_NODES_END.getCode());
         projectStatusChangeService.updatePartnerProjectStatusChangeLog(statusChange);
+
+
         //关联产业知道id
         if(changeStatusVO.getStatus() == PartnerProjectExamineEnum.PROJECTSTATUS4.getCode()){
             PartnerProjectInfo partnerProjectInfo = new PartnerProjectInfo();
@@ -161,6 +164,11 @@ public class PartnerProjectInfoServiceImpl implements IPartnerProjectInfoService
         //更新下一个节点
         PartnerProjectStatusChangeLog partnerProjectStatusChangeLog = partnerProjectStatusChangeLogs.get(0);
         partnerProjectStatusChangeLog.setCurrentNodeStatus(PartnerProjectStatusEnum.CURRENT_NODES_STARTING.getCode());
+        if(changeStatusVO.getStatus() == PartnerProjectExamineEnum.PROJECTSTATUS2.getCode()) {
+            if (changeStatusVO.getRepeateType() == PartnerProjectStatusEnum.PROJECT_REPRATE.getCode()) {
+                partnerProjectStatusChangeLog.setCurrentNodeStatus(PartnerProjectStatusEnum.CURRENT_NODES_START.getCode());
+            }
+        }
         return projectStatusChangeService.updatePartnerProjectStatusChangeLog(partnerProjectStatusChangeLog);
     }
 }

ruoyi-system/src/main/resources/templates/partnerProject/info/editProjectInfo.html

@@ -428,10 +428,10 @@
         // if($("#currentNodeStatus1").text() == '1'){
         //
         // }
-        if($("#currentNodeStatus2").text() == '1'){
+        if($("#currentNodeStatus2").text() == '1' ){
             changeStatus2();
         }
-        if($("#currentNodeStatus4").text() == '1'){
+        if($("#currentNodeStatus4").text() == '1' ){
             changeStatus4();
         }
         if($("#currentNodeStatus5").text() == '1'){

ruoyi-system/src/main/resources/templates/partnerProject/info/info.html

@@ -113,7 +113,8 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editFull(\'' + row.id + '\')"><i class="fa fa-edit"></i>审核中</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'审核中项目\',\'/partnerProject/info/editProjectInfo/'+ row.id +'\')"><i class="fa fa-edit"></i>审核中</a> ');
+                        actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.modal.openTab(\'推进中项目\',\'/partnerProject/info/editPushProjectInfo/'+ row.id +'\')"><i class="fa fa-edit"></i>推进中</a> ');
                         // actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
                         return actions.join('');
                     }