From a1eede2f9f7c2590952ab1bdf34210020cdde7c6 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 02 Aug 2024 13:21:56 +0800
Subject: [PATCH] 三色任务和自查任务
---
src/main/java/org/springblade/modules/task/service/impl/TaskPlaceSelfCheckServiceImpl.java | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 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 bc76d30..3c11448 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
@@ -33,6 +33,7 @@
import org.springblade.modules.system.entity.DictBiz;
import org.springblade.modules.system.service.IDictBizService;
import org.springblade.modules.task.dto.TaskPlaceSelfCheckDTO;
+import org.springblade.modules.task.entity.TaskEntity;
import org.springblade.modules.task.entity.TaskPlaceRecordEntity;
import org.springblade.modules.task.entity.TaskPlaceSelfCheckEntity;
import org.springblade.modules.task.excel.TaskPlaceSelfCheckExcel;
@@ -157,27 +158,34 @@
isState.set(true);
}
}
- if (StringUtils.isNotBlank(taskPlaceSelfCheck.getType()) && taskPlaceSelfCheck.getType().equals("2")) {
- // 不存在隐患。状态直接为已审核
- if (!isState.get()) {
- taskPlaceSelfCheck.setStatus(2);
- taskPlaceSelfCheck.setRectificationFlag(3);
+ if (taskPlaceSelfCheck.getTaskId() == null) {
+ if (StringUtils.isNotBlank(taskPlaceSelfCheck.getType()) && taskPlaceSelfCheck.getType().equals("2")) {
+ // 不存在隐患。状态直接为已审核
+ if (!isState.get()) {
+ taskPlaceSelfCheck.setStatus(2);
+ taskPlaceSelfCheck.setRectificationFlag(3);
+ } else {
+ taskPlaceSelfCheck.setStatus(1);
+ taskPlaceSelfCheck.setRectificationFlag(1);
+ }
+ restults = iTaskService.saveTask(CommonConstant.NUMBER_ONE, DictConstant.FIRE_SCHOOL_CHECK_NOTICE, 1,
+ "", AuthUtil.getUserId(), taskPlaceSelfCheck.getHouseCode(), CommonConstant.NUMBER_FOUR, taskPlaceSelfCheck.getStatus());
} else {
- taskPlaceSelfCheck.setStatus(1);
- taskPlaceSelfCheck.setRectificationFlag(1);
+ restults = iTaskService.saveTask(CommonConstant.NUMBER_ONE, DictConstant.FIRE_SELF_CHECK_NOTICE, 1,
+ "", AuthUtil.getUserId(), taskPlaceSelfCheck.getHouseCode(), CommonConstant.NUMBER_SEVEN, 1);
}
- restults = iTaskService.saveTask(CommonConstant.NUMBER_ONE, DictConstant.FIRE_SCHOOL_CHECK_NOTICE, 1,
- "", AuthUtil.getUserId(), taskPlaceSelfCheck.getHouseCode(), CommonConstant.NUMBER_FOUR, taskPlaceSelfCheck.getStatus());
+ if (restults <= 0) {
+ return false;
+ }
+ taskPlaceSelfCheck.setTaskId(restults);
} else {
- restults = iTaskService.saveTask(CommonConstant.NUMBER_ONE, DictConstant.FIRE_SELF_CHECK_NOTICE, 1,
- "", AuthUtil.getUserId(), taskPlaceSelfCheck.getHouseCode(), CommonConstant.NUMBER_SEVEN, 1);
+ iTaskService.update(Wrappers.<TaskEntity>lambdaUpdate()
+ .set(TaskEntity::getStatus, taskPlaceSelfCheck.getStatus())
+ .eq(TaskEntity::getId, taskPlaceSelfCheck.getTaskId()));
}
- if (restults <= 0) {
- return false;
- }
- taskPlaceSelfCheck.setTaskId(restults);
+
// 2.保存任务详情
- boolean save = save(taskPlaceSelfCheck);
+ boolean save = saveOrUpdate(taskPlaceSelfCheck);
if (save) {
// 3.保存题目记录
taskPlaceRecordList.stream().forEach(item -> {
--
Gitblit v1.9.3