Commit 0e18f038 authored by chenzhao's avatar chenzhao

修改bug

parent cd2c5f24
...@@ -2385,8 +2385,9 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -2385,8 +2385,9 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
List<LatentDangerFlowRecord> recordList = latentDangerFlowRecordService.list(recordQueryWrapper); List<LatentDangerFlowRecord> recordList = latentDangerFlowRecordService.list(recordQueryWrapper);
if (!ValidationUtil.isEmpty(recordList)) { if (!ValidationUtil.isEmpty(recordList)) {
recordList.forEach(r -> r.setDeleted(true)); recordList.forEach(r -> r.setDeleted(true));
//草稿状态下的隐患不存在隐患操作记录
latentDangerFlowRecordService.saveOrUpdateBatch(recordList);
} }
latentDangerFlowRecordService.saveOrUpdateBatch(recordList);
LambdaQueryWrapper<LatentDanger> dangerQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<LatentDanger> dangerQueryWrapper = new LambdaQueryWrapper<>();
dangerQueryWrapper.in(LatentDanger::getId, dangerIdList); dangerQueryWrapper.in(LatentDanger::getId, dangerIdList);
......
...@@ -261,6 +261,7 @@ public class PlanServiceImpl implements IPlanService { ...@@ -261,6 +261,7 @@ public class PlanServiceImpl implements IPlanService {
} else { } else {
if (PlanStatusEnum.EXAMINE_THREE.getValue() != status){ if (PlanStatusEnum.EXAMINE_THREE.getValue() != status){
rulePlanService.addPlanAuditRule(plan, userIds, RuleTypeEnum.计划审核, ExecuteStateNameEnum.getNameByCode(excuteState)); // 计划审核 rulePlanService.addPlanAuditRule(plan, userIds, RuleTypeEnum.计划审核, ExecuteStateNameEnum.getNameByCode(excuteState)); // 计划审核
rulePlanService.addPlanAuditRule(plan, userIds, RuleTypeEnum.计划审核任务, ExecuteStateNameEnum.getNameByCode(excuteState)); // 计划审核任务通知
} else { } else {
rulePlanService.addPlanAuditRule(plan, userIds, RuleTypeEnum.计划审核完成, ExecuteStateNameEnum.getNameByCode(excuteState)); // 计划审核完成 rulePlanService.addPlanAuditRule(plan, userIds, RuleTypeEnum.计划审核完成, ExecuteStateNameEnum.getNameByCode(excuteState)); // 计划审核完成
} }
......
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