From 9e754d4c91e41b02a1e39d7ca709ec9491558da2 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 09 Nov 2023 21:11:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
index 667d6fb..78abd3c 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
@@ -28,6 +28,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
/**
* 报事报修任务表 服务实现类
@@ -84,4 +87,44 @@
}
return flag;
}
+
+ /**
+ * 报事报修任务表 自定义修改
+ * @param taskReportForRepairs
+ * @return
+ */
+ @Override
+ public boolean updateTaskReportForRepairs(TaskReportForRepairsEntity taskReportForRepairs) {
+ // 设置参数
+ taskReportForRepairs.setUpdateTime(new Date());
+ taskReportForRepairs.setUpdateUser(AuthUtil.getUserId());
+ // 更新
+ return updateById(taskReportForRepairs);
+ }
+
+ /**
+ * 报事报修任务表 审核
+ * @param taskReportForRepairs
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean checkReportForRepairs(TaskReportForRepairsEntity taskReportForRepairs) {
+ boolean flag = false;
+ // 设置更新时间
+ taskReportForRepairs.setConfirmTime(new Date());
+ taskReportForRepairs.setConfirmUserId(AuthUtil.getUserId());
+ // 更新数据
+ boolean b = updateById(taskReportForRepairs);
+ if (b) {
+ TaskReportForRepairsEntity entity = getById(taskReportForRepairs.getId());
+ // 更新任务表状态
+ TaskEntity taskEntity = new TaskEntity();
+ taskEntity.setId(entity.getTaskId());
+ taskEntity.setStatus(taskReportForRepairs.getConfirmFlag());
+ flag = taskService.updateById(taskEntity);
+ }
+ // 返回
+ return flag;
+ }
}
--
Gitblit v1.9.3