From 218388d1cecbf8cf4ab5ba51d3c875a0f21e8998 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 09 四月 2025 13:24:31 +0800
Subject: [PATCH] 1.原辅料下单提交
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 01a3ecf..2fe9e71 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -96,11 +96,28 @@
GROUP BY ins_sample_id
ORDER BY ins_sample_id) isu ON isu.ins_sample_id = io.id
where (io.ifs_inventory_id IS NULL OR TRIM(io.ifs_inventory_id) = '')
- <if test="isOrderAll != null and isOrderAll != ''">
+ <if test="otherParam.isOrderAll != null and otherParam.isOrderAll != ''">
AND io.state in (1, 4)
</if>
- <if test="laboratory!=null and laboratory!=''">
- AND io.laboratory=#{laboratory}
+ <if test="otherParam.laboratory!=null and otherParam.laboratory!=''">
+ AND io.laboratory=#{otherParam.laboratory}
+ </if>
+ <if test="otherParam.checkUserFlag != null and otherParam.checkUserFlag and otherParam.checkUserId != null ">
+ AND io.id IN (
+ SELECT DISTINCT
+ ins_sample_id AS orderId
+ FROM
+ ins_sample_user
+ WHERE
+ user_id = #{otherParam.checkUserId} UNION
+ SELECT
+ T2.ins_order_id AS orderId
+ FROM
+ ins_product T1
+ JOIN ins_sample T2 ON T1.ins_sample_id = T2.id
+ WHERE
+ T1.check_user_id = #{otherParam.checkUserId}
+ )
</if>
GROUP BY io.id,type
order by type desc,io.id desc
@@ -166,10 +183,13 @@
i.order_type,
ip.sort,
ip.cable_tag,
- ip.radius
+ ip.radius,
+ ip.check_user_id,
+ ur.name AS checkUserName
from ins_sample isa
left join ins_order i on isa.ins_order_id = i.id
left join ins_product ip on isa.id = ip.ins_sample_id
+ left join user ur on ip.check_user_id = ur.id
where ip.state = 1
and i.id=#{id}
and ip.is_binding != 1
--
Gitblit v1.9.3