From aedf5ca9ff4ef55c8bc9d6219a439b0ed717e4ed Mon Sep 17 00:00:00 2001
From: Frank <515380148@qq.com>
Date: Sun, 13 Aug 2023 17:54:32 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=9C=89=E7=BB=84=E7=BB=87=E5=BA=9F=E6=B0=94?=
 =?UTF-8?q?=E6=B1=A1=E6=9F=93=E7=89=A9=E6=8E=92=E6=94=BE=E6=B5=93=E5=BA=A6?=
 =?UTF-8?q?=E7=9B=91=E6=B5=8B=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=E8=A1=A8?=
 =?UTF-8?q?=202.=E5=BA=9F=E6=B0=B4=E6=B1=A1=E6=9F=93=E7=89=A9=E6=8E=92?=
 =?UTF-8?q?=E6=94=BE=E6=B5=93=E5=BA=A6=E7=9B=91=E6=B5=8B=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=A1=A8=203.=EF=BC=88=E6=AD=A3=E5=B8=B8?=
 =?UTF-8?q?=E7=9B=91=E6=B5=8B=E6=97=B6=E6=AE=B5=EF=BC=89=E8=B6=85=E6=A0=87?=
 =?UTF-8?q?=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/talroad/SEnvWaterMonDayMapper.xml  | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/szhpt-fixed-task/src/main/resources/mapper/talroad/SEnvWaterMonDayMapper.xml b/szhpt-fixed-task/src/main/resources/mapper/talroad/SEnvWaterMonDayMapper.xml
index 219898c..aa9c2e8 100644
--- a/szhpt-fixed-task/src/main/resources/mapper/talroad/SEnvWaterMonDayMapper.xml
+++ b/szhpt-fixed-task/src/main/resources/mapper/talroad/SEnvWaterMonDayMapper.xml
@@ -77,30 +77,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectEmissionAvgAndMax" resultType="cn.cecep.talroad.vo.analysis.FactoryOutletStaticsVo$EmissionAvgAndMax">
-        SELECT t1.outlet_id,
-               round(avg(t1.sewage_mission::numeric), 6)                   sewageEmissionAvg,
-               round(MAX(t1.sewage_mission::numeric), 6)                   sewageEmissionMax,
+      SELECT t1.outlet_id,
+               round(avg(t1.sewage_emission::numeric), 6)                   sewageEmissionAvg,
+               round(MAX(t1.sewage_emission::numeric), 6)                   sewageEmissionMax,
                round(avg(t1.cod_emission::numeric), 6)                     codEmissionAvg,
                round(MAX(t1.cod_emission::numeric), 6)                     codEmissionMax,
                round(avg(t1.ammonia_nitrogen_emission::numeric), 6)        ammoniaNitrogenEmissionAvg,
                round(MAX(t1.ammonia_nitrogen_emission::numeric), 6)        ammoniaNitrogenEmissionMax,
-               round(avg(t1.nitrogen_oncentration_emission::numeric), 6)  nitrogenConcentrationEmissionAvg,
-               round(MAX(t1.nitrogen_oncentration_emission::numeric), 6)   nitrogenConcentrationEmissionMax,
-               round(avg(t1.phosphorus_oncentration_emission::numeric), 6) phosphorusConcentrationEmissionAvg,
-               round(MAX(t1.phosphorus_oncentration_emission::numeric), 6)phosphorusConcentrationEmissionMax
+               round(avg(t1.nitrogen_concentration_emission::numeric), 6)   nitrogenConcentrationEmissionAvg,
+               round(MAX(t1.nitrogen_concentration_emission::numeric), 6)   nitrogenConcentrationEmissionMax,
+               round(avg(t1.phosphorus_concentration_emission::numeric), 6) phosphorusConcentrationEmissionAvg,
+               round(MAX(t1.phosphorus_concentration_emission::numeric), 6) phosphorusConcentrationEmissionMax
                 FROM (
                 SELECT
+				   to_timestamp(monitoring_time, 'yyyy-mm-dd hh24:MI:SS') as date_time,
                    outlet_id,
-                   sewage_mission,
+                   sewage_emission,
                    cod_emission,
                    ammonia_nitrogen_emission,
-                   nitrogen_oncentration_emission,
-                   phosphorus_oncentration_emission
+                   nitrogen_concentration_emission,
+                   phosphorus_concentration_emission
                 FROM s_env_water_mon_day
                 WHERE data_type = 'd'
                   AND data_flag not in ('C', 'M', 'D', 'MD', 'K', 'P', 'VGD', 'TD', 'F')
-                  AND monitoring_time >= to_timestamp(#{startTime}, 'yyyy-mm-dd hh24:MI:SS')
-                  AND monitoring_time &lt;= to_timestamp(#{endTime}, 'yyyy-mm-dd hh24:MI:SS')
+                  AND monitoring_time >= #{startTime}
+                  AND monitoring_time &lt;= #{endTime}
                   AND outlet_Id IN
         <foreach collection="outletIds" open="(" separator="," close=")" item="item">
             #{item}