字段类型调整

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/wechatwork/WechatWorkOverviewController.java

@@ -91,6 +91,7 @@ public class WechatWorkOverviewController extends NewBaseController {
         for (String date : dateList) {
             WechatWorkOverviewTrendVO vo = map.get(date);
             if (vo == null) {
+                vo = new WechatWorkOverviewTrendVO();
                 vo.setBizDate(date);
             }
             voList.add(vo);

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

@@ -14,30 +14,30 @@ public class WechatWorkOverviewStoreGroupVO extends StoreGroupCommonVO implement
     /**
      * 新增微信好友总数
      */
-    private Long newEntwchFdNumTotal;
+    private Integer newEntwchFdNumTotal;
 
     /**
      * 新增已注册微信好友数
      */
-    private Long newEntwchFdNumMbr;
+    private Integer newEntwchFdNumMbr;
 
     /**
      * 新增未注册微信好友数
      */
-    private Long newEntwchFdNumNonmbr;
+    private Integer newEntwchFdNumNonmbr;
 
     /**
      * 微信好友总数
      */
-    private Long entwchFdNumTotal;
+    private Integer entwchFdNumTotal;
 
     /**
      * 已注册微信好友数
      */
-    private Long entwchFdNumMbr;
+    private Integer entwchFdNumMbr;
 
     /**
      * 未注册微信好友数
      */
-    private Long entwchFdNumNonmbr;
+    private Integer entwchFdNumNonmbr;
 }

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

@@ -14,17 +14,17 @@ public class WechatWorkOverviewTrendVO implements Serializable {
     /**
      * 微信好友总数
      */
-    private Long newEntwchFdNumTotal;
+    private Integer newEntwchFdNumTotal;
 
     /**
      * 已注册微信好友数
      */
-    private Long newEntwchFdNumMbr;
+    private Integer newEntwchFdNumMbr;
 
     /**
      * 未注册微信好友数
      */
-    private Long newEntwchFdNumNonmbr;
+    private Integer newEntwchFdNumNonmbr;
 
     private String bizDate;
 }

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

@@ -16,17 +16,17 @@ public class WechatWorkOverviewVO implements Serializable {
     /**
      * 微信好友总数
      */
-    private Long entwchFdNumTotal;
+    private Integer entwchFdNumTotal;
 
     /**
      * 已注册微信好友数
      */
-    private Long entwchFdNumMbr;
+    private Integer entwchFdNumMbr;
 
     /**
      * 未注册微信好友数
      */
-    private Long entwchFdNumNonmbr;
+    private Integer entwchFdNumNonmbr;
 
     /**
      * 已注册微信好友数占比
@@ -52,7 +52,7 @@ public class WechatWorkOverviewVO implements Serializable {
      * @param degree
      * @return
      */
-    public static Double rate(Long divisor,Long dividend,int degree){
+    public static Double rate(Integer divisor,Integer dividend,int degree){
         if( Objects.isNull( divisor ) || Objects.isNull( dividend ) || dividend == 0 ){
             return 0.00;
         }