From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/service/impl/TaskRepairStepServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskRepairStepServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskRepairStepServiceImpl.java
index adaf5d8..5571956 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskRepairStepServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskRepairStepServiceImpl.java
@@ -30,6 +30,7 @@
import org.springblade.modules.task.vo.TaskRepairStepVO;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
/**
@@ -76,10 +77,13 @@
taskReportForRepairsEntity.setId(task.getRepairId());
taskReportForRepairsEntity.setConfirmFlag(task.getConfirmFlag());
taskReportForRepairsEntity.setConfirmUserId(task.getTransferUserId());
- if (CommonConstant.NUMBER_THREE.equals(task.getConfirmFlag())) {
- taskReportForRepairsEntity.setConfirmUserId(AuthUtil.getUserId());
+ if (CommonConstant.NUMBER_ZERO.equals(task.getConfirmFlag()) || CommonConstant.NUMBER_THREE.equals(task.getConfirmFlag())) {
+ task.setName(AuthUtil.getUserName());
}
- boolean update = SpringUtils.getBean(ITaskReportForRepairsService.class).updateById(taskReportForRepairsEntity);
- return update ? save(task) : false;
+ if (CommonConstant.NUMBER_THREE.equals(task.getConfirmFlag())) {
+ taskReportForRepairsEntity.setConfirmTime(new Date());
+ }
+ boolean b = SpringUtils.getBean(ITaskReportForRepairsService.class).updateById(taskReportForRepairsEntity);
+ return save(task);
}
}
--
Gitblit v1.9.3