From c88f52ed0cf4eceb12c1ad74aa019f8469cd38ab Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期二, 20 八月 2024 18:10:01 +0800 Subject: [PATCH] 标准库新增导出功能+标准库中点击光纤大类(后端生成的id重复报错) --- 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