From 58a3ecc6195222dfee4c1342b3b99ba622d43e80 Mon Sep 17 00:00:00 2001 From: duwenyuan <15600000461@163.com> Date: Mon, 14 Jul 2025 16:40:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9findPhdfProvisionEfficiencySa?= =?UTF-8?q?una=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=8C=E6=8A=8AMDC?= =?UTF-8?q?=E5=A4=A7=E4=BA=8E=E9=85=8D=E7=BD=AE=E5=80=BC=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=88=90=E5=B0=8F=E4=BA=8E=E3=80=82=20=E4=BF=AE=E6=94=B9findPh?= =?UTF-8?q?dfProvisionEfficiencyParticulate=E6=9F=A5=E8=AF=A2=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/calCulStationInfoMapper.xml | 50 ++++++++++++++--- .../mapper/xml/calCulStationInfoPgMapper.xml | 54 ++++++++++++++++--- 2 files changed, 89 insertions(+), 15 deletions(-) diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/xml/calCulStationInfoMapper.xml b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/xml/calCulStationInfoMapper.xml index b7645eb9..dd29f539 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/xml/calCulStationInfoMapper.xml +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/xml/calCulStationInfoMapper.xml @@ -53,7 +53,7 @@ SELECT (sum(CASE WHEN ROUND( sdata.acquisition_live_sec / 60 / 60.00 ) BETWEEN ${liveLow} AND ${liveHigh} AND sdata.quantity > ${quantity} - AND xe.MDC > ${mdc} + AND xe.MDC < ${mdc} AND ( to_number( SDATA.COLLECT_STOP - SDATA.COLLECT_START ) * 24 ) BETWEEN ${collectLow} AND ${collectHigh} AND aux.xe_volume > ${xeVolume} AND xe.nuclide_name = '${nuclideName}' @@ -64,7 +64,7 @@ AND sdata.data_type = 'G' THEN 1 ELSE 0 END)) dataNumber, ROUND((sum(CASE WHEN ROUND( sdata.acquisition_live_sec / 60 / 60.00 ) BETWEEN ${liveLow} AND ${liveHigh} AND sdata.quantity > ${quantity} - AND xe.MDC > ${mdc} + AND xe.MDC < ${mdc} AND ( to_number( SDATA.COLLECT_STOP - SDATA.COLLECT_START ) * 24 ) BETWEEN ${collectLow} AND ${collectHigh} AND aux.xe_volume > ${xeVolume} AND xe.nuclide_name = '${nuclideName}' @@ -118,12 +118,12 @@ select (sum(case when ROUND(sdata.acquisition_live_sec/60/60.00) BETWEEN ${liveLow} and ${liveHigh} - and sdata.quantity> ${quantity} and xe.MDC> ${mdc} + and sdata.quantity> ${quantity} and xe.MDC < ${mdc} and (to_number(SDATA.COLLECT_STOP - SDATA.COLLECT_START)*24) BETWEEN ${collectLow} and ${collectHigh} and aux.xe_volume> ${xeVolume} and xe.nuclide_name= '${nuclideName}' and sdata.data_type='S' then 1 else 0 end) + sum(case when sdata.acquisition_live_sec> ${liveQc} and sdata.data_type='Q' and sdata.spectral_qualifie='FULL' then 1 else 0 end) + sum(case when ROUND(sdata.acquisition_live_sec/60/60.00,2) BETWEEN ${liveLow} and ${liveHigh} and sdata.data_type='G' then 1 else 0 end)) dataNumber, - ROUND((sum(case when ROUND(sdata.acquisition_live_sec/60/60.00) BETWEEN ${liveLow} and ${liveHigh} and sdata.quantity>${quantity} and xe.MDC> ${mdc} + ROUND((sum(case when ROUND(sdata.acquisition_live_sec/60/60.00) BETWEEN ${liveLow} and ${liveHigh} and sdata.quantity>${quantity} and xe.MDC < ${mdc} and (to_number(SDATA.COLLECT_STOP - SDATA.COLLECT_START)*24) BETWEEN ${collectLow} and ${collectHigh} and aux.xe_volume> ${xeVolume} and xe.nuclide_name= '${nuclideName}' and sdata.data_type='S' then 1 else 0 end) + sum(case when sdata.acquisition_live_sec> ${liveQc} and sdata.data_type='Q' and sdata.spectral_qualifie='FULL' then 1 else 0 end) @@ -415,7 +415,7 @@ - select count(sdata.station_id) dataNumber, ROUND(count(sdata.station_id)/(to_number(TO_DATE('${curDateTime}' ,'YYYY-MM-DD hh24:mi:ss')-TO_DATE('${pretime}','YYYY-MM-DD hh24:mi:ss')+1)*${number})*100,2) dataEfficiency from ORIGINAL.GARDS_SAMPLE_DATA sdata @@ -435,6 +435,42 @@ + + select (sum(case when ROUND(sdata.acquisition_live_sec/60/60.00) BETWEEN ${liveLow} and ${liveHigh} - and sdata.quantity> ${quantity} and xe.MDC> ${mdc} + and sdata.quantity> ${quantity} and xe.MDC < ${mdc} and (ROUND(EXTRACT(EPOCH FROM (SDATA.COLLECT_STOP - SDATA.COLLECT_START ))/86400,1)*24) BETWEEN ${collectLow} and ${collectHigh} and aux.xe_volume> ${xeVolume} and xe.nuclide_name= '${nuclideName}' and sdata.data_type='S' then 1 else 0 end) + sum(case when sdata.acquisition_live_sec> ${liveQc} and sdata.data_type='Q' and sdata.spectral_qualifie='FULL' then 1 else 0 end) + sum(case when ROUND(sdata.acquisition_live_sec/60/60.00,2) BETWEEN ${liveLow} and ${liveHigh} and sdata.data_type='G' then 1 else 0 end)) dataNumber, - ROUND((sum(case when ROUND(sdata.acquisition_live_sec/60/60.00) BETWEEN ${liveLow} and ${liveHigh} and sdata.quantity>${quantity} and xe.MDC> ${mdc} + ROUND((sum(case when ROUND(sdata.acquisition_live_sec/60/60.00) BETWEEN ${liveLow} and ${liveHigh} and sdata.quantity>${quantity} and xe.MDC < ${mdc} and (ROUND(EXTRACT(EPOCH FROM (SDATA.COLLECT_STOP - SDATA.COLLECT_START ))/86400,1)*24) BETWEEN ${collectLow} and ${collectHigh} and aux.xe_volume> ${xeVolume} and xe.nuclide_name= '${nuclideName}' and sdata.data_type='S' then 1 else 0 end) + sum(case when sdata.acquisition_live_sec> ${liveQc} and sdata.data_type='Q' and sdata.spectral_qualifie='FULL' then 1 else 0 end) @@ -142,12 +142,12 @@ - select count(sdata.station_id) dataNumber, ROUND(count(sdata.station_id)/((ROUND(EXTRACT(EPOCH FROM (to_timestamp('${curDateTime}', 'yyyy-MM-dd HH24:mi:ss')-to_timestamp('${pretime}', 'yyyy-MM-dd HH24:mi:ss'))) / 86400,1)+1)*${number})*100,2) dataEfficiency from ORIGINAL.GARDS_SAMPLE_DATA sdata @@ -434,7 +434,45 @@ and to_char(sdata.ACQUISITION_START,'YYYY-MM-DD hh24:mi:ss') BETWEEN #{pretime} and #{curDateTime} - +