From 8e4b9d445cdb6c7901dfd2cdda120ece94193cc8 Mon Sep 17 00:00:00 2001
From: gjh <1421wake>
Date: Mon, 23 Jun 2025 17:14:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=84=8F=E8=A7=81=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/service/impl/WorkOrderInfoServiceImpl.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java
index 91bdf24..b086874 100644
--- a/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java
+++ b/ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java
@@ -885,7 +885,7 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService {
             LocalDateTime time2 = LocalDateTime.now();
             Date date2 = Date.from(time2.atZone(ZoneId.systemDefault()).toInstant());
             workOrderProcess.setOperationTime(date2);
-            workOrderProcess.setFeedback(bo.getHandleResult());
+            workOrderProcess.setFeedback(bo.getAuditOpinion());
             // 计算时间差
             Duration duration = Duration.between(time1, time2);
             long durationInSeconds = duration.getSeconds();
@@ -921,7 +921,7 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService {
             LocalDateTime time2 = LocalDateTime.now();
             Date date2 = Date.from(time2.atZone(ZoneId.systemDefault()).toInstant());
             workOrderProcess.setOperationTime(date2);
-            workOrderProcess.setFeedback(bo.getHandleResult());
+            workOrderProcess.setFeedback(bo.getAuditOpinion());
             // 计算时间差
             Duration duration = Duration.between(time1, time2);
             long durationInSeconds = duration.getSeconds();
@@ -962,7 +962,7 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService {
             Date date2 = Date.from(time2.atZone(ZoneId.systemDefault()).toInstant());
             workOrderProcess.setOperationTime(date2);
             // 设置处理结果
-            workOrderProcess.setFeedback(bo.getHandleResult());
+            workOrderProcess.setFeedback(bo.getAuditOpinion());
             // 计算时间差
             Duration duration = Duration.between(time1, time2);
             long durationInSeconds = duration.getSeconds();
@@ -1686,6 +1686,7 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService {
         if (CollectionUtil.isNotEmpty(ids)){
             List<WorkOrderInfo> workOrderInfos = baseMapper.selectByIds(ids);
             for (WorkOrderInfo workOrderInfo : workOrderInfos) {
+                bo.setId(workOrderInfo.getId());
                 bo.setProjectName(workOrderInfo.getProjectName());
                 bo.setContractName(workOrderInfo.getContractName());
                 // 初审