From afe5d8e108b583a8628e350e3fe85dfa91990b6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 5 May 2025 09:28:25 +0800 Subject: [PATCH] =?UTF-8?q?feat(repository):=20=E4=BC=98=E5=8C=96=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=9F=A5=E8=AF=A2=E5=92=8C=E5=B7=A5=E5=8D=95=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 AdminUserMapper 中添加用户查询排序功能，提高查询效率 - 修复 TicketChatService 中的消息撤回逻辑，使用更准确的字符串比较方法 - 在 TicketMapper 中的工单搜索查询中添加工单描述字段 - 更新 TicketVO 中添加工单描述属性，以支持新的搜索结果 --- .../com/nflg/mobilebroken/common/pojo/vo/TicketVO.java | 3 +++ .../repository/service/TicketChatService.java | 2 +- .../src/main/resources/mapper/AdminUserMapper.xml | 4 ++++ .../src/main/resources/mapper/TicketMapper.xml | 10 ++++++---- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TicketVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TicketVO.java index 9e25a0a9..aabee9b3 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TicketVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TicketVO.java @@ -21,6 +21,9 @@ public class TicketVO { //工单标题 private String title; + //工单描述 + private String description; + //设备编号 private String deviceNo; diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/TicketChatService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/TicketChatService.java index 84ad1613..98b10feb 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/TicketChatService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/TicketChatService.java @@ -138,7 +138,7 @@ public class TicketChatService { boolean flag = false; Instant now = Instant.now(); for (ChatMessageDTO message : messages) { - if (message.getId().equals(messageId)) { + if (StrUtil.equals(messageId,message.getId())) { Duration duration = Duration.between(message.getCreateTime(), now); if (duration.toMinutes() <= ticketSet.getWithdrawTimeout()) { log.info("消息撤回 找到消息"); diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/AdminUserMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/AdminUserMapper.xml index 52094652..9cd0f769 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/AdminUserMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/AdminUserMapper.xml @@ -18,6 +18,10 @@ #{userId} + ORDER BY FIELD + + #{userId} + SELECT t.*,IF(u.is_primary,fun_getPrimaryUserArea(u.company_id),a2.`name`) AS 'areaName',IF(tf.id IS NULL, false, true) AS 'followed' - ,u.`name` AS 'createBy',t.handle,IF(LENGTH(l.language_value)>0,l.language_value,p.part_name) AS 'component' + ,u.`name` AS 'createBy',t.handle,IF(LENGTH(l.language_value)>0,l.language_value,p.part_name) AS 'component',t.description FROM ticket t LEFT JOIN app_user u ON t.user_id=u.id LEFT JOIN app_area a2 ON u.area_id=a2.id @@ -100,7 +100,8 @@