From 996c3fb89b185eedf2fd58a6c5bd5586e04cdccf Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 21 八月 2025 17:47:01 +0800
Subject: [PATCH] 电路试验,不同频段的要求值可以进行调整
---
inspect-server/src/main/resources/mapper/InsProductResult2Mapper.xml | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsProductResult2Mapper.xml b/inspect-server/src/main/resources/mapper/InsProductResult2Mapper.xml
index de4be72..b275009 100644
--- a/inspect-server/src/main/resources/mapper/InsProductResult2Mapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsProductResult2Mapper.xml
@@ -13,6 +13,7 @@
<result column="update_time" property="updateTime"/>
<result column="frequency" property="frequency"/>
<result column="often" property="often"/>
+ <result column="ask" property="ask"/>
<result column="port" property="port"/>
<result column="angle" property="angle"/>
<result column="value" property="value"/>
@@ -20,38 +21,40 @@
</resultMap>
<insert id="saveBatch">
INSERT INTO ins_product_result_2 (ins_product_id, equip_value, equip_name,
- frequency, port, angle, value, result, often, num)
+ frequency, port,ask, angle, value, result, often, num)
VALUES
<foreach collection="result2s" item="result2" separator=",">
( #{result2.insProductId},
- #{result2.equipValue},
- #{result2.equipName},
- #{result2.frequency},
- #{result2.port},
- #{result2.angle},
- #{result2.value},
- #{result2.result},
- #{result2.often},
- #{result2.num})
+ #{result2.equipValue},
+ #{result2.equipName},
+ #{result2.frequency},
+ #{result2.port},
+ #{result2.ask},
+ #{result2.angle},
+ #{result2.value},
+ #{result2.result},
+ #{result2.often},
+ #{result2.num})
</foreach>
</insert>
<select id="selectWordHang" resultType="com.yuanchu.mom.vo.InsProductResult2VO">
select
inspection_item_subclass,
unit,
- ask,
+ case when ipr2.ask is null then ip.ask
+ else ipr2.ask end as ask,
result,
frequency,
port,
value,
result
- from ins_product_result_2 ipr2
- left join ins_product ip on ipr2.ins_product_id = ip.id
+ from ins_product_result_2 ipr2
+ left join ins_product ip on ipr2.ins_product_id = ip.id
where num=#{num}
- and ip.id in
- <foreach collection="ids" separator="," item="id" open="(" close=")" >
- #{id}
- </foreach>
+ and ip.id in
+ <foreach collection="ids" separator="," item="id" open="(" close=")">
+ #{id}
+ </foreach>
order by inspection_item_subclass
</select>
</mapper>
--
Gitblit v1.9.3