1、开发接口根据风险任务审批列表

2、开发接口根据风险任务审批
3、开发接口根据删除任务

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

@@ -274,7 +274,6 @@ public class RiskPlanAppController extends BaseController {
     }
 
 
-
     /**
      * 添加现有风险
      *
@@ -328,4 +327,38 @@ public class RiskPlanAppController extends BaseController {
 
         return R.ok(riskPlanExistingListService.saveRiskExistingListSaveDto(saveDto));
     }
+
+
+    /**
+     * 根据风险任务审批列表
+     *
+     * @real_return {@link R<List<RiskPlanAppExistingListDto>>}
+     */
+    @GetMapping("/approve/list")
+    public R<List<RiskPlanAppListDto>> getRiskPlanAppListDtoListByApproveUser() {
+        List<RiskPlanStatusType> statusList = Arrays.asList(RiskPlanStatusType.WAIT_FINISH);
+        return R.ok(riskPlanService.getRiskPlanAppListDtoList(statusList, null, getUserId()));
+    }
+
+
+    /**
+     * 根据风险任务审批
+     *
+     * @real_return {@link R<Integer>}
+     */
+    @PostMapping("/approve")
+    public R<Integer> approveAppApproveDto(@RequestBody RiskPlanAppApproveDto appApproveDto) {
+        return R.ok(riskPlanService.approveAppApproveDto(appApproveDto));
+    }
+
+
+    /**
+     * 退回删除接口
+     *
+     * @real_return {@link R<Integer>}
+     */
+    @PostMapping("/revoke/{planId}")
+    public R<Integer> revokeByPlanId(@PathVariable("planId") Long planId) {
+        return R.ok(riskPlanService.revokeByPlanId(planId,getUserId()));
+    }
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskPlanAppApproveDto.java

+package com.censoft.censoftrongtong.domain.dto;
+
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+
+/**
+ * @author 周昊
+ * @desc ...
+ * @date 2023-06-27 14:45:45
+ */
+@Data
+public class RiskPlanAppApproveDto {
+    /** id */
+    private Long id;
+
+    /** 经办结果 */
+    private String taskResult;
+
+    /** 经办意见 */
+    private String taskOpinion;
+}

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/RiskPlanTaskMapper.java

 package com.censoft.censoftrongtong.mapper;
 
 import com.censoft.censoftrongtong.domain.RiskPlanTask;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -59,4 +60,6 @@ public interface RiskPlanTaskMapper
      * @return 结果
      */
     public int deleteRiskPlanTaskByIds(Long[] ids);
+
+    RiskPlanTask getLastRiskPlanTaskByPlanId(@Param("id") Long id);
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/IRiskPlanService.java

@@ -2,6 +2,7 @@ package com.censoft.censoftrongtong.service;
 
 import com.censoft.censoftrongtong.domain.LedgerBuilding;
 import com.censoft.censoftrongtong.domain.RiskPlan;
+import com.censoft.censoftrongtong.domain.dto.RiskPlanAppApproveDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppDetailsDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppListDto;
 import com.censoft.censoftrongtong.enums.RiskPlanStatusType;
@@ -71,4 +72,8 @@ public interface IRiskPlanService
     RiskPlanAppDetailsDto getRiskPlanAppDetailsDtoByPlanId(Long planId);
 
     List<LedgerBuilding> getBuildingListByPlanId(Long planId);
+
+    int approveAppApproveDto(RiskPlanAppApproveDto appApproveDto);
+
+    int revokeByPlanId(Long planId, Long userId);
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/IRiskPlanTaskService.java

@@ -59,4 +59,6 @@ public interface IRiskPlanTaskService
      * @return 结果
      */
     public int deleteRiskPlanTaskById(Long id);
+
+    RiskPlanTask getLastRiskPlanTaskByPlanId(Long id);
 }

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

@@ -7,6 +7,7 @@ import java.util.stream.Collectors;
 import com.censoft.censoftrongtong.domain.LedgerBuilding;
 import com.censoft.censoftrongtong.domain.RiskPlan;
 import com.censoft.censoftrongtong.domain.RiskPlanTask;
+import com.censoft.censoftrongtong.domain.dto.RiskPlanAppApproveDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppDetailsDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppListDto;
 import com.censoft.censoftrongtong.enums.RiskPlanStatusType;
@@ -179,6 +180,69 @@ public class RiskPlanServiceImpl implements IRiskPlanService {
         return ledgerBuildingService.getBuildingListByIds(Arrays.asList(riskPlan.getBuildingIds().split(",")));
     }
 
+    @Override
+    public int approveAppApproveDto(RiskPlanAppApproveDto appApproveDto) {
+        //获取最新的task
+        RiskPlanTask lastRiskPlanTask = riskPlanTaskService.getLastRiskPlanTaskByPlanId(appApproveDto.getId());
+        lastRiskPlanTask.setTaskResult(appApproveDto.getTaskResult());
+        lastRiskPlanTask.setTaskOpinion(appApproveDto.getTaskOpinion());
+        lastRiskPlanTask.setStatus("completed");
+        lastRiskPlanTask.setCompletedTime(new Date());
+        riskPlanTaskService.updateRiskPlanTask(lastRiskPlanTask);
+
+        //计划
+        RiskPlan riskPlan = selectRiskPlanById(lastRiskPlanTask.getPlanId());
+
+        if ("0".equals(appApproveDto.getTaskResult())) {
+            //退回
+            //插入任务表 已退回风险评估
+            RiskPlanTask riskPlanTask1 = new RiskPlanTask();
+            riskPlanTask1.setPlanId(lastRiskPlanTask.getPlanId());
+            riskPlanTask1.setApprovalUserId(riskPlan.getLeaderUserId());
+            riskPlanTask1.setTaskKey(RiskPlanStatusType.WAIT_ADJUST.getStatus());
+            riskPlanTask1.setTaskName(RiskPlanStatusType.getTitleByStatus(RiskPlanStatusType.WAIT_ADJUST.getStatus()));
+            riskPlanTask1.setStatus("running");
+            riskPlanTask1.setStartTime(new Date());
+            riskPlanTaskService.insertRiskPlanTask(riskPlanTask1);
+
+            //修改计划状态
+            riskPlan.setStatus(RiskPlanStatusType.WAIT_ADJUST.getStatus());
+            updateRiskPlan(riskPlan);
+        } else {
+            //修改计划状态
+            riskPlan.setStatus(RiskPlanStatusType.FINISH.getStatus());
+            updateRiskPlan(riskPlan);
+        }
+        return 1;
+    }
+
+    @Override
+    public int revokeByPlanId(Long planId, Long userId) {
+        //计划
+        RiskPlan riskPlan = selectRiskPlanById(planId);
+
+        //获取最新的task
+        RiskPlanTask lastRiskPlanTask = riskPlanTaskService.getLastRiskPlanTaskByPlanId(planId);
+        lastRiskPlanTask.setStatus("completed");
+        lastRiskPlanTask.setCompletedTime(new Date());
+        riskPlanTaskService.updateRiskPlanTask(lastRiskPlanTask);
+
+        //插入任务表 已撤销风险评估
+        RiskPlanTask riskPlanTask1 = new RiskPlanTask();
+        riskPlanTask1.setPlanId(lastRiskPlanTask.getPlanId());
+        riskPlanTask1.setTaskKey(RiskPlanStatusType.REVOKE.getStatus());
+        riskPlanTask1.setTaskName(RiskPlanStatusType.getTitleByStatus(RiskPlanStatusType.REVOKE.getStatus()));
+        riskPlanTask1.setStatus("completed");
+        riskPlanTask1.setStartTime(new Date());
+        riskPlanTaskService.insertRiskPlanTask(riskPlanTask1);
+
+        //修改计划状态
+        riskPlan.setStatus(RiskPlanStatusType.REVOKE.getStatus());
+        updateRiskPlan(riskPlan);
+
+        return 1;
+    }
+
     private String getNo() {
         Random random = new Random();
         int randomNumber = random.nextInt(1000); // 生成0到999之间的随机数

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

@@ -91,4 +91,9 @@ public class RiskPlanTaskServiceImpl implements IRiskPlanTaskService
     {
         return riskPlanTaskMapper.deleteRiskPlanTaskById(id);
     }
+
+    @Override
+    public RiskPlanTask getLastRiskPlanTaskByPlanId(Long id) {
+        return riskPlanTaskMapper.getLastRiskPlanTaskByPlanId(id);
+    }
 }

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

@@ -40,6 +40,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectRiskPlanTaskVo"/>
         where id = #{id}
     </select>
+    <select id="getLastRiskPlanTaskByPlanId" resultMap="RiskPlanTaskResult">
+        <include refid="selectRiskPlanTaskVo"/>
+        where plan_id = #{id}
+        order BY start_time desc
+        limit 1
+    </select>
 
     <insert id="insertRiskPlanTask" parameterType="com.censoft.censoftrongtong.domain.RiskPlanTask" useGeneratedKeys="true" keyProperty="id">
         insert into risk_plan_task