导出空值展示成-

sms_water/src/main/java/com/huaxu/controller/RevenueController.java

@@ -319,7 +319,7 @@ public class RevenueController {
             List<String> datalist=new ArrayList<>();
             datalist.add(String.valueOf(no++));
             datalist.add(item.getCollectDateString().replace("-","年")+"月");
-            datalist.add(String.valueOf(item.getMeterReadingUsage()));
+            datalist.add(item.getMeterReadingUsage()==null?"-":String.valueOf(item.getMeterReadingUsage()));
             for(WaterPropertyEntity water :waterPropertyList){
                 List<MonthSellwaterEntity> sellWaterList = item.getMonthSellList().stream().filter((MonthSellwaterEntity m)
                         -> m.getPropertyId().equals(water.getId())).collect(Collectors.toList());
@@ -329,12 +329,12 @@ public class RevenueController {
                     datalist.add("-");
                 }
             }
-            datalist.add(String.valueOf(item.getReceivableTotalAmount()));
-            datalist.add(String.valueOf(item.getBigUserUsage()));
-            datalist.add(String.valueOf(item.getGeneralUserUsage()));
-            datalist.add(String.valueOf(item.getReceivedTotalAmount()));
-            datalist.add(String.valueOf(item.getBigUserUsageReceived()));
-            datalist.add(String.valueOf(item.getGeneralUserUsageReceived()));
+            datalist.add(item.getReceivableTotalAmount()==null?"-":String.valueOf(item.getReceivableTotalAmount()));
+            datalist.add(item.getBigUserUsage()==null?"-":String.valueOf(item.getBigUserUsage()));
+            datalist.add(item.getGeneralUserUsage()==null?"-":String.valueOf(item.getGeneralUserUsage()));
+            datalist.add(item.getReceivedTotalAmount()==null?"-":String.valueOf(item.getReceivedTotalAmount()));
+            datalist.add(item.getBigUserUsageReceived()==null?"-":String.valueOf(item.getBigUserUsageReceived()));
+            datalist.add(item.getGeneralUserUsageReceived()==null?"-":String.valueOf(item.getGeneralUserUsageReceived()));
             excelResult.add(datalist);
         }
         String filePath = ExcelUtil.writeSimpleExcelWithHeader(baseDir,"营收报表",reportTitle,excelResult);