From bc7d9c98bc1b23ef6ef29ed4a6313753f6900640 Mon Sep 17 00:00:00 2001 From: value <z1292839451@163.com> Date: 星期二, 14 五月 2024 02:25:01 +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