From b3b566ebdfed4005aaa513da3d5d2fd3924903cc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 31 Jan 2024 16:17:54 +0800
Subject: [PATCH] 拿不到地址总表数据，不设置网格信息
---
src/main/java/org/springblade/modules/task/service/impl/TaskHotelReportingServiceImpl.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskHotelReportingServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskHotelReportingServiceImpl.java
index 65cb5c9..4099189 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskHotelReportingServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskHotelReportingServiceImpl.java
@@ -23,6 +23,7 @@
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.place.entity.PlaceEntity;
import org.springblade.modules.place.service.IPlaceService;
+import org.springblade.modules.system.entity.Dict;
import org.springblade.modules.task.dto.TaskHotelReportingDTO;
import org.springblade.modules.task.entity.TaskHotelReportingEntity;
import org.springblade.modules.task.mapper.TaskHotelReportingMapper;
@@ -61,11 +62,17 @@
@Override
public boolean saveHotelReporting(TaskHotelReportingDTO taskHotelReporting) {
- Long aLong = taskService.saveTask(2, DictConstant.HOTEL_SECURITY, 1, "", AuthUtil.getUserId(), taskHotelReporting.getHouseCode(), taskHotelReporting.getReportType());
+ String name = DictConstant.HOTEL_SECURITY;
+ // 九小场所
+ if (taskHotelReporting.getEventType().equals(1)) {
+ taskHotelReporting.setReportType(7);
+ name = DictConstant.FIRE_CHECK;
+ }
+ Long aLong = taskService.saveTask(2, name, 1, "", AuthUtil.getUserId(), taskHotelReporting.getHouseCode(), taskHotelReporting.getReportType());
if (aLong > 0) {
// 通过houseCode 获取场所id
QueryWrapper<PlaceEntity> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("is_deleted",0).eq("house_code",taskHotelReporting.getHouseCode());
+ queryWrapper.eq("is_deleted", 0).eq("house_code", taskHotelReporting.getHouseCode());
PlaceEntity placeEntity = placeService.getOne(queryWrapper);
taskHotelReporting.setPlaceId(placeEntity.getId());
taskHotelReporting.setTaskId(aLong);
@@ -81,9 +88,12 @@
public Boolean updateHotelReporting(TaskHotelReportingVO taskHotelReporting) throws Exception {
Long aLong = taskService.updateTask(null, null, null, "", AuthUtil.getUserId(), taskHotelReporting.getTaskId(), taskHotelReporting.getStatus());
if (aLong > 0) {
- taskHotelReporting.setConfirmFlag(taskHotelReporting.getStatus().toString());
- taskHotelReporting.setConfirmUserId(AuthUtil.getUserId());
- taskHotelReporting.setConfirmTime(new Date());
+ if (null!=taskHotelReporting.getStatus()
+ && taskHotelReporting.getStatus()!=4) {
+ taskHotelReporting.setConfirmFlag(taskHotelReporting.getStatus().toString());
+ taskHotelReporting.setConfirmUserId(AuthUtil.getUserId());
+ taskHotelReporting.setConfirmTime(new Date());
+ }
boolean b = baseMapper.updateById(taskHotelReporting) > 0;
if (b) {
return b;
--
Gitblit v1.9.3