From ad2ec97fe0c60eee4bb7c8cdacff7c876f280ea7 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 08 Jan 2024 11:30:18 +0800
Subject: [PATCH] 公安安全监管

---
 src/main/java/org/springblade/modules/task/service/impl/TaskCampusReportingEventServiceImpl.java |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskCampusReportingEventServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskCampusReportingEventServiceImpl.java
index d08c4e9..b86a423 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskCampusReportingEventServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskCampusReportingEventServiceImpl.java
@@ -16,21 +16,21 @@
  */
 package org.springblade.modules.task.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springblade.common.constant.DictConstant;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.modules.task.dto.TaskCampusReportingEventDTO;
-import org.springblade.modules.task.entity.TaskBailReportingEventEntity;
 import org.springblade.modules.task.entity.TaskCampusReportingEventEntity;
-import org.springblade.modules.task.service.ITaskService;
-import org.springblade.modules.task.vo.TaskCampusReportingEventVO;
 import org.springblade.modules.task.mapper.TaskCampusReportingEventMapper;
 import org.springblade.modules.task.service.ITaskCampusReportingEventService;
-import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.task.service.ITaskService;
+import org.springblade.modules.task.vo.TaskCampusReportingEventVO;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import javax.annotation.Resource;
+import java.util.Date;
 
 /**
  * 校园安全检查任务表 服务实现类
@@ -39,7 +39,7 @@
  * @since 2023-11-06
  */
 @Service
-public class TaskCampusReportingEventServiceImpl extends BaseServiceImpl<TaskCampusReportingEventMapper, TaskCampusReportingEventEntity> implements ITaskCampusReportingEventService {
+public class TaskCampusReportingEventServiceImpl extends ServiceImpl<TaskCampusReportingEventMapper, TaskCampusReportingEventEntity> implements ITaskCampusReportingEventService {
 
 	@Resource
 	private ITaskService taskService;
@@ -55,18 +55,24 @@
 		if (aLong > 0) {
 			reporting.setTaskId(aLong);
 			reporting.setCheckUserId(AuthUtil.getUserId());
-			return baseMapper.insert(reporting) > 0 ? true : false;
+			return baseMapper.insert(reporting) > 0;
 		}
 		return false;
 	}
 
 
 	@Override
-	public Boolean updateCampusReporting(TaskCampusReportingEventDTO taskCampusReportingEvent) {
+	public Boolean updateCampusReporting(TaskCampusReportingEventDTO taskCampusReportingEvent) throws Exception {
 		Integer integer = StringUtils.isBlank(taskCampusReportingEvent.getConfirmFlag()) ? null : Integer.valueOf(taskCampusReportingEvent.getConfirmFlag());
 		Long aLong = taskService.updateTask(null, null, null, "", AuthUtil.getUserId(), taskCampusReportingEvent.getTaskId(), integer);
 		if (aLong > 0) {
-			return baseMapper.updateById(taskCampusReportingEvent) > 0 ? true : false;
+			taskCampusReportingEvent.setConfirmUserId(AuthUtil.getUserId());
+			taskCampusReportingEvent.setConfirmTime(new Date());
+			Boolean b = baseMapper.updateById(taskCampusReportingEvent) > 0;
+			if (b) {
+				return b;
+			}
+			throw new Exception("更新失败!");
 		}
 		return false;
 	}

--
Gitblit v1.9.3