From a00890e840b80a741f62eb6cb31b46f13be6202f Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 24 十月 2024 16:46:45 +0800
Subject: [PATCH] 附件调试修改+辐射站点报告生成
---
inspect-server/src/main/resources/mapper/WarehouseCellMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/WarehouseCellMapper.xml b/inspect-server/src/main/resources/mapper/WarehouseCellMapper.xml
index 056e417..84c887a 100644
--- a/inspect-server/src/main/resources/mapper/WarehouseCellMapper.xml
+++ b/inspect-server/src/main/resources/mapper/WarehouseCellMapper.xml
@@ -17,11 +17,12 @@
</resultMap>
<select id="getWarehouse" resultMap="WarehouseCellAndHistoryDto">
- select wc.id, wc.row, wc.col, i.id sampleId, i.sample, i.model, i.sample_code from warehouse_cell wc
+ select wc.id, wc.row, wc.col, i.id sampleId, i.sample, i.model, i.sample_code
+ from warehouse_cell wc
left join ins_sample i on i.cell_id = wc.id
where wc.state = 1
and wc.shelf_id = #{shelfId}
- order by wc.id
+ order by wc.row ,wc.col, wc.id
</select>
<resultMap id="WarehouseCellAndHistoryDto" type="com.yuanchu.mom.dto.WarehouseCellAndSampleDto">
--
Gitblit v1.9.3