From 7690c9128e090cd44852b7c48415ced2f2dd1522 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Wed, 12 Feb 2025 20:30:31 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=80=E4=BA=9B=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AppMessageServiceImpl.java   | 29 ++++++++++++++++++-
 .../main/resources/mapper/TicketMapper.xml    |  2 +-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppMessageServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppMessageServiceImpl.java
index 13a0a334..535b7415 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppMessageServiceImpl.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppMessageServiceImpl.java
@@ -1,5 +1,6 @@
 package com.nflg.mobilebroken.repository.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -7,10 +8,16 @@ import com.nflg.mobilebroken.common.pojo.request.AppMessageSearchRequest;
 import com.nflg.mobilebroken.common.pojo.vo.AppMessageVO;
 import com.nflg.mobilebroken.repository.entity.AppMessage;
 import com.nflg.mobilebroken.repository.mapper.AppMessageMapper;
+import com.nflg.mobilebroken.repository.service.IAdminUserService;
 import com.nflg.mobilebroken.repository.service.IAppMessageService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -23,6 +30,9 @@ import java.util.List;
 @Service
 public class AppMessageServiceImpl extends ServiceImpl<AppMessageMapper, AppMessage> implements IAppMessageService {
 
+    @Resource
+    private IAdminUserService adminUserService;
+
     @Override
     public IPage<AppMessageVO> getNotReadMessage(Integer userId, Integer num) {
         return baseMapper.getNotReadMessage(userId, num, new Page<>(1, num));
@@ -30,7 +40,24 @@ public class AppMessageServiceImpl extends ServiceImpl<AppMessageMapper, AppMess
 
     @Override
     public IPage<AppMessageVO> search(Integer userId, AppMessageSearchRequest request) {
-        return baseMapper.search(userId, request.getTitle(), new Page<>(request.getPage(), request.getPageSize()));
+        IPage<AppMessageVO> datas = baseMapper.search(userId, request.getTitle(), new Page<>(request.getPage(), request.getPageSize()));
+        Map<Integer, String> userMap = new HashMap<>();
+        datas.getRecords().forEach(d -> {
+            if (StrUtil.isNotBlank(d.getTicketHandleBy())) {
+                List<Integer> userIds = StrUtil.split(d.getTicketHandleBy(), ",").stream().map(Integer::parseInt).collect(Collectors.toList());
+                List<String> handers = new ArrayList<>();
+                userIds.forEach(uId -> {
+                    String name = userMap.get(uId);
+                    if (StrUtil.isBlank(name)) {
+                        name = adminUserService.getById(uId).getUserName();
+                        userMap.put(uId, name);
+                    }
+                    handers.add(name);
+                });
+                d.setTicketHandleBy(StrUtil.join(",", handers));
+            }
+        });
+        return datas;
     }
 
     @Override
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml
index fccea6a8..e927cd4f 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml
@@ -4,7 +4,7 @@
 
     <sql id="searchWhereCondition">
         <if test="request.title!=null and request.title!=''">
-            AND t.title LIKE CONCAT('%', #{request.title}, '%')
+            AND (t.title LIKE CONCAT('%', #{request.title}, '%') OR t.no LIKE CONCAT('%', #{request.title}, '%'))
         </if>
         <if test="request.deviceNo!=null and request.deviceNo!=''">
             AND t.device_no LIKE CONCAT('%', #{request.deviceNo}, '%')