From 788b1abbdc75d6bc727be65fc107fb10eaa484b6 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期二, 30 七月 2024 20:04:10 +0800 Subject: [PATCH] 模版变更,下单的界面设置区间,如果填写0.48*0.5的时候筛选条件用0.48,下单的模版查看根据委托单位进行筛选,如果委托单位为空就可以查看所有 --- inspect-server/src/main/resources/mapper/InsProductMapper.xml | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/inspect-server/src/main/resources/mapper/InsProductMapper.xml b/inspect-server/src/main/resources/mapper/InsProductMapper.xml index e3b2e1e..d1e6308 100644 --- a/inspect-server/src/main/resources/mapper/InsProductMapper.xml +++ b/inspect-server/src/main/resources/mapper/InsProductMapper.xml @@ -74,7 +74,7 @@ ip.inspection_item_subclass, ip.laboratory, ip.unit, - ipr.equip_value, + ipr.equip_name equipValue, io.entrust_code, ipr.update_time, ip.ins_result, @@ -86,5 +86,17 @@ left join user u on u.id = ipr.update_user where ip.ins_sample_id = #{sampleId} and ip.ins_result is not null + and template_id is not null + </select> + <select id="selectFiberInsProduct" resultType="com.yuanchu.mom.pojo.InsProduct"> + select * from ins_product + where state = 1 + and (ins_fibers_id is not null or ins_fiber_id is not null) + and ins_result is null + and son_laboratory = #{laboratory} + and ins_sample_id in + <foreach collection="ids" index="index" item="item" open="(" separator="," close=")"> + #{item} + </foreach> </select> </mapper> -- Gitblit v1.9.3