From c103e13e51001737c857c8e8504ca7f08c0d150d Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 21 四月 2025 16:25:28 +0800
Subject: [PATCH] 维修流程处理

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 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 d3f73f0..ff87920 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
@@ -17,10 +17,7 @@
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
-import org.jeecg.modules.eam.constant.BusinessCodeConst;
-import org.jeecg.modules.eam.constant.EquipmentOperationTagEnum;
-import org.jeecg.modules.eam.constant.ReportRepairEnum;
-import org.jeecg.modules.eam.constant.WeekMaintenanceStatusEnum;
+import org.jeecg.modules.eam.constant.*;
 import org.jeecg.modules.eam.entity.EamEquipment;
 import org.jeecg.modules.eam.entity.EamRepairOrder;
 import org.jeecg.modules.eam.entity.EamReportRepair;
@@ -28,6 +25,7 @@
 import org.jeecg.modules.eam.request.EamRepairOrderQuery;
 import org.jeecg.modules.eam.request.EamRepairOrderRequest;
 import org.jeecg.modules.eam.request.EamRepairOrderResponse;
+import org.jeecg.modules.eam.service.IEamEquipmentExtendService;
 import org.jeecg.modules.eam.service.IEamEquipmentService;
 import org.jeecg.modules.eam.service.IEamRepairOrderService;
 import org.jeecg.modules.eam.service.IEamReportRepairService;
@@ -86,6 +84,9 @@
     @Resource
     private ISysUserService sysUserService;
 
+    @Resource
+    private IEamEquipmentExtendService eamEquipmentExtendService;
+
     /**
      * 鍒嗛〉鍒楄〃
      *
@@ -118,6 +119,7 @@
         eamRepairOrder.setEquipmentId(eamReportRepair.getEquipmentId());
         eamRepairOrder.setRepairStatus(ReportRepairEnum.UNDER_REPAIR.name());
         eamRepairOrder.setActualStartTime(DateUtils.getNow());
+        eamRepairOrder.setIsUseSpare(0);
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         eamRepairOrder.setRepairer(user.getRealname());
         super.save(eamRepairOrder);
@@ -142,6 +144,8 @@
         } else {
             eamReportRepair.setReportStatus(ReportRepairEnum.UNDER_REPAIR.name());
             eamReportRepairService.updateById(eamReportRepair);
+            //鏇存柊璁惧缁翠慨鐘舵��
+            eamEquipmentExtendService.updateEquipmentRepairStatus(eamReportRepair.getEquipmentId(), EquipmentRepairStatus.UNDER_REPAIR.name());
         }
     }
 
@@ -205,6 +209,7 @@
                     values.put("status", 1);
                     request.setComment("缁翠慨宸ュ崟杩涘叆绛夊浠剁姸鎬�");
                     eamRepairOrder.setRepairStatus(ReportRepairEnum.WAIT_SPARES.name());
+                    eamRepairOrder.setIsUseSpare(1);
                 } else {
                     // 涓嶉渶瑕�
                     EamReportRepair eamReportRepair = eamReportRepairService.getById(eamRepairOrder.getReportId());
@@ -217,6 +222,7 @@
                     eamRepairOrder.setRepairStatus(ReportRepairEnum.WAIT_CONFIRM.name());
                     eamRepairOrder.setFaultReason(request.getFaultReason());
                     eamRepairOrder.setRepairDescription(request.getRepairDescription());
+                    eamRepairOrder.setIsUseSpare(0);
                     // 澶勭悊闄勪欢
                     if (CollectionUtil.isNotEmpty(request.getImageFilesResult())) {
                         List<FileUploadResult> fileUploadResultList = request.getImageFilesResult();
@@ -228,6 +234,8 @@
                             log.error("JSON杞崲澶辫触锛�" + e.getMessage(), e);
                         }
                     }
+                    //鏇存柊璁惧缁翠慨鐘舵��
+                    eamEquipmentExtendService.updateEquipmentRepairStatus(eamReportRepair.getEquipmentId(), EquipmentRepairStatus.WAIT_CONFIRM.name());
                 }
                 break;
             case WAIT_SPARES:
@@ -239,6 +247,7 @@
                 values.put("status", 0);
                 request.setComment("缁翠慨宸ュ崟杩涘叆缁翠慨鍛樼户缁淮淇樁娈�");
                 eamRepairOrder.setRepairStatus(ReportRepairEnum.UNDER_REPAIR.name());
+                eamRepairOrder.setSparePartDescription(request.getSparePartDescription());
                 break;
             case WAIT_CONFIRM:
                 // 寰呯‘璁�, 缁翠慨鍛樼淮淇畬鎴愶紝鎶ヤ慨浜虹‘璁ょ粨鏉熸祦绋�
@@ -251,6 +260,8 @@
                 request.setComment("缁翠慨宸ュ崟杩涘叆鎶ヤ慨鍛樼‘璁ら樁娈�");
                 eamRepairOrder.setRepairStatus(ReportRepairEnum.COMPLETE.name());
                 eamRepairOrder.setActualEndTime(new Date());
+                //鏇存柊璁惧缁翠慨鐘舵��
+                eamEquipmentExtendService.updateEquipmentRepairStatus(eamReportRepair.getEquipmentId(), EquipmentRepairStatus.NORMAL.name());
                 break;
         }
         request.setValues(values);
@@ -273,6 +284,7 @@
         EamReportRepair eamReportRepair = eamReportRepairService.getById(eamRepairOrder.getReportId());
         BeanUtils.copyProperties(eamReportRepair, eamRepairOrderResponse);
         eamRepairOrderResponse.setReportImageFiles(eamReportRepair.getImageFiles());
+        eamRepairOrderResponse.setImageFiles(eamRepairOrder.getImageFiles());
         return eamRepairOrderResponse;
     }
 

--
Gitblit v1.9.3