From b7df6735bcb2d447cae7fcfba2d12accf3dd2fcc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 03 Feb 2024 17:27:21 +0800
Subject: [PATCH] 消防检查优化
---
src/main/java/org/springblade/modules/place/service/impl/PlaceCheckServiceImpl.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceCheckServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceCheckServiceImpl.java
index 1316e1f..625a132 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceCheckServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceCheckServiceImpl.java
@@ -43,6 +43,7 @@
import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
/**
* 场所检查表 服务实现类
@@ -74,19 +75,24 @@
@Transactional(rollbackFor = Exception.class)
public Boolean savePlace(PlaceCheckVO placeCheck) throws Exception {
placeCheck.setCreateUser(AuthUtil.getUserId());
+ List<PatrolRecord> patrolRecordVOList = placeCheck.getPatrolRecordVOList();
+ AtomicReference<Integer> number = new AtomicReference<>(0);
+ patrolRecordVOList.stream().forEach(item -> {
+ if (item.getState().equals(0)) {
+ number.getAndSet(number.get() + 1);
+ }
+ });
+ placeCheck.setHiddenDangerNumber(number.get());
boolean save = save(placeCheck);
if (save) {
IPatrolRecordService bean = SpringUtil.getBean(IPatrolRecordService.class);
- List<PatrolRecord> patrolRecordVOList = placeCheck.getPatrolRecordVOList();
- AtomicReference<Integer> number = new AtomicReference<>(0);
patrolRecordVOList.stream().forEach(item -> {
item.setPlaceCheckId(placeCheck.getId());
item.setCreateUser(AuthUtil.getUserId());
- if (item.getState().equals(0)) {
- number.getAndSet(number.get() + 1);
- }
});
- boolean b = bean.saveBatch(patrolRecordVOList);
+ List<PatrolRecord> collect = patrolRecordVOList.stream().filter(item -> item.getState().equals(0)).collect(Collectors.toList());
+ boolean b = bean.saveBatch(collect);
+ updateById(placeCheck);
if (b) {
// 隐患问题大于0 则创建任务
try {
@@ -95,7 +101,7 @@
// 保存任务表
ITaskService bean2 = SpringUtils.getBean(ITaskService.class);
Long aLong = bean2.saveTask(CommonConstant.NUMBER_FOUR, DictConstant.FIRE_RECTIFICATION_NOTICE, 1,
- "", AuthUtil.getUserId(), placeCheck.getHouseCode(), CommonConstant.NUMBER_EIGHT);
+ "", AuthUtil.getUserId(), placeCheck.getHouseCode(), CommonConstant.NUMBER_EIGHT,4);
if (aLong > 0) {
// 保存任务详情表
ITaskPlaceRectificationService bean1 = SpringUtil.getBean(ITaskPlaceRectificationService.class);
@@ -103,6 +109,7 @@
copy.setTaskId(aLong);
copy.setPlaceCheckId(placeCheck.getId());
copy.setId(null);
+ copy.setStatus(4);
bean1.save(copy);
}
}
--
Gitblit v1.9.3