From 3f45d05344724773e55409db3e0d45d3cef6cc4c Mon Sep 17 00:00:00 2001
From: xiaofajia <1665375861@qq.com>
Date: Tue, 5 Nov 2024 10:37:01 +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

---
 .../java/cn/iocoder/yudao/common/RecordTypeEnum.java |  5 ++++-
 .../service/impl/DlRepairTicketsServiceImpl.java     | 12 ++++++++++--
 .../module/tickets/vo/DlRepairTicketsReqVO.java      |  3 +++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/common/RecordTypeEnum.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/common/RecordTypeEnum.java
index 92b4373b..8e6f4698 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/common/RecordTypeEnum.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/common/RecordTypeEnum.java
@@ -70,7 +70,10 @@ public enum RecordTypeEnum {
     ZFGG("zfgg", "作废工单"),
 
     /** 删除工单 */
-    SCGG("scgg", "删除工单");
+    SCGG("scgg", "删除工单"),
+
+    /** 内返派工 */
+    NFPG("nfpg", "内返派工");
 
     /**
      * code
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 32f6246c..17c795d2 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
@@ -962,8 +962,16 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
             throw exception0(500, "工单已开始");
         }
         repairWorkerService.sentMessage(reqVO.getNowRepairId(), "您有新的工单要处理");
-        //最后记录操作日志--指派施工
-        repairRecordsService.saveRepairRecord(reqVO.getId(), null, RecordTypeEnum.ZPSG.getCode(), "指派施工", null);
+        // 获取当前操作人的身份
+        String userRole = getUserRole();
+        // 总检
+        if (userRole.equals(RepairRoleEnum.INSPECTION.getCode())){
+            repairRecordsService.saveRepairRecord(reqVO.getId(), null, RecordTypeEnum.NFPG.getCode(), reqVO.getRemark(), reqVO.getImage());
+        }else {
+            // 其他
+            //最后记录操作日志--指派施工
+            repairRecordsService.saveRepairRecord(reqVO.getId(), null, RecordTypeEnum.ZPSG.getCode(), "指派施工", null);
+        }
     }
 
     /**
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTicketsReqVO.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTicketsReqVO.java
index 225a51c8..0fa15d2b 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTicketsReqVO.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTicketsReqVO.java
@@ -33,4 +33,7 @@ public class DlRepairTicketsReqVO extends DlRepairTickets {
 
     /** 人员角色code */
     private String roleCode;
+
+    /** 图片路径 */
+    private String image;
 }