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 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> 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 @@