From 9d521d0ff5fe8b09ceb9d7f2ec0f883048860810 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 04 Jan 2024 18:32:30 +0800
Subject: [PATCH] bug修复+通过小区id 查询小区的楼栋和单元

---
 src/main/java/org/springblade/modules/task/service/impl/TaskHotelReportingServiceImpl.java |   14 ++++++++++----
 1 files changed, 10 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 1a93cd9..102ea8b 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
@@ -27,6 +27,7 @@
 import org.springblade.modules.task.service.ITaskService;
 import org.springblade.modules.task.vo.TaskHotelReportingVO;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.Date;
@@ -51,24 +52,29 @@
 
 	@Override
 	public boolean saveHotelReporting(TaskHotelReportingDTO taskHotelReporting) {
-		Long aLong = taskService.saveTask(2, DictConstant.HOTEL_SECURITY, 1, "", AuthUtil.getUserId(),taskHotelReporting.getHouseCode(),taskHotelReporting.getReportType());
+		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());
-			return baseMapper.insert(taskHotelReporting) > 0 ? true : false;
+			return baseMapper.insert(taskHotelReporting) > 0;
 		}
 		return false;
 	}
 
 
 	@Override
-	public Boolean updateHotelReporting(TaskHotelReportingEntity taskHotelReporting) {
+	@Transactional(rollbackFor = Exception.class)
+	public Boolean updateHotelReporting(TaskHotelReportingEntity 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());
-			return baseMapper.updateById(taskHotelReporting) > 0 ? true : false;
+			boolean b = baseMapper.updateById(taskHotelReporting) > 0;
+			if (b) {
+				return b;
+			}
+			throw new Exception("更新失败!");
 		}
 		return false;
 	}

--
Gitblit v1.9.3