From daef9edffb73d542ff1eba4beb215ffc7b306254 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 28 Dec 2023 18:44:46 +0800
Subject: [PATCH] bug 修复

---
 src/main/java/org/springblade/modules/task/service/impl/TaskHotelReportingServiceImpl.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 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 21165f8..1a93cd9 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
@@ -29,6 +29,7 @@
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Date;
 
 /**
  * 旅馆安全自查任务 服务实现类
@@ -50,7 +51,7 @@
 
 	@Override
 	public boolean saveHotelReporting(TaskHotelReportingDTO taskHotelReporting) {
-		Long aLong = taskService.saveTask(2, DictConstant.HOTEL_SECURITY, 1, "", AuthUtil.getUserId(),taskHotelReporting.getHouseCode());
+		Long aLong = taskService.saveTask(2, DictConstant.HOTEL_SECURITY, 1, "", AuthUtil.getUserId(),taskHotelReporting.getHouseCode(),taskHotelReporting.getReportType());
 		if (aLong > 0) {
 			taskHotelReporting.setTaskId(aLong);
 			taskHotelReporting.setCheckUserId(AuthUtil.getUserId());
@@ -64,6 +65,9 @@
 	public Boolean updateHotelReporting(TaskHotelReportingEntity taskHotelReporting) {
 		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());
 			return baseMapper.updateById(taskHotelReporting) > 0 ? true : false;
 		}
 		return false;

--
Gitblit v1.9.3