From 9ba12dad011e2afa278833f37aba895a632ccb9c Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 06 May 2024 14:45:16 +0800
Subject: [PATCH] 校园安全检查
---
src/main/java/org/springblade/modules/task/service/impl/TaskPlaceSelfCheckServiceImpl.java | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskPlaceSelfCheckServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskPlaceSelfCheckServiceImpl.java
index 4509d2e..6b89d5b 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskPlaceSelfCheckServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskPlaceSelfCheckServiceImpl.java
@@ -48,6 +48,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
/**
@@ -142,9 +143,28 @@
// 1.保存任务表
ITaskService iTaskService = SpringUtils.getBean(ITaskService.class);
Long restults;
+ AtomicBoolean isState = new AtomicBoolean(false);
+ List<TaskPlaceRecordVO> taskPlaceRecordList = taskPlaceSelfCheck.getTaskPlaceRecordVOList();
+ for (TaskPlaceRecordVO taskPlaceRecordVO : taskPlaceRecordList) {
+ // 判断类型
+ if (StringUtils.isNotBlank(taskPlaceSelfCheck.getType()) && taskPlaceSelfCheck.getType().equals("2")) {
+ taskPlaceRecordVO.setType("3");
+ } else {
+ taskPlaceRecordVO.setType("1");
+ }
+ // 判断是否有隐患
+ if (taskPlaceRecordVO.getState().equals(0)) {
+ isState.set(true);
+ }
+ }
if (StringUtils.isNotBlank(taskPlaceSelfCheck.getType()) && taskPlaceSelfCheck.getType().equals("2")) {
+ // 不存在隐患。状态直接为已审核
+ if (!isState.get()) {
+ taskPlaceSelfCheck.setStatus(2);
+ taskPlaceSelfCheck.setRectificationFlag(3);
+ }
restults = iTaskService.saveTask(CommonConstant.NUMBER_ONE, DictConstant.FIRE_SCHOOL_CHECK_NOTICE, 1,
- "", AuthUtil.getUserId(), taskPlaceSelfCheck.getHouseCode(), CommonConstant.NUMBER_FOUR, 1);
+ "", AuthUtil.getUserId(), taskPlaceSelfCheck.getHouseCode(), CommonConstant.NUMBER_FOUR, taskPlaceSelfCheck.getStatus());
} else {
restults = iTaskService.saveTask(CommonConstant.NUMBER_ONE, DictConstant.FIRE_SELF_CHECK_NOTICE, 1,
"", AuthUtil.getUserId(), taskPlaceSelfCheck.getHouseCode(), CommonConstant.NUMBER_SEVEN, 1);
@@ -157,16 +177,14 @@
boolean save = save(taskPlaceSelfCheck);
if (save) {
// 3.保存题目记录
- List<TaskPlaceRecordVO> taskPlaceRecordList = taskPlaceSelfCheck.getTaskPlaceRecordVOList();
- ITaskPlaceRecordService bean = SpringUtil.getBean(ITaskPlaceRecordService.class);
taskPlaceRecordList.stream().forEach(item -> {
item.setTaskPlaceSelfCheckId(taskPlaceSelfCheck.getId());
item.setCreateUser(AuthUtil.getUserId());
- item.setType("1");
});
- List<TaskPlaceRecordEntity> collect = taskPlaceRecordList.stream().filter(item -> item.getState().equals(0)).collect(Collectors.toList());
+ ITaskPlaceRecordService taskPlaceRecordService = SpringUtil.getBean(ITaskPlaceRecordService.class);
+ List<TaskPlaceRecordEntity> collect = taskPlaceRecordList.stream().collect(Collectors.toList());
if (collect.size() > 0) {
- bean.saveBatch(collect);
+ taskPlaceRecordService.saveBatch(collect);
}
updateById(taskPlaceSelfCheck);
return save;
@@ -190,10 +208,10 @@
List<TaskPlaceRecordVO> taskPlaceRecordList = taskPlaceSelfCheck.getTaskPlaceRecordVOList();
if (taskPlaceRecordList != null && taskPlaceRecordList.size() > 0) {
ITaskPlaceRecordService bean = SpringUtil.getBean(ITaskPlaceRecordService.class);
- List<TaskPlaceRecordEntity> copy = BeanUtil.copy(taskPlaceRecordList, TaskPlaceRecordEntity.class);
- boolean b = bean.saveOrUpdateBatch(copy);
- if (b) {
- return b;
+ List<TaskPlaceRecordEntity> placeRecordEntityList = BeanUtil.copy(taskPlaceRecordList, TaskPlaceRecordEntity.class);
+ boolean updateBatch = bean.saveOrUpdateBatch(placeRecordEntityList);
+ if (updateBatch) {
+ return updateBatch;
}
throw new CustomException("保存失败！");
}
--
Gitblit v1.9.3