Merge branch 'feature-2024-07-cloud' into 'developer'

企微概率添加占比

See merge request !2064

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/wechatwork/WechatWorkOverviewVO.java

@@ -3,6 +3,8 @@ package com.gic.haoban.manage.web.vo.wechatwork;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * @Author guojx
@@ -25,4 +27,38 @@ public class WechatWorkOverviewVO implements Serializable {
      * 未注册微信好友数
      */
     private Long entwchFdNumNonmbr;
+
+    /**
+     * 已注册微信好友数占比
+     */
+    private Double entwchFdNumMbrRate;
+    /**
+     * 未注册微信好友数占比
+     */
+    private Double entwchFdNumNonmbrRate;
+
+    public Double getEntwchFdNumMbrRate() {
+        return rate(getEntwchFdNumMbr(), getEntwchFdNumTotal(), 2);
+    }
+
+    public Double getEntwchFdNumNonmbrRate() {
+        return rate(getEntwchFdNumNonmbr(), getEntwchFdNumTotal(), 2);
+    }
+
+    /**
+     * 百分比计算，保留两位小数
+     * @param divisor
+     * @param dividend
+     * @param degree
+     * @return
+     */
+    public static Double rate(Long divisor,Long dividend,int degree){
+        if( Objects.isNull( divisor ) || Objects.isNull( dividend ) || dividend == 0 ){
+            return 0.00;
+        }
+        //数字会丢失精度，先转字符串，再转bigDecimal
+        BigDecimal divisor1 = new BigDecimal(divisor+"");
+        BigDecimal dividend1 = new BigDecimal(dividend+"");
+        return divisor1.divide(dividend1,degree,BigDecimal.ROUND_HALF_UP ).doubleValue();
+    }
 }