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/TaskCampusReportingEventServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 3ddcad1..6cc75ce 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,6 +16,7 @@
*/
package org.springblade.modules.task.service.impl;
+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;
@@ -31,6 +32,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import javax.annotation.Resource;
+import java.util.Date;
/**
* 校园安全检查任务表 服务实现类
@@ -39,7 +41,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;
@@ -50,12 +52,12 @@
@Override
- public Boolean saveCampusReporting(TaskCampusReportingEventDTO taskCampusReportingEvent) {
- Long aLong = taskService.saveTask(1, DictConstant.CAMPUS_SECURITY_INSPECTION, 3 , "", AuthUtil.getUserId(),taskCampusReportingEvent.getHouseCode());
+ public Boolean saveCampusReporting(TaskCampusReportingEventDTO reporting) {
+ Long aLong = taskService.saveTask(1, DictConstant.CAMPUS_SECURITY_INSPECTION, 1 , "", AuthUtil.getUserId(),reporting.getHouseCode(),reporting.getReportType());
if (aLong > 0) {
- taskCampusReportingEvent.setTaskId(aLong);
- taskCampusReportingEvent.setCheckUserId(AuthUtil.getUserId());
- return baseMapper.insert(taskCampusReportingEvent) > 0 ? true : false;
+ reporting.setTaskId(aLong);
+ reporting.setCheckUserId(AuthUtil.getUserId());
+ return baseMapper.insert(reporting) > 0 ? true : false;
}
return false;
}
@@ -66,6 +68,8 @@
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) {
+ taskCampusReportingEvent.setConfirmUserId(AuthUtil.getUserId());
+ taskCampusReportingEvent.setConfirmTime(new Date());
return baseMapper.updateById(taskCampusReportingEvent) > 0 ? true : false;
}
return false;
--
Gitblit v1.9.3