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 @@ and qc_val.yq = #{yq} and qc_val.xmdh = #{xmdh} and qc_val.zkph = #{zkph} - 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) - and #{zkrq2}>= qc_val.ksrq + 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) + and #{zkrq2}>= qc_val.zkrq 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 @@ and qc_val.yq = #{yq} and qc_val.zkph = #{zkph} - 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) - and convert(datetime,convert(char(8),DATEADD(month,1,#{zkrq}),120)+'01')>= qc_val.ksrq + 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) + and convert(datetime,convert(char(8),DATEADD(month,1,#{zkrq}),120)+'01')>= qc_val.zkrq and qc_sample.zkpph=s.zkpph group by qc_val.yq,qc_val.zkph,qc_val.xmdh