行政值法保留小數

mhfire-service/src/main/java/com/bizmatics/mhfire/service/impl/SiAeAllServiceImpl.java

@@ -8,6 +8,7 @@ import com.bizmatics.mhfire.service.vo.SiAeAllVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.nio.file.OpenOption;
 import java.util.*;
 
@@ -43,11 +44,20 @@ public class SiAeAllServiceImpl implements SiAeAllService {
                 SiAeAllVO siAeAllVO = new SiAeAllVO();
                 siAeAllVO.setCheckType(type);
                 Double radio = aeAll.get(type);
-                siAeAllVO.setNumber(radio.intValue());
-                siAeAllVO.setSameRatio(
-                        Optional.ofNullable(upAllCollect).map(up -> up.get(type)).orElse(0.0)/radio);
-                siAeAllVO.setSameRatio(
-                        Optional.ofNullable(linkAllCollect).map(link -> link.get(type)).orElse(0.0)/radio);
+                siAeAllVO.setNumber(radio);
+                if (0 != radio){
+                    Double upRadio = Optional.ofNullable(upAllCollect).map(up -> up.get(type)).orElse(0.0)/radio;
+                    BigDecimal b = new BigDecimal(upRadio);
+                    upRadio = b.setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue();
+                    siAeAllVO.setSameRatio(upRadio);
+                    Double linkRadio = Optional.ofNullable(linkAllCollect).map(link -> link.get(type)).orElse(0.0)/radio;
+                    b = new BigDecimal(linkRadio);
+                    linkRadio = b.setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue();
+                    siAeAllVO.setLinkRelativeRatio(linkRadio);
+                }else {
+                    siAeAllVO.setSameRatio(0.00);
+                    siAeAllVO.setLinkRelativeRatio(0.00);
+                }
                 allVoS.add(siAeAllVO);
             }
         });

mhfire-service/src/main/java/com/bizmatics/mhfire/service/impl/UnitBeOnDutyServiceImpl.java

@@ -23,7 +23,7 @@ public class UnitBeOnDutyServiceImpl implements UnitBeOnDutyService {
     @Override
     public List<UnitBeOnDutyPO> getOneByToday() {
         List<UnitBeOnDutyPO> list = new ArrayList<>();
-        Date date = new Date();
+        Date date = new Date(2020-1900,11,17,0,0,0);
         Date dayStartTime = DateUtils.getDayStartTime(date);
         Date dayEndTime = DateUtils.getDayEndTime(date);
         List<Map<String, String>> unitBeOnDutyLists = unitBeOnDutyMapper.list(dayStartTime, dayEndTime);

mhfire-service/src/main/java/com/bizmatics/mhfire/service/vo/SiAeAllVO.java

@@ -2,6 +2,8 @@ package com.bizmatics.mhfire.service.vo;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @author yq
  * @date 2021/5/25 15:02
@@ -18,7 +20,7 @@ public class SiAeAllVO {
     /**
      * 数量
      */
-    private Integer number;
+    private Double number;
 
     /**
      * 环比