From 7c4fde9a3ad5e11a36c72b9f2f70554809ef4512 Mon Sep 17 00:00:00 2001
From: panshuling321 <panshuling321@163.com>
Date: Wed, 9 Mar 2022 09:31:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=BF=90=E7=BB=B4=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xhpc/workorder/domain/XhpcWorkOrderDomain.java  | 5 +++++
 .../src/main/resources/mapper/XhpcWorkOrderMapper.xml        | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcWorkOrderDomain.java b/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcWorkOrderDomain.java
index 16b79655..5065e5ec 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcWorkOrderDomain.java
+++ b/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcWorkOrderDomain.java
@@ -22,6 +22,10 @@ public class XhpcWorkOrderDomain implements Serializable {
      */
     private Short type;
 
+
+
+    private String typeName;
+
     /**
      * 工单标题
      */
@@ -100,6 +104,7 @@ public class XhpcWorkOrderDomain implements Serializable {
     //
 
     private String startTime;
+
     private int source;
 
     private String stationName;
diff --git a/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcWorkOrderMapper.xml b/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcWorkOrderMapper.xml
index 32550c7e..4462bdca 100644
--- a/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcWorkOrderMapper.xml
+++ b/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcWorkOrderMapper.xml
@@ -82,11 +82,12 @@
   <select id="selectByPrimaryKey" resultType="com.xhpc.workorder.domain.XhpcWorkOrderDomain">
     select 
     <include refid="Base_Column_List" />,
-    d.device_name, s.name, co.start_time, co.source
+    d.device_name, s.name, co.start_time, co.source, td.name as 'type_name'
     from xhpc_work_order o
     LEFT JOIN xhpc_station_device d on o.serial_number=d.serial_number
     LEFT JOIN xhpc_work_station s on d.station_id=s.work_station_id
     left join xhpc_charge_order co on co.serial_number=o.serial_number
+    left join xhpc_work_type_dict td on td.work_type_id=o.type
     where o.work_order_id = #{workOrderId,jdbcType=BIGINT}
   </select>
   <update id="deleteByPrimaryKey" parameterType="java.lang.Long">