From f8a3a9826738a397bdf4aff4ca7a5116344b5a0a Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 09 五月 2024 07:26:56 +0800
Subject: [PATCH] 实现报告生成合并单元格；修复部分bug
---
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