From 8dab1f5e6ae80f6808d818ba799d38bb0ef4e699 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 28 Dec 2023 20:37:45 +0800
Subject: [PATCH] bug 修复
---
src/main/java/org/springblade/modules/task/service/impl/TaskLabelReportingEventServiceImpl.java | 10 ++++++++--
1 files changed, 8 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..fc20728 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;
@@ -28,6 +29,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.Date;
/**
* 打金店报事 服务实现类
@@ -47,7 +49,7 @@
}
@Override
- public Boolean saveReportingEven(TaskLabelReportingEventEntity taskLabelReportingEvent) {
+ public Boolean saveReportingEven(TaskLabelReportingEventDTO taskLabelReportingEvent) {
String name;
switch (taskLabelReportingEvent.getEventType()) {
case "1":
@@ -62,10 +64,11 @@
default:
name = "";
}
- Long aLong = taskService.saveTask(1, name, 1, "", AuthUtil.getUserId());
+ Long aLong = taskService.saveTask(1, name, 1, "", AuthUtil.getUserId(),taskLabelReportingEvent.getHouseCode(),taskLabelReportingEvent.getReportType());
if (aLong > 0) {
taskLabelReportingEvent.setTaskId(aLong);
taskLabelReportingEvent.setUserId(AuthUtil.getUserId());
+ taskLabelReportingEvent.setLabelName(name);
return baseMapper.insert(taskLabelReportingEvent) > 0 ? true : false;
}
return false;
@@ -77,6 +80,9 @@
Long aLong = taskService.updateTask(null, null, null, "", AuthUtil.getUserId(),
taskLabelReportingEvent.getTaskId(), taskLabelReportingEvent.getStatus());
if (aLong > 0) {
+ taskLabelReportingEvent.setConfirmFlag(taskLabelReportingEvent.getStatus().toString());
+ taskLabelReportingEvent.setConfirmUserId(AuthUtil.getUserId());
+ taskLabelReportingEvent.setConfirmTime(new Date());
return baseMapper.updateById(taskLabelReportingEvent) > 0 ? true : false;
}
return false;
--
Gitblit v1.9.3