Merge branch 'zhouhao' into develop

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskPlanAppController.java

@@ -160,7 +160,7 @@ public class RiskPlanAppController extends BaseController {
             statusList = Arrays.asList(RiskPlanStatusType.CREATE_TASK,RiskPlanStatusType.WAIT_START);
             state = "待执行";
         } else if ("running".equals(status)) {
-            statusList = Arrays.asList(RiskPlanStatusType.RUNNING,RiskPlanStatusType.WAIT_RETURN);
+            statusList = Arrays.asList(RiskPlanStatusType.RUNNING,RiskPlanStatusType.WAIT_RETURN,RiskPlanStatusType.WAIT_LEADER_RETURN);
             state = "执行中";
         } else if ("finish".equals(status)) {
             statusList = Arrays.asList(RiskPlanStatusType.WAIT_LEADER_APPROVE,RiskPlanStatusType.WAIT_APPROVE
@@ -189,7 +189,7 @@ public class RiskPlanAppController extends BaseController {
             statusList = Arrays.asList(RiskPlanStatusType.CREATE_TASK,RiskPlanStatusType.WAIT_START);
             state = "待评估";
         } else if ("running".equals(status)) {
-            statusList = Arrays.asList(RiskPlanStatusType.RUNNING,RiskPlanStatusType.WAIT_RETURN);
+            statusList = Arrays.asList(RiskPlanStatusType.RUNNING,RiskPlanStatusType.WAIT_RETURN,RiskPlanStatusType.WAIT_LEADER_RETURN);
             state = "执行中";
         } else if ("finish".equals(status)) {
             statusList = Arrays.asList(RiskPlanStatusType.WAIT_LEADER_APPROVE,RiskPlanStatusType.WAIT_APPROVE
@@ -232,7 +232,7 @@ public class RiskPlanAppController extends BaseController {
             statusList = Arrays.asList(RiskPlanStatusType.CREATE_TASK,RiskPlanStatusType.WAIT_START,RiskPlanStatusType.RUNNING);
             state = "待执行";
         } else if ("finish".equals(status)) {
-            statusList = Arrays.asList(RiskPlanStatusType.WAIT_LEADER_APPROVE,RiskPlanStatusType.WAIT_APPROVE
+            statusList = Arrays.asList(RiskPlanStatusType.WAIT_LEADER_APPROVE,RiskPlanStatusType.WAIT_APPROVE,RiskPlanStatusType.WAIT_LEADER_RETURN
                     ,RiskPlanStatusType.PROJECT_REPORT,RiskPlanStatusType.FINISH);
             state = "已执行";
         } else if ("return".equals(status)) {

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/enums/RiskPlanStatusType.java

@@ -30,9 +30,13 @@ public enum RiskPlanStatusType {
      */
     FINISH("FINISH","项目完成"),
     /**
-     * 已退回
+     * 已退回至组长
      */
-    WAIT_RETURN("WAIT_RETURN","已退回"),
+    WAIT_LEADER_RETURN("WAIT_LEADER_RETURN","已退回至组长"),
+    /**
+     * 已退回至组员
+     */
+    WAIT_RETURN("WAIT_RETURN","已退回至组员"),
     /**
      * 已撤销
      */
@@ -73,6 +77,8 @@ public enum RiskPlanStatusType {
                 return PROJECT_REPORT;
             case "FINISH":
                 return FINISH;
+            case "WAIT_LEADER_RETURN":
+                return WAIT_LEADER_RETURN;
             case "WAIT_RETURN":
                 return WAIT_RETURN;
             case "REVOKE":

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanServiceImpl.java

@@ -220,25 +220,44 @@ public class RiskPlanServiceImpl implements IRiskPlanService {
         RiskPlan riskPlan = selectRiskPlanById(lastRiskPlanTask.getPlanId());
 
         if ("0".equals(appApproveDto.getTaskResult())) {
-            //退回
-            //插入任务表 已退回风险评估
-            RiskPlanTask riskPlanTask1 = new RiskPlanTask();
-            riskPlanTask1.setPlanId(lastRiskPlanTask.getPlanId());
-            riskPlanTask1.setTaskKey(RiskPlanStatusType.WAIT_RETURN.getStatus());
-            riskPlanTask1.setTaskName(RiskPlanStatusType.WAIT_RETURN.getTitle());
-            riskPlanTask1.setStatus("running");
-            riskPlanTask1.setStartTime(new Date());
-            riskPlanTaskService.insertRiskPlanTask(riskPlanTask1);
-
-            //修改计划状态
-            riskPlan.setStatus(RiskPlanStatusType.WAIT_RETURN.getStatus());
-            updateRiskPlan(riskPlan);
-
-            //如果是组长审批 同时退回修改 楼宇单子的状态
-            riskPlanUserBuildingService.updateByRiskPlanAppApproveBuildingDto(appApproveDto.getId(),appApproveDto.getUserId()
-                    ,appApproveDto.getBuildingDtos());
-        } else {
+
+            //组长退回
             if (riskPlan.getStatus().equals(RiskPlanStatusType.WAIT_LEADER_APPROVE.getStatus())){
+                //如果是组长审批 同时退回修改 楼宇单子的状态
+                riskPlanUserBuildingService.updateByRiskPlanAppApproveBuildingDto(appApproveDto.getId(),appApproveDto.getUserId()
+                        ,appApproveDto.getBuildingDtos());
+
+                //插入任务表 已退回组员 风险评估
+                RiskPlanTask riskPlanTask1 = new RiskPlanTask();
+                riskPlanTask1.setPlanId(lastRiskPlanTask.getPlanId());
+                riskPlanTask1.setTaskKey(RiskPlanStatusType.WAIT_RETURN.getStatus());
+                riskPlanTask1.setTaskName(RiskPlanStatusType.WAIT_RETURN.getTitle());
+                riskPlanTask1.setStatus("running");
+                riskPlanTask1.setStartTime(new Date());
+                riskPlanTaskService.insertRiskPlanTask(riskPlanTask1);
+
+                //修改计划状态
+                riskPlan.setStatus(RiskPlanStatusType.WAIT_RETURN.getStatus());
+                updateRiskPlan(riskPlan);
+            }else if(riskPlan.getStatus().equals(RiskPlanStatusType.WAIT_APPROVE.getStatus())){
+
+                //插入任务表 已退回组长 风险评估
+                RiskPlanTask riskPlanTask1 = new RiskPlanTask();
+                riskPlanTask1.setPlanId(lastRiskPlanTask.getPlanId());
+                riskPlanTask1.setApprovalUserId(riskPlan.getLeaderUserId());
+                riskPlanTask1.setTaskKey(RiskPlanStatusType.WAIT_LEADER_RETURN.getStatus());
+                riskPlanTask1.setTaskName(RiskPlanStatusType.WAIT_LEADER_RETURN.getTitle());
+                riskPlanTask1.setStatus("running");
+                riskPlanTask1.setStartTime(new Date());
+                riskPlanTaskService.insertRiskPlanTask(riskPlanTask1);
+
+                //修改计划状态
+                riskPlan.setStatus(RiskPlanStatusType.WAIT_LEADER_RETURN.getStatus());
+                updateRiskPlan(riskPlan);
+            }
+        } else {
+            if (riskPlan.getStatus().equals(RiskPlanStatusType.WAIT_LEADER_APPROVE.getStatus())
+                    || riskPlan.getStatus().equals(RiskPlanStatusType.WAIT_LEADER_RETURN.getStatus())){
                 //修改计划状态
                 riskPlan.setStatus(RiskPlanStatusType.WAIT_APPROVE.getStatus());
                 updateRiskPlan(riskPlan);
@@ -246,7 +265,7 @@ public class RiskPlanServiceImpl implements IRiskPlanService {
                 //插入任务表 审批任务
                 RiskPlanTask riskPlanTask1 = new RiskPlanTask();
                 riskPlanTask1.setPlanId(lastRiskPlanTask.getPlanId());
-                riskPlanTask1.setApprovalUserId(riskPlan.getCreateUserId());
+                riskPlanTask1.setApprovalUserId(riskPlan.getApproveUserId());
                 riskPlanTask1.setTaskKey(RiskPlanStatusType.WAIT_APPROVE.getStatus());
                 riskPlanTask1.setTaskName(RiskPlanStatusType.WAIT_APPROVE.getTitle());
                 riskPlanTask1.setStatus("running");

censoft-rongtong/src/main/resources/mapper/system/RiskPlanMapper.xml

@@ -190,9 +190,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN risk_plan_task rpt ON rpt.plan_id = rp.id
         <where>
             <if test="userId != null">
-             and ((rpt.approval_user_id = #{userId} and (rpt.task_key = 'WAIT_LEADER_APPROVE' or rpt.task_key = 'WAIT_RETURN'))
-                 or
-                  (rpt.approval_user_id = #{userId} and rpt.task_key = 'WAIT_APPROVE'))
+             and (rpt.approval_user_id = #{userId}
+                      and (rpt.task_key = 'WAIT_LEADER_APPROVE' or rpt.task_key = 'WAIT_APPROVE'
+                               or rpt.task_key = 'WAIT_LEADER_RETURN'))
             </if>
             <if test="status != null and status != '' ">
                 and rpt.`status` = #{status}