From 1bc536c54fc1c2f25a4cff4b162cfa6979604fff Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 29 八月 2024 17:31:10 +0800
Subject: [PATCH] 企业微信对接+工时优化+设备查询项目树结构优化

---
 inspect-server/src/main/resources/mapper/WarehouseHistoryMapper.xml |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/inspect-server/src/main/resources/mapper/WarehouseHistoryMapper.xml b/inspect-server/src/main/resources/mapper/WarehouseHistoryMapper.xml
index 3e75545..ad1f973 100644
--- a/inspect-server/src/main/resources/mapper/WarehouseHistoryMapper.xml
+++ b/inspect-server/src/main/resources/mapper/WarehouseHistoryMapper.xml
@@ -15,9 +15,13 @@
             <result property="cellId" column="cell_id" jdbcType="INTEGER"/>
     </resultMap>
 
-    <sql id="Base_Column_List">
-        id,ins_sample_id,state,
-        create_time,update_time,create_user,
-        update_user,cell_id
-    </sql>
+    <select id="getUserNameById" resultType="java.lang.String">
+        select name from user where id = #{userId}
+    </select>
+    <select id="getHistoryListBySampleId" resultType="com.yuanchu.mom.dto.HistoryDto">
+        select wh.*,u.name createUserName from warehouse_history wh
+        left join user u on u.id = wh.create_user
+        where wh.ins_sample_id = #{sampleId}
+        order by wh.id desc 
+    </select>
 </mapper>

--
Gitblit v1.9.3