修改导出Double格式

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

@@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
 
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -315,26 +316,27 @@ public class RevenueController {
         }
         int no=1;
         List<List<String>> excelResult=new  ArrayList<>();
+        DecimalFormat df = new DecimalFormat("0.###");
         for(MonthRevenueDto item : result){
             List<String> datalist=new ArrayList<>();
             datalist.add(String.valueOf(no++));
             datalist.add(item.getCollectDateString().replace("-","年")+"月");
-            datalist.add(item.getMeterReadingUsage()==null?"-":String.valueOf(item.getMeterReadingUsage()));
+            datalist.add(item.getMeterReadingUsage()==null?"-":df.format(item.getMeterReadingUsage()));
             for(WaterPropertyEntity water :waterPropertyList){
                 List<MonthSellwaterEntity> sellWaterList = item.getMonthSellList().stream().filter((MonthSellwaterEntity m)
                         -> m.getPropertyId().equals(water.getId())).collect(Collectors.toList());
                 if(sellWaterList.size()>0){
-                    datalist.add(sellWaterList.get(0).getWaterUsage()==null?"-":String.valueOf(sellWaterList.get(0).getWaterUsage()));
+                    datalist.add(sellWaterList.get(0).getWaterUsage()==null?"-":df.format(sellWaterList.get(0).getWaterUsage()));
                 }else{
                     datalist.add("-");
                 }
             }
-            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()));
+            datalist.add(item.getReceivableTotalAmount()==null?"-":df.format(item.getReceivableTotalAmount()));
+            datalist.add(item.getBigUserUsage()==null?"-":df.format(item.getBigUserUsage()));
+            datalist.add(item.getGeneralUserUsage()==null?"-":df.format(item.getGeneralUserUsage()));
+            datalist.add(item.getReceivedTotalAmount()==null?"-":df.format(item.getReceivedTotalAmount()));
+            datalist.add(item.getBigUserUsageReceived()==null?"-":df.format(item.getBigUserUsageReceived()));
+            datalist.add(item.getGeneralUserUsageReceived()==null?"-":df.format(item.getGeneralUserUsageReceived()));
             excelResult.add(datalist);
         }
         String filePath = ExcelUtil.writeSimpleExcelWithHeader(baseDir,"营收报表",reportTitle,excelResult);