From b97306686e7ac770ba7626dda6835838bdc9fc77 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 19 十二月 2024 15:38:44 +0800
Subject: [PATCH] cnas:1.添加检验下单审核通过后新增7.1检验委托单+2.添加报告编制批准通过后新增7.4报告结果+3.用户控制层一些常用的方法
---
inspect-server/src/main/resources/mapper/WarehouseCellMapper.xml | 8 ++++++--
1 files changed, 6 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..888703e 100644
--- a/inspect-server/src/main/resources/mapper/WarehouseCellMapper.xml
+++ b/inspect-server/src/main/resources/mapper/WarehouseCellMapper.xml
@@ -17,11 +17,15 @@
</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
+ <if test="sampleCode!=null and sampleCode!=''">
+ and i.sample_code=#{sampleCode}
+ </if>
+ order by wc.row ,wc.col, wc.id
</select>
<resultMap id="WarehouseCellAndHistoryDto" type="com.yuanchu.mom.dto.WarehouseCellAndSampleDto">
--
Gitblit v1.9.3