From 8400a67289b214b83a20484410fff96d236c6d49 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 25 Nov 2023 18:39:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java
index b359afd..86f9cb3 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java
@@ -20,6 +20,7 @@
import org.springblade.common.constant.DictConstant;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.modules.task.dto.TaskLabelReportingEventDTO;
import org.springblade.modules.task.entity.TaskLabelReportingEventEntity;
import org.springblade.modules.task.mapper.TaskLabelReportingEventMapper;
import org.springblade.modules.task.service.ITaskLabelReportingEventService;
@@ -47,7 +48,7 @@
}
@Override
- public Boolean saveReportingEven(TaskLabelReportingEventEntity taskLabelReportingEvent) {
+ public Boolean saveReportingEven(TaskLabelReportingEventDTO taskLabelReportingEvent) {
String name;
switch (taskLabelReportingEvent.getEventType()) {
case "1":
@@ -62,10 +63,11 @@
default:
name = "";
}
- Long aLong = taskService.saveTask(1, name, 1, "", AuthUtil.getUserId());
+ Long aLong = taskService.saveTask(1, name, 1, "", AuthUtil.getUserId(),taskLabelReportingEvent.getHouseCode());
if (aLong > 0) {
taskLabelReportingEvent.setTaskId(aLong);
taskLabelReportingEvent.setUserId(AuthUtil.getUserId());
+ taskLabelReportingEvent.setLabelName(name);
return baseMapper.insert(taskLabelReportingEvent) > 0 ? true : false;
}
return false;
--
Gitblit v1.9.3