From 1d14ba39daf0422199c44b5b2ffc67d2364b2be2 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 07 四月 2024 17:24:50 +0800
Subject: [PATCH] 工单状态完善

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index c64d795..3ae1d22 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -89,17 +89,13 @@
             throw new ServiceException("宸ュ崟涓嶅瓨鍦�");
         }
         // 宸ュ崟鐘舵��
-        if ("pass".equals(form.getAuditingResult())) {
-            workOrder.setStatus(WorkOrderStatusEnum.FINISH);
-        } else {
-            workOrder.setStatus(WorkOrderStatusEnum.AUDITING);
-        }
+        workOrder.setStatus(form.getAuditingResult());
         baseMapper.updateById(workOrder);
         // 娣诲姞涓�鏉″鏍歌褰�
         WorkOrderAuditingRecord workOrderAuditingRecord = new WorkOrderAuditingRecord();
         workOrderAuditingRecord.setWorkOrderId(workOrder.getId());
         workOrderAuditingRecord.setAuditingUser(1);
-        workOrderAuditingRecord.setResult(form.getAuditingResult());
+        workOrderAuditingRecord.setResult(form.getAuditingResult().getDesc());
         workOrderAuditingRecord.setRemark(form.getAuditingRemark());
         workOrderAuditingRecordMapper.insert(workOrderAuditingRecord);
         return Result.ok("鎿嶄綔鎴愬姛");
@@ -113,7 +109,7 @@
             throw new ServiceException("宸ュ崟涓嶅瓨鍦�");
         }
         // 宸ュ崟鐘舵��
-//        workOrder.setStatus("commit-condition");
+        workOrder.setStatus(WorkOrderStatusEnum.YW_HANDLE);
         baseMapper.updateById(workOrder);
         // 娣诲姞涓�鏉¤繍缁存儏鍐佃褰�
         WorkOrderYwConditionRecord workOrderYwConditionRecord = new WorkOrderYwConditionRecord();

--
Gitblit v1.8.0