From e87cafee7865d3e5d9f440d3e4d017ebcdb53a7a Mon Sep 17 00:00:00 2001
From: xiaofajia <1665375861@qq.com>
Date: Tue, 5 Nov 2024 10:44:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=8D=E6=96=B0=E6=B4=BE?=
 =?UTF-8?q?=E5=B7=A5=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tickets/service/impl/DlRepairTicketsServiceImpl.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
index 90a31cb4..49a1e5c9 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
@@ -961,15 +961,16 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
             throw exception0(500, "工单已开始");
         }
         repairWorkerService.sentMessage(reqVO.getNowRepairId(), "您有新的工单要处理");
-        //最后记录操作日志--指派施工
+
+        //最后记录操作日志--指派施工--pull下来的逻辑
         String code = RecordTypeEnum.ZPSG.getCode();
         String remark ="指派施工";
         if(StringUtils.isNotEmpty(reqVO.getOperateCode())){
             code = reqVO.getOperateCode();
             remark = "维修完成移交下一班组维修";
         }
-        repairRecordsService.saveRepairRecord(reqVO.getId(), null,code, remark, null);
-        // 获取当前操作人的身份
+
+        // 获取当前操作人的身份----小李新加的逻辑
         String userRole = getUserRole();
         // 总检
         if (userRole.equals(RepairRoleEnum.INSPECTION.getCode())){
@@ -977,7 +978,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
         }else {
             // 其他
             //最后记录操作日志--指派施工
-            repairRecordsService.saveRepairRecord(reqVO.getId(), null, RecordTypeEnum.ZPSG.getCode(), "指派施工", null);
+            repairRecordsService.saveRepairRecord(reqVO.getId(), null, code, remark, null);
         }
     }