From 184ab4ca30a50a43b4626fea9ade52024380a3de Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 22 四月 2025 11:40:10 +0800
Subject: [PATCH] 维修工单维修报修

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
index f76aff8..e742d72 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
@@ -188,7 +188,7 @@
             throw new JeecgBootException("璁惧涓嶅瓨鍦紝璇锋鏌ワ紒");
         }
 
-        ReportRepairEnum status = ReportRepairEnum.getInstance(request.getRepairStatus());
+        ReportRepairEnum status = ReportRepairEnum.getInstance(eamRepairOrder.getRepairStatus());
         if (status == null) {
             return null;
         }
@@ -197,7 +197,7 @@
         switch (status) {
             case UNDER_REPAIR:
                 //缁翠慨涓細涓嬩竴姝� 鍒ゆ柇鏄惁闇�瑕佸浠�, 闇�瑕佸浠惰浆璁惧绠$悊鍛橀鐢ㄥ浠�, 涓嶉渶瑕佸垯杞埌璁惧鎶ヤ慨鍛樼‘璁ょ淮淇畬鎴�
-                if (request.getStatus() == 1) {
+                if (request.getIsUseSpare() == 1) {
                     // 闇�瑕�
                     List<UserSelector> userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0004);
                     if (CollectionUtil.isEmpty(userSelectors)) {
@@ -217,7 +217,7 @@
                     values.put("dataId", eamRepairOrder.getId());
                     values.put("organization", "缁翠慨宸ュ崟杩涘叆鎶ヤ慨鍛樼‘璁ら樁娈�");
                     values.put("comment", "缁翠慨宸ュ崟杩涘叆鎶ヤ慨鍛樼‘璁ら樁娈�");
-                    values.put("NextAssignee", eamReportRepair.getCreateBy());
+                    values.put("NextAssignee", Arrays.asList(eamReportRepair.getCreateBy().split(",")));
                     values.put("status", 0);
                     request.setComment("缁翠慨宸ュ崟杩涘叆鎶ヤ慨鍛樼‘璁ら樁娈�");
                     eamRepairOrder.setRepairStatus(ReportRepairEnum.WAIT_CONFIRM.name());
@@ -245,7 +245,7 @@
                 values.put("dataId", eamRepairOrder.getId());
                 values.put("organization", "缁翠慨宸ュ崟杩涘叆缁翠慨鍛樼户缁淮淇樁娈�");
                 values.put("comment", "缁翠慨宸ュ崟杩涘叆缁翠慨鍛樼户缁淮淇樁娈�");
-                values.put("NextAssignee", eamRepairOrder.getRepairer());
+                values.put("NextAssignee", Arrays.asList(eamRepairOrder.getRepairer().split(",")));
                 values.put("status", 0);
                 request.setComment("缁翠慨宸ュ崟杩涘叆缁翠慨鍛樼户缁淮淇樁娈�");
                 eamRepairOrder.setRepairStatus(ReportRepairEnum.UNDER_REPAIR.name());
@@ -257,7 +257,7 @@
                 values.put("dataId", eamRepairOrder.getId());
                 values.put("organization", "缁翠慨宸ュ崟娴佺▼缁撴潫");
                 values.put("comment", "缁翠慨宸ュ崟娴佺▼缁撴潫");
-                values.put("NextAssignee", eamReportRepair.getCreateBy());
+                values.put("NextAssignee", Arrays.asList(eamReportRepair.getCreateBy().split(",")));
                 values.put("status", 0);
                 request.setComment("缁翠慨宸ュ崟杩涘叆鎶ヤ慨鍛樼‘璁ら樁娈�");
                 eamRepairOrder.setRepairStatus(ReportRepairEnum.COMPLETE.name());

--
Gitblit v1.9.3