From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送
---
src/main/java/org/springblade/modules/task/service/impl/TaskRepairStepServiceImpl.java | 15 +++++++++++----
1 files changed, 11 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 43fbd7e..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
@@ -17,8 +17,8 @@
package org.springblade.modules.task.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.common.constant.CommonConstant;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.task.dto.TaskRepairStepDTO;
@@ -30,6 +30,7 @@
import org.springblade.modules.task.vo.TaskRepairStepVO;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
/**
@@ -73,10 +74,16 @@
public Boolean saveTaskRepairStep(TaskRepairStepVO task) {
task.setUserId(AuthUtil.getUserId());
TaskReportForRepairsEntity taskReportForRepairsEntity = new TaskReportForRepairsEntity();
- taskReportForRepairsEntity.setTaskId(task.getRepairId());
+ taskReportForRepairsEntity.setId(task.getRepairId());
taskReportForRepairsEntity.setConfirmFlag(task.getConfirmFlag());
taskReportForRepairsEntity.setConfirmUserId(task.getTransferUserId());
- boolean update = SpringUtils.getBean(ITaskReportForRepairsService.class).save(taskReportForRepairsEntity);
- return update ? save(task) : false;
+ if (CommonConstant.NUMBER_ZERO.equals(task.getConfirmFlag()) || CommonConstant.NUMBER_THREE.equals(task.getConfirmFlag())) {
+ task.setName(AuthUtil.getUserName());
+ }
+ 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