From 505c33270ab722df093a4c3c6766c5e2d5e2e0f4 Mon Sep 17 00:00:00 2001
From: yangzhe123 <2824096059@qq.com>
Date: Wed, 4 Feb 2026 16:44:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8A=A5=E8=A1=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=AF=BC=E5=87=BA=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/ss/service/StatisticsService.java | 50 ++++++++++++-------
 1 file changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/gunshi/project/ss/service/StatisticsService.java b/src/main/java/com/gunshi/project/ss/service/StatisticsService.java
index 200a4cd..7c9eae0 100644
--- a/src/main/java/com/gunshi/project/ss/service/StatisticsService.java
+++ b/src/main/java/com/gunshi/project/ss/service/StatisticsService.java
@@ -463,24 +463,29 @@ public class StatisticsService {
         //下方统计数据
         RjyNbStatVo vo = rjyNbStat(statisticsQuerySo);
         List<RjyNbVo> list = vo.getList();
-        rjyNb.addAll(list);
+        if(list != null){
+            rjyNb.addAll(list);
+        }
         //最下方拼接一条数据
         RjyNbVo rjyNbVo = new RjyNbVo();
         rjyNbVo.setDate("年统计");
         rjyNbVo.setDrpM1("降水量");
         rjyNbVo.setDrpM2("降水量");
-        rjyNbVo.setDrpM3(vo.getDrpSum().toString());
-        rjyNbVo.setDrpM4(vo.getDrpSum().toString());
-        rjyNbVo.setDrpM5(vo.getDrpSum().toString());
-        rjyNbVo.setDrpM6(vo.getDrpSum().toString());
+        if(vo.getDrpSum() != null){
+            rjyNbVo.setDrpM3(vo.getDrpSum().toString());
+            rjyNbVo.setDrpM4(vo.getDrpSum().toString());
+            rjyNbVo.setDrpM5(vo.getDrpSum().toString());
+            rjyNbVo.setDrpM6(vo.getDrpSum().toString());
+        }
         rjyNbVo.setDrpM7("降雨日数");
         rjyNbVo.setDrpM8("降雨日数");
-        rjyNbVo.setDrpM9(vo.getDayCount().toString());
-        rjyNbVo.setDrpM10(vo.getDayCount().toString());
-        rjyNbVo.setDrpM11(vo.getDayCount().toString());
-        rjyNbVo.setDrpM12(vo.getDayCount().toString());
+        if(vo.getDayCount() != null){
+            rjyNbVo.setDrpM9(vo.getDayCount().toString());
+            rjyNbVo.setDrpM10(vo.getDayCount().toString());
+            rjyNbVo.setDrpM11(vo.getDayCount().toString());
+            rjyNbVo.setDrpM12(vo.getDayCount().toString());
+        }
         rjyNb.add(rjyNbVo);
-
         String fileName = one.getStnm() + statisticsQuerySo.getYear() + "年日降雨年报表";
         ExcelUtil.exportExcel(rjyNb, fileName, RjyNbVo.class, response, fileName,1);
     }
@@ -609,17 +614,24 @@ public class StatisticsService {
         rjswNbVo.setTheme("年统计");
         rjswNbVo.setDate("年统计");
         rjswNbVo.setDrpM1("最高水位");
-        rjswNbVo.setDrpM2(statVo.getMax().toString());
-        rjswNbVo.setDrpM3(statVo.getMax().toString());
-        rjswNbVo.setDrpM4(statVo.getMax().toString());
+        if(statVo.getMax() != null){
+            rjswNbVo.setDrpM2(statVo.getMax().toString());
+            rjswNbVo.setDrpM3(statVo.getMax().toString());
+            rjswNbVo.setDrpM4(statVo.getMax().toString());
+        }
+
         rjswNbVo.setDrpM5("最低水位");
-        rjswNbVo.setDrpM6(statVo.getMin().toString());
-        rjswNbVo.setDrpM7(statVo.getMin().toString());
-        rjswNbVo.setDrpM8(statVo.getMin().toString());
+        if(statVo.getMin() != null){
+            rjswNbVo.setDrpM6(statVo.getMin().toString());
+            rjswNbVo.setDrpM7(statVo.getMin().toString());
+            rjswNbVo.setDrpM8(statVo.getMin().toString());
+        }
         rjswNbVo.setDrpM9("平均水位");
-        rjswNbVo.setDrpM10(statVo.getAvg().toString());
-        rjswNbVo.setDrpM11(statVo.getAvg().toString());
-        rjswNbVo.setDrpM12(statVo.getAvg().toString());
+        if(statVo.getAvg() != null){
+            rjswNbVo.setDrpM10(statVo.getAvg().toString());
+            rjswNbVo.setDrpM11(statVo.getAvg().toString());
+            rjswNbVo.setDrpM12(statVo.getAvg().toString());
+        }
         rjswNbVos.add(rjswNbVo);
 
         String fileName = one.getStnm() + statisticsQuerySo.getYear() + "年日平均水位年报表";