From d40f0ec77c41e3e6230d9f3fd59363e87d2cbf74 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 27 Jan 2024 22:37:28 +0800
Subject: [PATCH] 九小场所
---
src/main/java/org/springblade/modules/task/service/impl/TaskHotelReportingServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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..cb8cfd1 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
@@ -61,11 +61,15 @@
@Override
public boolean saveHotelReporting(TaskHotelReportingDTO taskHotelReporting) {
+ // 九小场所
+ if (taskHotelReporting.getEventType().equals(1)) {
+ taskHotelReporting.setReportType(7);
+ }
Long aLong = taskService.saveTask(2, DictConstant.HOTEL_SECURITY, 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 +85,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