From 9cb6f2a2b7ac422f1b88dab215f1c60cec9292fe Mon Sep 17 00:00:00 2001 From: value <z1292839451@163.com> Date: 星期一, 20 五月 2024 18:17:33 +0800 Subject: [PATCH] 检验下单支持型号自定义;检验报告部分修复 --- cnas-server/src/main/resources/mapper/DeviceMapper.xml | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/cnas-server/src/main/resources/mapper/DeviceMapper.xml b/cnas-server/src/main/resources/mapper/DeviceMapper.xml index 721840b..44655bd 100644 --- a/cnas-server/src/main/resources/mapper/DeviceMapper.xml +++ b/cnas-server/src/main/resources/mapper/DeviceMapper.xml @@ -93,12 +93,11 @@ <select id="selectDeviceParameterPage" resultType="com.yuanchu.mom.dto.DeviceDto"> select * from( SELECT - d.*, u.name equipmentManagerUser, l.laboratory_name laboratoryName, i.inspection_item insProductItem + d.*, u.name equipmentManagerUser, l.laboratory_name laboratoryName FROM device d left join `user` u on u.id = d.equipment_manager left join laboratory l on l.id = d.subordinate_departments_id - left join ins_product i on i.id = d.ins_product_ids ) a <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''"> ${ew.customSqlSegment} -- Gitblit v1.9.3