From 9def14daf3c5363694b08c267cc397bf0905ea82 Mon Sep 17 00:00:00 2001
From: tangw <czlis@tangw>
Date: Mon, 9 Feb 2026 17:36:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E6=8E=A7=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 liswork/src/main/resources/mapper/QcGraphMapper.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/liswork/src/main/resources/mapper/QcGraphMapper.xml b/liswork/src/main/resources/mapper/QcGraphMapper.xml
index f0a943d..da77d0c 100644
--- a/liswork/src/main/resources/mapper/QcGraphMapper.xml
+++ b/liswork/src/main/resources/mapper/QcGraphMapper.xml
@@ -34,7 +34,7 @@
                 </foreach>
             </if>
             <if test="zkpph != null and zkpph !=''">and qc_sample.zkpph = #{zkpph}</if>
-            <if test="zkrq1 != null">and qc_val.zkrq>= #{zkrq1} </if>
+            <if test="zkrq1 != null">and qc_val.zkrq>= #{zkrq1} and #{zkrq1}>=qc_sample.ksrq  </if>
             <if test="zkrq2 != null">and #{zkrq2}>= qc_val.zkrq </if>
             <if test="cs != null and cs !=10">and qc_val.cs = #{cs}</if>
         </where>
@@ -58,7 +58,7 @@
                 </foreach>
             </if>
             <if test="zkpph != null and zkpph !=''">and qc_sample.zkpph = #{zkpph}</if>
-            <if test="zkrq1 != null">and qc_val.zkrq>= #{zkrq1} </if>
+            <if test="zkrq1 != null">and qc_val.zkrq>= #{zkrq1} and #{zkrq1}>=qc_sample.ksrq </if>
             <if test="zkrq2 != null">and #{zkrq2}>= qc_val.zkrq </if>
             <if test="cs != null and cs !=10">and qc_val.cs =(select max(cs) from qc_val a where a.yq=qc_val.yq and a.xmdh=qc_val.xmdh  and a.zkph=qc_val.zkph and a.zkrq=qc_val.zkrq) </if>
         </where>
@@ -82,7 +82,7 @@
                 </foreach>
             </if>
             <if test="zkpph != null and zkpph !=''">and qc_sample.zkpph = #{zkpph}</if>
-            <if test="zkrq1 != null">and qc_val.zkrq>= #{zkrq1} </if>
+            <if test="zkrq1 != null">and qc_val.zkrq>= #{zkrq1} and #{zkrq1}>=qc_sample.ksrq </if>
             <if test="zkrq2 != null">and #{zkrq2}>= qc_val.zkrq </if>
             <if test="cs != null and cs !=10">and abs(qc_sample.zkbz - qc_val.zkjg)=(select min(abs(qc_sample.zkbz - a.zkjg)) from qc_val a where a.yq=qc_val.yq and a.xmdh=qc_val.xmdh  and a.zkph=qc_val.zkph and a.zkrq=qc_val.zkrq) </if>
         </where>
@@ -109,7 +109,7 @@
                 </foreach>
             </if>
             <if test="zkpph != null and zkpph !=''">and qc_sample.zkpph = #{zkpph}</if>
-            <if test="zkrq1 != null">and qc_val.zkrq>= #{zkrq1} </if>
+            <if test="zkrq1 != null">and qc_val.zkrq>= #{zkrq1} and #{zkrq1}>=qc_sample.ksrq </if>
             <if test="zkrq2 != null">and #{zkrq2}>= qc_val.zkrq </if>
             <if test="cs != null and cs !=10">and qc_val.cs =1</if>
         </where>
@@ -141,7 +141,7 @@
                     #{item}
                 </foreach>
          </if>
-        <if test="zkrq1 != null">and qc_val.zkrq>= #{zkrq1} </if>
+        <if test="zkrq1 != null">and qc_val.zkrq>= #{zkrq1} and #{zkrq1}>=qc_sample.ksrq </if>
         <if test="zkrq2 != null">and #{zkrq2}>= qc_val.zkrq </if>
         </where>
         group by qc_val.yq,qc_val.zkph,qc_val.xmdh,xm_info.xmmc,xm_info.dyxh,qc_sample.zkbz,qc_sample.sd,qc_sample.cv