From 8d6e88b5062317dabf6b4cdd90a000ca667c7976 Mon Sep 17 00:00:00 2001
From: zhangyue <82248909@qq.com>
Date: Mon, 27 Jul 2026 12:15:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E9=A6=96=E9=A1=B5=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E7=B2=BE=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xml/SurvHisdataLivestockwaterMapper.xml   | 20 +++++++++----------
 .../xml/SurvHisdataOrientwaterMapper.xml      | 20 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataLivestockwaterMapper.xml b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataLivestockwaterMapper.xml
index c0bb413..cc5e849 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataLivestockwaterMapper.xml
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataLivestockwaterMapper.xml
@@ -115,16 +115,16 @@
 
     <select id="integrateSummary" resultType="org.jeecg.common.iot.common.VOSurvIntegrateLiveDetail">
         select date_format(t.DATA_DATE_TIME,#{timeDataFormat}) as dates,
-        ifnull(avg(cast(DATA_WATER_TP as decimal(10,4))),'0') as dataWaterTp,
-        ifnull(avg(cast(DATA_WATER_TP_SY as decimal(10,4))),'0') as dataWaterTpSy,
-        ifnull(avg(cast(DATA_WATER_TN as decimal(10,4))),'0') as dataWaterTn,
-        ifnull(avg(cast(DATA_WATER_TN_SY as decimal(10,4))),'0') as dataWaterTnSy,
-        ifnull(avg(cast(DATA_WATER_NO as decimal(10,4))),'0') as dataWaterNo,
-        ifnull(avg(cast(DATA_WATER_NO_SY as decimal(10,4))),'0') as dataWaterNoSy,
-        ifnull(avg(cast(DATA_WATER_NH as decimal(10,4))),'0') as dataWaterNh,
-        ifnull(avg(cast(DATA_WATER_NH_SY as decimal(10,4))),'0') as dataWaterNhSy,
-        ifnull(avg(cast(DATA_WATER_COD as decimal(10,4))),'0') as dataWaterCod,
-        ifnull(avg(cast(DATA_WATER_COD_SY as decimal(10,4))),'0') as dataWaterCodSy
+        ifnull(TRUNCATE(avg(cast(DATA_WATER_TP as decimal(10,4))), 4),'0') as dataWaterTp,
+        ifnull(TRUNCATE(avg(cast(DATA_WATER_TP_SY as decimal(10,4))), 4),'0') as dataWaterTpSy,
+        ifnull(TRUNCATE(avg(cast(DATA_WATER_TN as decimal(10,4))), 4),'0') as dataWaterTn,
+        ifnull(TRUNCATE(avg(cast(DATA_WATER_TN_SY as decimal(10,4))), 4),'0') as dataWaterTnSy,
+        ifnull(TRUNCATE(avg(cast(DATA_WATER_NO as decimal(10,4))), 4),'0') as dataWaterNo,
+        ifnull(TRUNCATE(avg(cast(DATA_WATER_NO_SY as decimal(10,4))), 4),'0') as dataWaterNoSy,
+        ifnull(TRUNCATE(avg(cast(DATA_WATER_NH as decimal(10,4))), 4),'0') as dataWaterNh,
+        ifnull(TRUNCATE(avg(cast(DATA_WATER_NH_SY as decimal(10,4))), 4),'0') as dataWaterNhSy,
+        ifnull(TRUNCATE(avg(cast(DATA_WATER_COD as decimal(10,4))), 4),'0') as dataWaterCod,
+        ifnull(TRUNCATE(avg(cast(DATA_WATER_COD_SY as decimal(10,4))), 4),'0') as dataWaterCodSy
         from surv_hisdata_livestockwater t
         <where>
         <if test="tenantId != null and tenantId != ''">
diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataOrientwaterMapper.xml b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataOrientwaterMapper.xml
index cb721e1..3f171cb 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataOrientwaterMapper.xml
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataOrientwaterMapper.xml
@@ -128,16 +128,16 @@
 
     <select id="integrateSummary" resultType="org.jeecg.common.iot.common.VOSurvIntegrateOrientDetail">
         select date_format(t.DATA_DATE_TIME,#{timeDataFormat}) as dates,
-        ifnull(avg(cast(DATA_WATER_TP as decimal(10,4))),'0') as dataWaterTp,
-        ifnull(avg(cast(DATA_WATER_TP_SY as decimal(10,4))),'0') as dataWaterTpSy,
-        ifnull(avg(cast(DATA_WATER_TN as decimal(10,4))),'0') as dataWaterTn,
-        ifnull(avg(cast(DATA_WATER_TN_SY as decimal(10,4))),'0') as dataWaterTnSy,
-        ifnull(avg(cast(DATA_WATER_NO as decimal(10,4))),'0') as dataWaterNo,
-        ifnull(avg(cast(DATA_WATER_NO_SY as decimal(10,4))),'0') as dataWaterNoSy,
-        ifnull(avg(cast(DATA_WATER_NH as decimal(10,4))),'0') as dataWaterNh,
-        ifnull(avg(cast(DATA_WATER_NH_SY as decimal(10,4))),'0') as dataWaterNhSy,
-        ifnull(avg(cast(DATA_WATER_COD as decimal(10,4))),'0') as dataWaterCod,
-        ifnull(avg(cast(DATA_WATER_COD_SY as decimal(10,4))),'0') as dataWaterCodSy
+        ifnull(TRUNCATE(avg(cast(DATA_WATER_TP as decimal(10,4))), 4),'0') as dataWaterTp,
+        ifnull(TRUNCATE(avg(cast(DATA_WATER_TP_SY as decimal(10,4))), 4),'0') as dataWaterTpSy,
+        ifnull(TRUNCATE(avg(cast(DATA_WATER_TN as decimal(10,4))), 4),'0') as dataWaterTn,
+        ifnull(TRUNCATE(avg(cast(DATA_WATER_TN_SY as decimal(10,4))), 4),'0') as dataWaterTnSy,
+        ifnull(TRUNCATE(avg(cast(DATA_WATER_NO as decimal(10,4))), 4),'0') as dataWaterNo,
+        ifnull(TRUNCATE(avg(cast(DATA_WATER_NO_SY as decimal(10,4))), 4),'0') as dataWaterNoSy,
+        ifnull(TRUNCATE(avg(cast(DATA_WATER_NH as decimal(10,4))), 4),'0') as dataWaterNh,
+        ifnull(TRUNCATE(avg(cast(DATA_WATER_NH_SY as decimal(10,4))), 4),'0') as dataWaterNhSy,
+        ifnull(TRUNCATE(avg(cast(DATA_WATER_COD as decimal(10,4))), 4),'0') as dataWaterCod,
+        ifnull(TRUNCATE(avg(cast(DATA_WATER_COD_SY as decimal(10,4))), 4),'0') as dataWaterCodSy
         from surv_hisdata_orientwater t
         <where>
         <if test="tenantId != null and tenantId != ''">