Commit 660a53d1 authored by 周昊's avatar 周昊

1、修改app端执行任务,如果第一回提交推进流程

parent 10f24963
......@@ -66,6 +66,30 @@ public class RiskPlanUserBuildingServiceImpl
riskPlanUserBuilding.setSubmitUserId(userId);
updateById(riskPlanUserBuilding);
//如果完成一项
RiskPlan riskPlan = riskPlanService.selectRiskPlanById(planId);
RiskPlanTask lastRiskPlanTask = riskPlanTaskService.getLastRiskPlanTaskByPlanId(planId);
if (RiskPlanStatusType.WAIT_START.getStatus().equals(riskPlan.getStatus())) {
//修改任务状态
lastRiskPlanTask.setStatus("completed");
lastRiskPlanTask.setCompletedTime(new Date());
riskPlanTaskService.updateRiskPlanTask(lastRiskPlanTask);
//创建任务执行状态
RiskPlanTask riskPlanTask1 = new RiskPlanTask();
riskPlanTask1.setPlanId(planId);
riskPlanTask1.setApprovalUserId(riskPlan.getLeaderUserId());
riskPlanTask1.setTaskKey(RiskPlanStatusType.RUNNING.getStatus());
riskPlanTask1.setTaskName(RiskPlanStatusType.RUNNING.getTitle());
riskPlanTask1.setStatus("running");
riskPlanTask1.setStartTime(new Date());
riskPlanTaskService.insertRiskPlanTask(riskPlanTask1);
//修改计划状态
riskPlan.setStatus(RiskPlanStatusType.RUNNING.getStatus());
riskPlanService.updateRiskPlan(riskPlan);
}
//查看是否全部楼宇提交
LambdaQueryWrapper<RiskPlanUserBuilding> wrapper2 = new LambdaQueryWrapper<>();
wrapper2 = wrapper2.eq(RiskPlanUserBuilding::getPlanId, planId);
......@@ -73,13 +97,13 @@ public class RiskPlanUserBuildingServiceImpl
if (list.stream().allMatch(po -> po.getStatus().equals("finish"))) {
//获取最新的task
RiskPlanTask lastRiskPlanTask = riskPlanTaskService.getLastRiskPlanTaskByPlanId(planId);
lastRiskPlanTask = riskPlanTaskService.getLastRiskPlanTaskByPlanId(planId);
lastRiskPlanTask.setStatus("completed");
lastRiskPlanTask.setCompletedTime(new Date());
riskPlanTaskService.updateRiskPlanTask(lastRiskPlanTask);
//计划
RiskPlan riskPlan = riskPlanService.selectRiskPlanById(planId);
riskPlan = riskPlanService.selectRiskPlanById(planId);
//插入任务表 组长验收任务
RiskPlanTask riskPlanTask1 = new RiskPlanTask();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment