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/InsSampleMapper.xml | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index f9bc603..fb9385f 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -54,7 +54,7 @@
io.send_time,
isa.id sampleId,
isa.sample sample,
- isa.sample_code sampleCode,
+ isa.sample_code ,
userName,
userNameId,
checkName,
@@ -81,9 +81,12 @@
ORDER BY ins_sample_id
)isu2 ON isu2.ins_sample_id = isa.id
WHERE io.state = 1 and send_time is not null
- <if test="userName !=null and userName!=''">
- and ( (userName like CONCAT ('%', #{userName},'%') )
- or (checkName like CONCAT ('%', #{userName},'%') ) )
+ <if test="sampleCode !=null and sampleCode!=''">
+ and (isa.sample_code like CONCAT ('%', #{sampleCode},'%') )
+ </if>
+ <if test="myName !=null and myName!=''">
+ and ( (userName like CONCAT ('%', #{myName},'%') )
+ or (checkName like CONCAT ('%', #{myName},'%') ) )
</if>
) a
ON ios.ins_order_id = a.id AND ios.laboratory = #{sonLaboratory} and ios.ins_sample_id=a.sampleId
@@ -254,7 +257,7 @@
method,
man_day,
bsm,
- ask,
+ ip.ask,
`last_value`,
ip.ins_result ip_ins_result,
state,
@@ -274,6 +277,7 @@
ipr.after_note,
ipr.test_result,
ipr2.frequency,
+ ipr2.ask ask2,
ipr2.often,
ipr2.port,
ipr2.angle,
@@ -327,7 +331,7 @@
method,
man_day,
bsm,
- ask,
+ ip.ask,
`last_value`,
ip.ins_result ip_ins_result,
state,
@@ -347,6 +351,7 @@
ipr.after_note,
ipr.test_result,
ipr2.frequency,
+ ipr2.ask ask2,
ipr2.often,
ipr2.port,
ipr2.angle,
@@ -530,7 +535,7 @@
method,
man_day,
bsm,
- ask,
+ ip.ask,
`last_value`,
ip.ins_result ip_ins_result,
state,
@@ -550,6 +555,7 @@
ipr.after_note,
ipr.test_result,
ipr2.frequency,
+ ipr2.ask ask2,
ipr2.often,
ipr2.port,
ipr2.angle,
@@ -601,7 +607,7 @@
method,
man_day,
bsm,
- ask,
+ ip.ask,
`last_value`,
ip.ins_result ip_ins_result,
state,
@@ -621,6 +627,7 @@
ipr.after_note,
ipr.test_result,
ipr2.frequency,
+ ipr2.ask ask2,
ipr2.often,
ipr2.port,
ipr2.angle,
@@ -670,7 +677,7 @@
method,
man_day,
bsm,
- ask,
+ ip.ask,
`last_value`,
ip.ins_result ip_ins_result,
state,
@@ -690,6 +697,7 @@
ipr.after_note,
ipr.test_result,
ipr2.frequency,
+ ipr2.ask ask2,
ipr2.often,
ipr2.port,
ipr2.angle,
@@ -834,6 +842,7 @@
</resultMap>
<resultMap id="insProductResult2" type="com.yuanchu.mom.pojo.InsProductResult2">
<result column="frequency" property="frequency" jdbcType="VARCHAR"/>
+ <result column="ask2" property="ask" jdbcType="VARCHAR"/>
<result column="often" property="often" jdbcType="VARCHAR"/>
<result column="port" property="port" jdbcType="VARCHAR"/>
<result column="angle" property="angle" jdbcType="VARCHAR"/>
--
Gitblit v1.9.3