解决报表管理导出报错问题

master
yangzhe123 2026-02-04 16:44:01 +08:00
parent b4ecaf791e
commit 505c33270a
1 changed files with 31 additions and 19 deletions

View File

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