From ce90f714e2cc8f6ed16a7742be7ff379b3603056 Mon Sep 17 00:00:00 2001
From: xiaofajia <1665375861@qq.com>
Date: Wed, 6 Nov 2024 18:54:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=80=E6=9C=89=E7=94=A8?=
 =?UTF-8?q?=E5=88=B0=E5=B7=A5=E5=8D=95=E5=8F=B7to=E8=BD=A6=E7=89=8C?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DlRepairTicketsServiceImpl.java   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 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 cf02e416..440ec04a 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
@@ -1052,7 +1052,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
             施工完成又分四种情况：阶段完成、完成并移交下一班组、完成并移交总检、完成工单，其中部分完成同开始施工、施工中的记录上传一致，只上传，不改变
           */
         // 消息生成
-        String message = createMessage(tickets.getNowRepairName(), tickets.getTicketNo(), titem.getItemName(), respVO.getRecordType(), respVO.getFinishType(), respVO.getNextName());
+        String message = createMessage(tickets.getNowRepairName(), tickets.getCarNo(), titem.getItemName(), respVO.getRecordType(), respVO.getFinishType(), respVO.getNextName());
         // 通知服务顾问
         // 如果员工完成了订单
         if (RecordTypeEnum.SGWCZJ.getCode().equals(respVO.getRecordType()) && "03".equals(respVO.getFinishType())) {
@@ -1116,14 +1116,14 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
         switch (type) {
             // 开始施工
             case "kssg":
-                return result + "开始施工工单：" + no + "中" + projectName + "项目";
+                return result + "开始施工车牌为：" + no + "工单中" + projectName + "项目";
             // 施工记录
             case "sgz":
-                return result + "上传了工单：" + no + "中" + projectName + "项目的维修记录";
+                return result + "上传了车牌为：" + no + "工单中" + projectName + "项目的维修记录";
             // 施工完成
             case "sgwczj":
                 if (ObjectUtil.isNotEmpty(finishType)) {
-                    result = result + "完成了工单：" + no + "中" + projectName + "项目";
+                    result = result + "完成了车牌为：" + no + "工单中" + projectName + "项目";
                     switch (finishType) {
                         // 完成并移交下一班组
                         case "01":
@@ -1138,7 +1138,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
                             return "异常消息";
                     }
                 } else {
-                    return result + "部分完成了工单：" + no + "中" + projectName + "项目";
+                    return result + "部分完成了车牌为：" + no + "工单中" + projectName + "项目";
                 }
             default:
                 return "异常消息";
@@ -1554,7 +1554,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
             if (!flag) {
                 // 通知总检，让其手动操作
                 ids.forEach(id -> {
-                    repairWorkerService.sentMessage(id, "待总检工单：" + item.getTicketNo() + "已经超时，但无法自动总检，请手动处理");
+                    repairWorkerService.sentMessage(id, "待总检车牌为：" + item.getCarNo() + "工单已经超时，但无法自动总检，请手动处理");
                 });
             }
             return flag;
@@ -1576,7 +1576,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
         result.forEach(item -> {
             repairWorkerService.sentMessage(Long.valueOf(item.getAdviserId()), "您有新的工单可以出厂检验");
             ids.forEach(id -> {
-                repairWorkerService.sentMessage(id, "工单：" + item.getTicketNo() + "已由系统自动总检并移交服务顾问");
+                repairWorkerService.sentMessage(id, "车牌为：" + item.getCarNo() + "工单已由系统自动总检并移交服务顾问");
             });
             // 记录日志
             repairRecordsService.saveRepairRecord(item.getId(), null, RecordTypeEnum.ZJ.getCode(), "该工单由系统自动总检完成", null);