From ba5bd31ecf829d2b462bd3f62b566828b347a89a Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 08 四月 2025 13:36:18 +0800
Subject: [PATCH] Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-after into radio_frequency
---
basic-server/src/main/resources/mapper/StructureTestMapper.xml | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/basic-server/src/main/resources/mapper/StructureTestMapper.xml b/basic-server/src/main/resources/mapper/StructureTestMapper.xml
index a17b51a..ce6bf83 100644
--- a/basic-server/src/main/resources/mapper/StructureTestMapper.xml
+++ b/basic-server/src/main/resources/mapper/StructureTestMapper.xml
@@ -16,15 +16,17 @@
sto.laboratory_id,
GROUP_CONCAT(p.name) product,
sto.specimen_name_en,
- sto.object_type
+ sto.object_type,
+ sto.work_shop_name,
+ sto.work_shop_id
from structure_test_object sto
left join user u1 on sto.create_user = u1.id
left join user u2 on sto.update_user = u2.id
left join product p on p.object_id = sto.id
left join product_part pp on pp.product_id = p.id
left join structure_test_object_part stop ON stop.test_object_id = sto.id
- <if test="partNo != null and partNo != ''" >
- where pp.part_no = #{partNo} or stop.part_no = #{partNo}
+ <if test="specimenName != null and specimenName != ''" >
+ where sto.specimen_name like concat ('%',#{specimenName},'%')
</if>
group by sto.id
) a
--
Gitblit v1.9.3