From 1f0fcbbf206bdaa3a9bba5b3f8aeb3015bcaea30 Mon Sep 17 00:00:00 2001
From: tangw <czlis@tangw>
Date: Tue, 27 Jan 2026 18:18:29 +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 | 4 ++--
 liswork/src/main/resources/mapper/QcStatMapper.xml  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/liswork/src/main/resources/mapper/QcGraphMapper.xml b/liswork/src/main/resources/mapper/QcGraphMapper.xml
index caa9f0e..767fe4c 100644
--- a/liswork/src/main/resources/mapper/QcGraphMapper.xml
+++ b/liswork/src/main/resources/mapper/QcGraphMapper.xml
@@ -137,8 +137,8 @@
             <if test="yq != null and yq !=''">and qc_val.yq = #{yq}</if>
             <if test="xmdh != null and xmdh !=''">and qc_val.xmdh = #{xmdh}</if>
             <if test="zkph != null and zkph !=''">and qc_val.zkph = #{zkph}</if>
-            <if test="zkrq1 != null">and qc_val.ksrq>=(select min(ksrq) from qc_sample x where x.yq=qc_val.yq and x.xmdh=qc_val.xmdh  and x.zkph=qc_val.zkph and qc_sample.zkpph=x.zkpph)</if>
-            <if test="zkrq2 != null">and #{zkrq2}>= qc_val.ksrq </if>
+            <if test="zkrq1 != null">and qc_val.zkrq>=(select min(ksrq) from qc_sample x where x.yq=qc_val.yq and x.xmdh=qc_val.xmdh  and x.zkph=qc_val.zkph and qc_sample.zkpph=x.zkpph)</if>
+            <if test="zkrq2 != null">and #{zkrq2}>= qc_val.zkrq </if>
         </where>
         and qc_sample.zkpph=s.zkpph
         group by qc_val.yq,qc_val.zkph,qc_val.xmdh
diff --git a/liswork/src/main/resources/mapper/QcStatMapper.xml b/liswork/src/main/resources/mapper/QcStatMapper.xml
index b8d96d3..f9e0e9f 100644
--- a/liswork/src/main/resources/mapper/QcStatMapper.xml
+++ b/liswork/src/main/resources/mapper/QcStatMapper.xml
@@ -44,8 +44,8 @@
         <where>
             <if test="yq != null and yq !=''">and qc_val.yq = #{yq}</if>
             <if test="zkph != null and zkph !=''">and qc_val.zkph = #{zkph}</if>
-            <if test="zkrq != null">and qc_val.ksrq>=(select min(ksrq) from qc_sample x where x.yq=qc_val.yq and x.xmdh=qc_val.xmdh  and x.zkph=qc_val.zkph and qc_sample.zkpph=x.zkpph)</if>
-            <if test="zkrq != null">and convert(datetime,convert(char(8),DATEADD(month,1,#{zkrq}),120)+'01')>= qc_val.ksrq </if>
+            <if test="zkrq != null">and qc_val.zkrq>=(select min(ksrq) from qc_sample x where x.yq=qc_val.yq and x.xmdh=qc_val.xmdh  and x.zkph=qc_val.zkph and qc_sample.zkpph=x.zkpph)</if>
+            <if test="zkrq != null">and convert(datetime,convert(char(8),DATEADD(month,1,#{zkrq}),120)+'01')>= qc_val.zkrq </if>
         </where>
         and qc_sample.zkpph=s.zkpph
         group by qc_val.yq,qc_val.zkph,qc_val.xmdh