From 1b0b86833609f1d0a25b0bc84d21796581629f4e Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 10 四月 2025 13:07:21 +0800
Subject: [PATCH] 温湿度报检功能调整
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index e80e958..57aaac4 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -250,7 +250,7 @@
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
- ORDER BY A.ins_time DESC
+ ORDER BY send_time asc
</select>
<select id="inspectionOrderDetailsTaskSwitching" resultType="com.ruoyi.inspect.vo.InsOrderPlanTaskSwitchVo">
@@ -463,7 +463,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
@@ -697,4 +698,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