Merge branch 'xjchen' into 'develop'

Xjchen

See merge request !3

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

 package com.censoft.censoftrongtong.service.impl;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.censoft.censoftrongtong.domain.RiskPlan;
 import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
+import com.censoft.censoftrongtong.domain.RiskPlanTask;
 import com.censoft.censoftrongtong.domain.dto.RiskInherentListSaveDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppExistingListDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDetailsDto;
 import com.censoft.censoftrongtong.domain.dto.RiskPlanAppInherentListDto;
+import com.censoft.censoftrongtong.enums.RiskPlanStatusType;
 import com.censoft.censoftrongtong.mapper.RiskPlanInherentListMapper;
+import com.censoft.censoftrongtong.mapper.RiskPlanMapper;
+import com.censoft.censoftrongtong.mapper.RiskPlanTaskMapper;
 import com.censoft.censoftrongtong.service.IRiskPlanInherentListService;
+import com.censoft.censoftrongtong.service.IRiskPlanTaskService;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.service.ISysUploadFileService;
 import org.springframework.beans.BeanUtils;
@@ -32,10 +40,18 @@ import javax.annotation.Resource;
 public class RiskPlanInherentListServiceImpl implements IRiskPlanInherentListService {
     @Autowired
     private RiskPlanInherentListMapper riskPlanInherentListMapper;
+    @Autowired
+    private RiskPlanTaskMapper riskPlanTaskMapper;
+
+    @Autowired
+    private RiskPlanMapper riskPlanMapper;
 
     @Resource
     private ISysUploadFileService uploadFileService;
 
+    @Resource
+    private IRiskPlanTaskService riskPlanTaskService;
+
     /**
      * 查询固有风险清单库
      *
@@ -66,6 +82,37 @@ public class RiskPlanInherentListServiceImpl implements IRiskPlanInherentListSer
      */
     @Override
     public int insertRiskPlanInherentList(RiskPlanInherentList riskPlanInherentList) {
+        /**
+         * 解题思路
+         * 1.判断当前任务状态是否待执行状态
+         * 2.待执行修改执行状态变为已完成否则不操作
+         * 3.改为已完成添加任务执行记录
+         */
+        RiskPlanTask riskPlanTask=riskPlanTaskMapper.getLastRiskPlanTaskByPlanId(riskPlanInherentList.getPlanId());
+        //计划
+        RiskPlan riskPlan = riskPlanMapper.selectRiskPlanById(riskPlanTask.getPlanId());
+        if (riskPlanTask!=null) {
+            if (riskPlanTask.getTaskKey().equals("WAIT_START")&&riskPlanTask.getStatus().equals("running")) {
+                //修改任务状态
+                riskPlanTask.setStatus("completed");
+                riskPlanTask.setCompletedTime(new Date());
+                int rs=riskPlanTaskMapper.updateRiskPlanTask(riskPlanTask);
+                if (rs>-1) {//修改状态成功
+                    System.out.println("修改状态成功");
+                }
+                //创建任务执行状态
+                RiskPlanTask riskPlanTask1 = new RiskPlanTask();
+                riskPlanTask1.setPlanId(riskPlanTask.getPlanId());
+                riskPlanTask1.setApprovalUserId(riskPlan.getLeaderUserId());
+                riskPlanTask1.setTaskKey(RiskPlanStatusType.RUNNING.getStatus());
+                riskPlanTask1.setTaskName(RiskPlanStatusType.RUNNING.getTitle());
+                riskPlanTask1.setStatus("running");
+                riskPlanTask1.setStartTime(new Date());
+                riskPlanTaskService.insertRiskPlanTask(riskPlanTask1);
+            }
+        }
+
+
         riskPlanInherentList.setCreateTime(DateUtils.getNowDate());
         return riskPlanInherentListMapper.insertRiskPlanInherentList(riskPlanInherentList);
     }
@@ -78,6 +125,35 @@ public class RiskPlanInherentListServiceImpl implements IRiskPlanInherentListSer
      */
     @Override
     public int updateRiskPlanInherentList(RiskPlanInherentList riskPlanInherentList) {
+        /**
+         * 解题思路
+         * 1.判断当前任务状态是否待执行状态
+         * 2.待执行修改执行状态变为已完成否则不操作
+         * 3.改为已完成添加任务执行记录
+         */
+        RiskPlanTask riskPlanTask=riskPlanTaskMapper.getLastRiskPlanTaskByPlanId(riskPlanInherentList.getPlanId());
+        //计划
+        RiskPlan riskPlan = riskPlanMapper.selectRiskPlanById(riskPlanTask.getPlanId());
+        if (riskPlanTask!=null) {
+            if (riskPlanTask.getTaskKey().equals("WAIT_START")&&riskPlanTask.getStatus().equals("running")) {
+                //修改任务状态
+                riskPlanTask.setStatus("completed");
+                riskPlanTask.setCompletedTime(new Date());
+                int rs=riskPlanTaskMapper.updateRiskPlanTask(riskPlanTask);
+                if (rs>-1) {//修改状态成功
+                    System.out.println("修改状态成功");
+                }
+                //创建任务执行状态
+                RiskPlanTask riskPlanTask1 = new RiskPlanTask();
+                riskPlanTask1.setPlanId(riskPlanTask.getPlanId());
+                riskPlanTask1.setApprovalUserId(riskPlan.getLeaderUserId());
+                riskPlanTask1.setTaskKey(RiskPlanStatusType.RUNNING.getStatus());
+                riskPlanTask1.setTaskName(RiskPlanStatusType.RUNNING.getTitle());
+                riskPlanTask1.setStatus("running");
+                riskPlanTask1.setStartTime(new Date());
+                riskPlanTaskService.insertRiskPlanTask(riskPlanTask1);
+            }
+        }
         riskPlanInherentList.setUpdateTime(DateUtils.getNowDate());
         return riskPlanInherentListMapper.updateRiskPlanInherentList(riskPlanInherentList);
     }
@@ -90,6 +166,36 @@ public class RiskPlanInherentListServiceImpl implements IRiskPlanInherentListSer
      */
     @Override
     public int deleteRiskPlanInherentListByIds(Long[] ids) {
+        /**
+         * 解题思路
+         * 1.判断当前任务状态是否待执行状态
+         * 2.待执行修改执行状态变为已完成否则不操作
+         * 3.改为已完成添加任务执行记录
+         */
+        RiskPlanInherentList riskPlanInherentList=riskPlanInherentListMapper.selectRiskPlanInherentListById(ids[0]);
+        RiskPlanTask riskPlanTask=riskPlanTaskMapper.getLastRiskPlanTaskByPlanId(riskPlanInherentList.getPlanId());
+        //计划
+        RiskPlan riskPlan = riskPlanMapper.selectRiskPlanById(riskPlanTask.getPlanId());
+        if (riskPlanTask!=null) {
+            if (riskPlanTask.getTaskKey().equals("WAIT_START")&&riskPlanTask.getStatus().equals("running")) {
+                //修改任务状态
+                riskPlanTask.setStatus("completed");
+                riskPlanTask.setCompletedTime(new Date());
+                int rs=riskPlanTaskMapper.updateRiskPlanTask(riskPlanTask);
+                if (rs>-1) {//修改状态成功
+                    System.out.println("修改状态成功");
+                }
+                //创建任务执行状态
+                RiskPlanTask riskPlanTask1 = new RiskPlanTask();
+                riskPlanTask1.setPlanId(riskPlanTask.getPlanId());
+                riskPlanTask1.setApprovalUserId(riskPlan.getLeaderUserId());
+                riskPlanTask1.setTaskKey(RiskPlanStatusType.RUNNING.getStatus());
+                riskPlanTask1.setTaskName(RiskPlanStatusType.RUNNING.getTitle());
+                riskPlanTask1.setStatus("running");
+                riskPlanTask1.setStartTime(new Date());
+                riskPlanTaskService.insertRiskPlanTask(riskPlanTask1);
+            }
+        }
         return riskPlanInherentListMapper.deleteRiskPlanInherentListByIds(ids);
     }
 
@@ -101,6 +207,36 @@ public class RiskPlanInherentListServiceImpl implements IRiskPlanInherentListSer
      */
     @Override
     public int deleteRiskPlanInherentListById(Long id) {
+        /**
+         * 解题思路
+         * 1.判断当前任务状态是否待执行状态
+         * 2.待执行修改执行状态变为已完成否则不操作
+         * 3.改为已完成添加任务执行记录
+         */
+        RiskPlanInherentList riskPlanInherentList=riskPlanInherentListMapper.selectRiskPlanInherentListById(id);
+        RiskPlanTask riskPlanTask=riskPlanTaskMapper.getLastRiskPlanTaskByPlanId(riskPlanInherentList.getPlanId());
+        //计划
+        RiskPlan riskPlan = riskPlanMapper.selectRiskPlanById(riskPlanTask.getPlanId());
+        if (riskPlanTask!=null) {
+            if (riskPlanTask.getTaskKey().equals("WAIT_START")&&riskPlanTask.getStatus().equals("running")) {
+                //修改任务状态
+                riskPlanTask.setStatus("completed");
+                riskPlanTask.setCompletedTime(new Date());
+                int rs=riskPlanTaskMapper.updateRiskPlanTask(riskPlanTask);
+                if (rs>-1) {//修改状态成功
+                    System.out.println("修改状态成功");
+                }
+                //创建任务执行状态
+                RiskPlanTask riskPlanTask1 = new RiskPlanTask();
+                riskPlanTask1.setPlanId(riskPlanTask.getPlanId());
+                riskPlanTask1.setApprovalUserId(riskPlan.getLeaderUserId());
+                riskPlanTask1.setTaskKey(RiskPlanStatusType.RUNNING.getStatus());
+                riskPlanTask1.setTaskName(RiskPlanStatusType.RUNNING.getTitle());
+                riskPlanTask1.setStatus("running");
+                riskPlanTask1.setStartTime(new Date());
+                riskPlanTaskService.insertRiskPlanTask(riskPlanTask1);
+            }
+        }
         return riskPlanInherentListMapper.deleteRiskPlanInherentListById(id);
     }