From 7a941f92da8420f016e98ef69cd0a3f2f566fb1e Mon Sep 17 00:00:00 2001
From: zy <82248909@qq.com>
Date: Thu, 27 Nov 2025 19:46:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8E=E5=8F=B0=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E6=A3=80=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../appmana/controller/BigScreenController.java  | 16 ++++++++++------
 .../mapper/xml/SurvHisdataOrientwaterMapper.xml  |  7 ++++---
 .../org/jeecg/common/vo/OrientDataTrans.java     |  2 ++
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java
index a261156..90b8fd3 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java
@@ -786,10 +786,12 @@ public class BigScreenController {
                                     for (int i= 0;i<curMonth;i++) {
                                         avgTN.add(orientSummry.get(i).getAvgTN());
                                         avgTP.add(orientSummry.get(i).getAvgTP());
-                                        avgNO.add(orientSummry.get(i).getAvgNO());
+//                                        avgNO.add(orientSummry.get(i).getAvgNO());
+                                        avgNO.add(0D);
 
                                         avgNH.add(0D);
-                                        avgCOD.add(0D);
+//                                        avgCOD.add(0D);
+                                        avgCOD.add(orientSummry.get(i).getAvgNO());
                                     }
                                 if(isNeedLastYear){
                                     List<OrientDataTrans> lastYearOrientSummry = hisdataOrientwaterService.getMonthSummry(orientList,lastYear);
@@ -803,10 +805,12 @@ public class BigScreenController {
                                     for (int j= startMonth;j<12;j++) {
                                         lastavgTN.add(lastYearOrientSummry.get(j).getAvgTN());
                                         lastavgTP.add(lastYearOrientSummry.get(j).getAvgTP());
-                                        lastavgNO.add(lastYearOrientSummry.get(j).getAvgNO());
+//                                        lastavgNO.add(lastYearOrientSummry.get(j).getAvgNO());
+                                        lastavgNO.add(0D);
 
                                         lastavgNH.add(0D);
-                                        lastavgCOD.add(0D);
+//                                        lastavgCOD.add(0D);
+                                        lastavgCOD.add(lastYearOrientSummry.get(j).getAvgCod());
                                     }
                                     lastavgTN.addAll(avgTN);
                                     lastavgTP.addAll(avgTP);
@@ -825,8 +829,8 @@ public class BigScreenController {
                                 LinkedHashMap<String, List<Double>> maps = new LinkedHashMap<>();
                                 maps.put(ScreenIndexSummaryEnum.TNSummry.getDesc(),avgTN);
                                 maps.put(ScreenIndexSummaryEnum.TPSummry.getDesc(),avgTP);
-                                maps.put(ScreenIndexSummaryEnum.NOSummry.getDesc(),avgNO);
-//                                maps.put(ScreenIndexSummaryEnum.CODSummry.getDesc(),avgCOD);
+//                                maps.put(ScreenIndexSummaryEnum.NOSummry.getDesc(),avgNO);
+                                maps.put(ScreenIndexSummaryEnum.CODSummry.getDesc(),avgCOD);
 //                                maps.put(ScreenIndexSummaryEnum.NHSummry.getDesc(),avgNH);
 
                                 screenIndexSummaryDetailVo.setDatas(maps);
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 0956566..9d7f494 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
@@ -42,11 +42,11 @@
 
     <select id="getMonthSummry" resultType="org.jeecg.common.vo.OrientDataTrans">
 
-        SELECT t1.index,IFNULL(t2.avgTP,0) as avgTP,IFNULL(t2.avgTN,0) as avgTN,IFNULL(t2.avgNO,0) as avgNO FROM (
+        SELECT t1.index,IFNULL(t2.avgTP,0) as avgTP,IFNULL(t2.avgTN,0) as avgTN,IFNULL(t2.avgNO,0) as avgNO,IFNULL(t2.avgCod,0) as avgCod FROM (
         SELECT @a:=@a + 1 AS `index` FROM mysql.help_topic,(SELECT @a:=0) temp LIMIT 12
         ) t1
         LEFT JOIN (
-                    SELECT ROUND(AVG(t.DATA_WATER_TP),4) AS avgTP,ROUND(AVG(t.DATA_WATER_TN),4) AS avgTN,ROUND(AVG(t.DATA_WATER_NO),4) AS avgNO, MONTH(t.DATA_DATE_TIME) AS month FROM surv_hisdata_orientwater t where 1 = 1 AND t.DATA_WATER_TP &lt;&gt; '0.0000'
+                    SELECT ROUND(AVG(t.DATA_WATER_TP),4) AS avgTP,ROUND(AVG(t.DATA_WATER_TN),4) AS avgTN,ROUND(AVG(t.DATA_WATER_NO),4) AS avgNO,ROUND(AVG(t.DATA_WATER_COD),4) AS avgCod, MONTH(t.DATA_DATE_TIME) AS month FROM surv_hisdata_orientwater t where 1 = 1 AND t.DATA_WATER_TP &lt;&gt; '0.0000'
                 <if test="yearStr!=null and yearStr!=''">
                     and DATE_FORMAT(DATA_DATE_TIME, '%Y') = #{yearStr}
                 </if>
@@ -111,7 +111,8 @@
         select date_format(t.DATA_DATE_TIME,#{timeDataFormat}) as dates,
         ifnull(ROUND(avg(cast(DATA_WATER_TP as decimal(10,1))), 2),'0') as dataWaterTp,
         ifnull(ROUND(avg(cast(DATA_WATER_TN as decimal(10,1))), 2),'0') as dataWaterTn,
-        ifnull(ROUND(avg(cast(DATA_WATER_NO as decimal(10,1))), 2),'0') as dataWaterNo
+        ifnull(ROUND(avg(cast(DATA_WATER_NO as decimal(10,1))), 2),'0') as dataWaterNo,
+        ifnull(ROUND(avg(cast(DATA_WATER_COD as decimal(10,1))), 2),'0') as dataWaterCod
         from surv_hisdata_orientwater t
         <where>
         <if test="tenantId != null and tenantId != ''">
diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/OrientDataTrans.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/OrientDataTrans.java
index e8143c8..904f85c 100644
--- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/OrientDataTrans.java
+++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/OrientDataTrans.java
@@ -18,5 +18,7 @@ public class OrientDataTrans {
     private double avgTN;
 
     private double avgNO;
+
+    private double avgCod;
 }