Эх сурвалжийг харах

百分比保留两位小数

helixiao 1 жил өмнө
parent
commit
7abf5e3840

+ 2 - 2
src/main/java/com/ydtech/modules/admin/model/vo/PartnerProportionVo.java

@@ -6,13 +6,13 @@ import lombok.Data;
 @Data
 public class PartnerProportionVo {
     @ApiModelProperty(value = "新增占比")
-    private String newProportion;
+    private Double newProportion;
 
     @ApiModelProperty(value = "新增数量")
     private int newNum;
 
     @ApiModelProperty(value = "历史占比")
-    private String oldProportion;
+    private Double oldProportion;
 
     @ApiModelProperty(value = "历史数量")
     private int oldNum;

+ 6 - 4
src/main/java/com/ydtech/modules/admin/service/impl/SysPartnerServiceImpl.java

@@ -1807,14 +1807,16 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
         }
         if (CollectionUtil.isNotEmpty(collectNum)) {
             double v = (float) collectNum.size() / (float) collectSum.size() * 100;
-            String format = String.format("%.2f%%", v);
-            partnerProportionVo.setNewProportion(format);
+            String format = String.format("%.2f", v);
+            Double aDouble = Double.valueOf(format);
+            partnerProportionVo.setNewProportion(aDouble);
         }
         int oldNum = partnerProportionVo.getOldNum();
         if (oldNum != 0) {
             double v = (float) oldNum / (float) collectSum.size() * 100;
-            String format = String.format("%.2f%%", v);
-            partnerProportionVo.setOldProportion(format);
+            String format = String.format("%.2f", v);
+            Double aDouble = Double.valueOf(format);
+            partnerProportionVo.setOldProportion(aDouble);
         }
 
         return partnerProportionVo;