From 644b9db1f4dc6716496c1f14f27391ebaf41ef72 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 07 四月 2024 17:23:51 +0800
Subject: [PATCH] 工单状态完善
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 8 ++------
ycl-common/src/main/java/enumeration/general/WorkOrderStatusEnum.java | 3 +++
ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderAuditingForm.java | 3 ++-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ycl-common/src/main/java/enumeration/general/WorkOrderStatusEnum.java b/ycl-common/src/main/java/enumeration/general/WorkOrderStatusEnum.java
index ba1e31f..f19e97e 100644
--- a/ycl-common/src/main/java/enumeration/general/WorkOrderStatusEnum.java
+++ b/ycl-common/src/main/java/enumeration/general/WorkOrderStatusEnum.java
@@ -15,7 +15,10 @@
WAIT_DISTRIBUTE("WAIT_DISTRIBUTE", "绛夊緟涓嬪彂"),
DISTRIBUTED("DISTRIBUTED", "宸蹭笅鍙�"),
+ YW_HANDLE("YW_HANDLE", "杩愮淮宸插鐞�"),
AUDITING("AUDITING", "瀹℃牳涓�"),
+ AUDITING_SUCCESS("AUDITING_SUCCESS", "瀹℃牳閫氳繃"),
+ AUDITING_FAIL("AUDITING_FAIL", "瀹℃牳涓嶉�氳繃"),
FINISH("FINISH", "宸插畬鎴�"),
;
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderAuditingForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderAuditingForm.java
index b7fc6e6..f6188ce 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderAuditingForm.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderAuditingForm.java
@@ -1,6 +1,7 @@
package com.ycl.platform.domain.form;
import com.ycl.platform.base.AbsForm;
+import enumeration.general.WorkOrderStatusEnum;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
@@ -17,7 +18,7 @@
* 瀹℃牳缁撴灉
*/
@NotBlank(message = "瀹℃牳缁撴灉涓嶈兘涓虹┖")
- private String auditingResult;
+ private WorkOrderStatusEnum auditingResult;
/**
* 瀹℃牳璇存槑
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..da492ca 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("鎿嶄綔鎴愬姛");
--
Gitblit v1.8.0