From c88f52ed0cf4eceb12c1ad74aa019f8469cd38ab Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期二, 20 八月 2024 18:10:01 +0800 Subject: [PATCH] 标准库新增导出功能+标准库中点击光纤大类(后端生成的id重复报错) --- inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml index 08ee5e4..9caad82 100644 --- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml +++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml @@ -272,8 +272,8 @@ left join ins_product_result ipr on ip.id = ipr.ins_product_id where ins_order_id = #{id} and state = 1 - and ins_fiber_id is null - and ins_fibers_id is null +-- and ins_fiber_id is null +-- and ins_fibers_id is null and <!--isa.sample_code NOT REGEXP '/'--> isa.id in(select id1 from (select is2.id id1 ,ip.id from ins_sample is2 left join ins_product ip on is2.id = ip.ins_sample_id where ip.id is not null)s ) order by case when man_hour_group is NULL then 1 -- Gitblit v1.9.3