Jelajahi Sumber

数据大屏 总和数据修改

785834757 2 tahun lalu
induk
melakukan
f71519395d

+ 11 - 5
src/main/java/com/ydtech/modules/largescreen/controller/DataController.java

@@ -15,6 +15,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.text.DecimalFormat;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -301,7 +302,7 @@ public class DataController {
 
     @PostMapping("listData")
     public HttpResult listData(@RequestBody DataQuery dataQuery) {
-
+        DecimalFormat decimalFormat = new DecimalFormat("#0.00");
         if ((dataQuery.getStartDate() == null || "".equals(dataQuery.getStartDate())) && (dataQuery.getEndDate() == null || "".equals(dataQuery.getEndDate()))) {
             // 获取当前日期
             LocalDate currentDate = LocalDate.now();
@@ -335,13 +336,13 @@ public class DataController {
                 listData.setSumPremium("0");
             } else {
                 listData.setJqPremium(first.get().getJqPremium());
-                sumListData.setJqPremium(String.valueOf(Double.parseDouble(sumListData.getJqPremium()) + Double.parseDouble(first.get().getJqPremium())));
+                sumListData.setJqPremium(decimalFormat.format(Float.parseFloat(sumListData.getJqPremium()) + Float.parseFloat(first.get().getJqPremium())));
                 listData.setSyPremium(first.get().getSyPremium());
-                sumListData.setSyPremium(String.valueOf(Double.parseDouble(sumListData.getSyPremium()) + Double.parseDouble(first.get().getSyPremium())));
+                sumListData.setSyPremium(decimalFormat.format(Float.parseFloat(sumListData.getSyPremium()) + Float.parseFloat(first.get().getSyPremium())));
                 listData.setTaxPremium(first.get().getTaxPremium());
-                sumListData.setTaxPremium(String.valueOf(Double.parseDouble(sumListData.getTaxPremium()) + Double.parseDouble(first.get().getTaxPremium())));
+                sumListData.setTaxPremium(decimalFormat.format(Float.parseFloat(sumListData.getTaxPremium()) + Float.parseFloat(first.get().getTaxPremium())));
                 listData.setSumPremium(first.get().getSumPremium());
-                sumListData.setSumPremium(String.valueOf(Double.parseDouble(sumListData.getSumPremium()) + Double.parseDouble(first.get().getSumPremium())));
+                sumListData.setSumPremium(decimalFormat.format(Float.parseFloat(sumListData.getSumPremium()) + Float.parseFloat(first.get().getSumPremium())));
             }
 
             Optional<OrderStatusData> first1 =
@@ -387,6 +388,11 @@ public class DataController {
             listDatas.add(listData);
         });
         sumListData.setInsuranceCompany("合计");
+
+        sumListData.setJqPremium(decimalFormat.format(Float.parseFloat(sumListData.getJqPremium())));
+        sumListData.setSyPremium(decimalFormat.format(Float.parseFloat(sumListData.getSyPremium())));
+        sumListData.setTaxPremium(decimalFormat.format(Float.parseFloat(sumListData.getTaxPremium())));
+        sumListData.setSumPremium(decimalFormat.format(Float.parseFloat(sumListData.getSumPremium())));
         listDatas.add(sumListData);
         return HttpResult.ok(listDatas);
     }