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/task/service/impl/TaskLabelReportingEventServiceImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java
index fba319b..ffa0a05 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java
@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
import org.springblade.common.constant.DictConstant;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
@@ -74,7 +75,8 @@
default:
name = "";
}
- Long aLong = taskService.saveTask(1, name, 1, "", AuthUtil.getUserId(),taskLabelReportingEvent.getHouseCode(),taskLabelReportingEvent.getReportType());
+ Long aLong = taskService.saveTask(1, name, 1, "", AuthUtil.getUserId(),
+ taskLabelReportingEvent.getHouseCode(),taskLabelReportingEvent.getReportType(),0);
if (aLong > 0) {
// 通过houseCode 获取场所id
QueryWrapper<PlaceEntity> queryWrapper = new QueryWrapper<>();
@@ -97,7 +99,12 @@
if (aLong > 0) {
taskLabelReportingEvent.setConfirmFlag(taskLabelReportingEvent.getStatus().toString());
taskLabelReportingEvent.setConfirmUserId(AuthUtil.getUserId());
- taskLabelReportingEvent.setConfirmTime(new Date());
+ if (null!=taskLabelReportingEvent.getStatus()
+ && taskLabelReportingEvent.getStatus()!=4) {
+ taskLabelReportingEvent.setConfirmFlag(taskLabelReportingEvent.getStatus().toString());
+ taskLabelReportingEvent.setConfirmUserId(AuthUtil.getUserId());
+ taskLabelReportingEvent.setConfirmTime(new Date());
+ }
Boolean b = baseMapper.updateById(taskLabelReportingEvent) > 0;
if (b) {
return b;
--
Gitblit v1.9.3