From 587e9f86b1ec34f0c67f86ab7e8ddb590d25e312 Mon Sep 17 00:00:00 2001
From: mashili <m18306189712@163.com>
Date: Tue, 15 Jul 2025 19:31:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=AE=A1=E7=90=86-=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E6=96=B0=E5=A2=9E=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xzzn/ems/mapper/EmsTicketMapper.java  |  7 +++++++
 .../xzzn/ems/service/IEmsTicketService.java   |  2 +-
 .../service/impl/EmsTicketServiceImpl.java    |  4 ++--
 .../resources/mapper/ems/EmsTicketMapper.xml  | 21 ++++++++++++++++++-
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsTicketMapper.java b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsTicketMapper.java
index 7dcf5a9..60c983a 100644
--- a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsTicketMapper.java
+++ b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsTicketMapper.java
@@ -74,4 +74,11 @@ public interface EmsTicketMapper
      * @return
      */
     public List<TicketListVo> getAllTicketList(EmsTicket emsTicket);
+
+    /**
+     * 工单详情
+     * @param id
+     * @return
+     */
+    public TicketListVo getTicketDetailInfo(String id);
 }
diff --git a/ems-system/src/main/java/com/xzzn/ems/service/IEmsTicketService.java b/ems-system/src/main/java/com/xzzn/ems/service/IEmsTicketService.java
index 6eac8e2..e8c54f0 100644
--- a/ems-system/src/main/java/com/xzzn/ems/service/IEmsTicketService.java
+++ b/ems-system/src/main/java/com/xzzn/ems/service/IEmsTicketService.java
@@ -19,7 +19,7 @@ public interface IEmsTicketService
      * @param id 工单主主键
      * @return 工单主
      */
-    public EmsTicket selectEmsTicketById(String id);
+    public TicketListVo selectEmsTicketById(String id);
 
     /**
      * 查询工单主列表
diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsTicketServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsTicketServiceImpl.java
index a63f057..35721d1 100644
--- a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsTicketServiceImpl.java
+++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsTicketServiceImpl.java
@@ -31,9 +31,9 @@ public class EmsTicketServiceImpl implements IEmsTicketService
      * @return 工单主
      */
     @Override
-    public EmsTicket selectEmsTicketById(String id)
+    public TicketListVo selectEmsTicketById(String id)
     {
-        return emsTicketMapper.selectEmsTicketById(id);
+        return emsTicketMapper.getTicketDetailInfo(id);
     }
 
     /**
diff --git a/ems-system/src/main/resources/mapper/ems/EmsTicketMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsTicketMapper.xml
index f2862f0..665b414 100644
--- a/ems-system/src/main/resources/mapper/ems/EmsTicketMapper.xml
+++ b/ems-system/src/main/resources/mapper/ems/EmsTicketMapper.xml
@@ -134,5 +134,24 @@
                  LEFT JOIN sys_user s on t.user_id = s.user_id
                  LEFT JOIN sys_user s1 on t.work_user_id = s1.user_id
         where isDelete = 1
-        </select>
+    </select>
+
+    <select id="getTicketDetailInfo" resultType="com.xzzn.ems.domain.vo.TicketListVo">
+        SELECT t.ticket_no as ticketNo,
+               t.title as title,
+               t.content as content,
+               t.`status` as status,
+               s.user_name as userName,
+               s1.user_name as workName,
+               t.create_time as createTime,
+               t.complete_time as completeTime,
+               t.id, t.images,
+               t.user_id as userId, t.work_user_id as workUserId,
+               t.expected_complete_time as expectedCompleteTime
+        FROM ems_ticket t
+                 LEFT JOIN sys_user s on t.user_id = s.user_id
+                 LEFT JOIN sys_user s1 on t.work_user_id = s1.user_id
+        where t.isDelete = 1
+        and t.id = #{id}
+    </select>
 </mapper>
\ No newline at end of file