From 31b6aefacbee9dde61be6afcb7c6dbbf7c6baa7d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 02 Jan 2024 17:51:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/task/service/impl/TaskHotelReportingServiceImpl.java |    4 ++++
 1 files changed, 4 insertions(+), 0 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 7fc66cd..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;
 
 /**
  * 旅馆安全自查任务 服务实现类
@@ -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