From 7385b8ad66adb41db69076cc3298a69ef5910135 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 27 Dec 2023 20:21:38 +0800
Subject: [PATCH] 报事报修步骤和评分表

---
 src/main/java/org/springblade/modules/task/service/impl/TaskRepairStepServiceImpl.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 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..adaf5d8 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;
@@ -73,10 +73,13 @@
 	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);
+		if (CommonConstant.NUMBER_THREE.equals(task.getConfirmFlag())) {
+			taskReportForRepairsEntity.setConfirmUserId(AuthUtil.getUserId());
+		}
+		boolean update = SpringUtils.getBean(ITaskReportForRepairsService.class).updateById(taskReportForRepairsEntity);
 		return update ? save(task) : false;
 	}
 }

--
Gitblit v1.9.3