From df1006a4b6066bb804f4ae1515e2edecbc64be74 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 16 七月 2025 11:30:45 +0800
Subject: [PATCH] yys 回退sql
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 84af8bb..cda7bff 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -177,9 +177,9 @@
io.send_time,
io.order_type,
case when
- io.type_source = 0
- then io.sample_view
- else io.sample end sample,
+ io.type_source = 0
+ then io.sample_view
+ else io.sample end sample,
GROUP_CONCAT(DISTINCT isa.model SEPARATOR ' ') AS sample_model,
userName,
checkName,
@@ -203,7 +203,7 @@
FROM ins_sample_user u LEFT JOIN user uu ON u.user_id = uu.id
WHERE u.state=0
<if test="sonLaboratory!= null and sonLaboratory != ''">
- and son_laboratory=#{sonLaboratory}
+ and son_laboratory=#{sonLaboratory}
</if>
GROUP BY ins_sample_id
ORDER BY ins_sample_id
@@ -251,6 +251,7 @@
${ew.customSqlSegment}
</if>
ORDER BY send_time asc
+
</select>
<select id="inspectionOrderDetailsTaskSwitching" resultType="com.ruoyi.inspect.vo.InsOrderPlanTaskSwitchVo">
@@ -463,7 +464,8 @@
ifs.id inventoryQuantityId,
ifs.buy_unit_meas buyUnitMeas,
io.test_quantity testQuantity,
- ifs.buy_unit_meas buyUnitMeas
+ ifs.buy_unit_meas buyUnitMeas,
+ ifs.declare_date declareDate
FROM
ifs_inventory_quantity ifs
LEFT JOIN ins_order io ON ifs.id = io.ifs_inventory_id
@@ -555,9 +557,6 @@
<if test="repetitionTag != null and repetitionTag != ''">
and ip.repetition_tag = #{repetitionTag}
</if>
- <if test="isDisqualification != null and isDisqualification != ''">
- and ip.ins_result = 0
- </if>
order by sort asc
</select>
@@ -572,9 +571,6 @@
and ins_fibers_id is null
and standard_method_list_id is not null
and ip.raw_material_tag = #{rawMaterialTag}
- <if test="isDisqualification != null and isDisqualification != ''">
- and ip.ins_result = 0
- </if>
order by sort asc
</select>
@@ -697,4 +693,13 @@
order by ip.sort asc
</select>
+ <!-- 鏍规嵁璁㈠崟id鏌ヨ鏍峰搧 -->
+ <select id="getSampleByOrderId" resultType="com.ruoyi.inspect.pojo.InsSample">
+ select is2.*,
+ sml.name standard_method_name
+ from ins_sample is2
+ left join standard_method sml on sml.id = is2.standard_method_list_id
+ where is2.ins_order_id = #{insOrderId}
+ </select>
+
</mapper>
--
Gitblit v1.9.3