浏览代码

fix on 2020.12.25

jiequan.bi 4 年之前
父节点
当前提交
3584cd4c54

+ 22 - 17
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/controller/KsNewPlanReportCtrl.java

@@ -16,7 +16,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- *  Created by JQ.bi on 2020.11.2
+ * Created by JQ.bi on 2020.11.2
  */
 @Slf4j
 @RestController
@@ -34,24 +34,29 @@ public class KsNewPlanReportCtrl {
         Result<Map<String, Object>> resultBody = new Result<>();
         Map<String, Object> result = new HashMap<>();
         JSONArray accountIds = requestBody.getJSONArray("accountIds");
-        String userId= requestBody.getString("userId");
-        if(!userId.isEmpty()){
-            accountIds= newPlanReportService.getAccountIdsByUserId(userId);
-        }
-        if(accountIds.isEmpty()){
-            return resultBody;
+        String userId = requestBody.getString("userId");
+        //TODO 没有维护快手事业部负责人角色,增加判断
+        if (userId.equals("6b4c821adc414dc8b7718ab63ccbfcaf")) {
+            accountIds = newPlanReportService.getAccountIdsByMedia();
+        } else {
+            if (!userId.isEmpty()) {
+                accountIds = newPlanReportService.getAccountIdsByUserId(userId);
+            }
+            if (accountIds.isEmpty()) {
+                return resultBody;
+            }
         }
         String startDate = requestBody.getString("startDate");
         String endDate = requestBody.getString("endDate");
-        String target= requestBody.getString("target");
-        String order= requestBody.getString("order");
+        String target = requestBody.getString("target");
+        String order = requestBody.getString("order");
         try {
             JSONObject sumData = newPlanReportService.getSumNewPlanBy(accountIds, startDate, endDate);
             List<JSONObject> chartData = newPlanReportService.getKsNewPlanGroupByStatDate(accountIds, startDate, endDate);
-            List<JSONObject> listData = newPlanReportService.getKsNewPlanGroupByAccount(accountIds, startDate, endDate,target,order);
-            result.put("sumData",sumData);
-            result.put("chartData",chartData);
-            result.put("listData",listData);
+            List<JSONObject> listData = newPlanReportService.getKsNewPlanGroupByAccount(accountIds, startDate, endDate, target, order);
+            result.put("sumData", sumData);
+            result.put("chartData", chartData);
+            result.put("listData", listData);
             resultBody.setResult(result);
             resultBody.setSuccess(true);
         } catch (Exception e) {
@@ -69,15 +74,15 @@ public class KsNewPlanReportCtrl {
         Result<List<JSONObject>> result = new Result<>();
 
         JSONArray accountIds = requestBody.getJSONArray("accountIds");
-        if(accountIds.isEmpty()){
+        if (accountIds.isEmpty()) {
             return result;
         }
         String startDate = requestBody.getString("startDate");
         String endDate = requestBody.getString("endDate");
-        String target= requestBody.getString("target");
-        String order= requestBody.getString("order");
+        String target = requestBody.getString("target");
+        String order = requestBody.getString("order");
         try {
-            List<JSONObject> listData = newPlanReportService.getKsNewPlanGroupByAccount(accountIds, startDate, endDate,target,order);
+            List<JSONObject> listData = newPlanReportService.getKsNewPlanGroupByAccount(accountIds, startDate, endDate, target, order);
             result.setResult(listData);
             result.setSuccess(true);
         } catch (Exception e) {

+ 1 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/controller/KsVideoReportCtrl.java

@@ -116,7 +116,7 @@ public class KsVideoReportCtrl {
             columns.add("cost");
         }
         String filed = JsonResourceUtil.joinFiled(AccountReportConstants.dicMapKs, columns);
-        List<String> titles = new ArrayList<>();
+        List<String> titles = new ArrayList<>(JsonResourceUtil.joinTitle(AccountReportConstants.dicMapKs, columns));
         //此处增加两个元素是为了保证数据顺序
         if("exportDetail".equals(exportType)){
             titles.add(0,"客户");

+ 123 - 121
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/entity/KuaishouAudienceReportDaily.java

@@ -12,6 +12,8 @@ import lombok.experimental.Accessors;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.math.BigDecimal;
+
 /**
  * 人群分析报表
  *
@@ -30,13 +32,13 @@ public class KuaishouAudienceReportDaily {
      */
     @TableId(type = IdType.INPUT)
     @ApiModelProperty(value = "id")
-    private java.lang.Long id;
+    private Long id;
     /**
      * 账户ID
      */
     @Excel(name = "账户ID", width = 15)
     @ApiModelProperty(value = "账户ID")
-    private java.lang.Long accountId;
+    private Long accountId;
 
     private Long unitId;
 
@@ -46,703 +48,703 @@ public class KuaishouAudienceReportDaily {
      */
     @Excel(name = "placementType", width = 15)
     @ApiModelProperty(value = "placementType")
-    private java.lang.String placementType;
+    private String placementType;
     /**
      * 日期
      */
     @Excel(name = "日期", width = 15)
     @ApiModelProperty(value = "日期")
-    private java.lang.String statDate;
+    private String statDate;
     /**
      * 素材曝光数
      */
     @Excel(name = "素材曝光数", width = 15)
     @ApiModelProperty(value = "素材曝光数")
-    private java.lang.Long aclick;
+    private Long aclick;
     /**
      * 行为数
      */
     @Excel(name = "行为数", width = 15)
     @ApiModelProperty(value = "行为数")
-    private java.lang.Long bclick;
+    private Long bclick;
     /**
      * 封面点成本
      */
     @Excel(name = "封面点成本", width = 15)
     @ApiModelProperty(value = "封面点成本")
-    private java.lang.Double photoClickCost;
+    private Double photoClickCost;
     /**
      * 新增关注数
      */
     @Excel(name = "新增关注数", width = 15)
     @ApiModelProperty(value = "新增关注数")
-    private java.lang.Long follow;
+    private Long follow;
     /**
      * 取消关注数
      */
     @Excel(name = "取消关注数", width = 15)
     @ApiModelProperty(value = "取消关注数")
-    private java.lang.Long cancelFollow;
+    private Long cancelFollow;
     /**
      * 举报数
      */
     @Excel(name = "举报数", width = 15)
     @ApiModelProperty(value = "举报数")
-    private java.lang.Long report;
+    private Long report;
     /**
      * 拉黑数
      */
     @Excel(name = "拉黑数", width = 15)
     @ApiModelProperty(value = "拉黑数")
-    private java.lang.Long block;
+    private Long block;
     /**
      * 减少此类作品数
      */
     @Excel(name = "减少此类作品数", width = 15)
     @ApiModelProperty(value = "减少此类作品数")
-    private java.lang.Long negative;
+    private Long negative;
     /**
      * 应用下载数据-安卓下载开始数
      */
     @Excel(name = "应用下载数据-安卓下载开始数", width = 15)
     @ApiModelProperty(value = "应用下载数据-安卓下载开始数")
-    private java.lang.Long downloadStarted;
+    private Long downloadStarted;
     /**
      * 应用下载数据-安卓下载完成数
      */
     @Excel(name = "应用下载数据-安卓下载完成数", width = 15)
     @ApiModelProperty(value = "应用下载数据-安卓下载完成数")
-    private java.lang.Long downloadCompleted;
+    private Long downloadCompleted;
     /**
      * 应用下载数据-激活数
      */
     @Excel(name = "应用下载数据-激活数", width = 15)
     @ApiModelProperty(value = "应用下载数据-激活数")
-    private java.lang.Long activation;
+    private Long activation;
     /**
      * 提交按钮点击数
      */
     @Excel(name = "提交按钮点击数", width = 15)
     @ApiModelProperty(value = "提交按钮点击数")
-    private java.lang.Long submit;
+    private Long submit;
     /**
      * 封面点击数
      */
     @Excel(name = "封面点击数", width = 15)
     @ApiModelProperty(value = "封面点击数")
-    private java.lang.Long photoClick;
+    private Long photoClick;
     /**
      * 封面点击率
      */
     @Excel(name = "封面点击率", width = 15)
     @ApiModelProperty(value = "封面点击率")
-    private java.lang.Double photoClickRatio;
+    private Double photoClickRatio;
     /**
      * 花费
      */
     @Excel(name = "花费", width = 15)
     @ApiModelProperty(value = "花费")
-    private java.lang.Double charge;
+    private Double charge;
     /**
      * 行为率
      */
     @Excel(name = "行为率", width = 15)
     @ApiModelProperty(value = "行为率")
-    private java.lang.Double actionRatio;
+    private Double actionRatio;
     /**
      * 平均千次曝光花费(元)
      */
     @Excel(name = "平均千次曝光花费(元)", width = 15)
     @ApiModelProperty(value = "平均千次曝光花费(元)")
-    private java.math.BigDecimal impression_1kCost;
+    private BigDecimal impression_1kCost;
     /**
      * 平均行为单价(元)
      */
     @Excel(name = "平均行为单价(元)", width = 15)
     @ApiModelProperty(value = "平均行为单价(元)")
-    private java.math.BigDecimal actionCost;
+    private BigDecimal actionCost;
     /**
      * 应用下载数据-首日付费次数
      */
     @Excel(name = "应用下载数据-首日付费次数", width = 15)
     @ApiModelProperty(value = "应用下载数据-首日付费次数")
-    private java.lang.Long eventPayFirstDay;
+    private Long eventPayFirstDay;
     /**
      * 应用下载数据-首日付费金额
      */
     @Excel(name = "应用下载数据-首日付费金额", width = 15)
     @ApiModelProperty(value = "应用下载数据-首日付费金额")
-    private java.math.BigDecimal eventPayPurchaseAmountFirstDay;
+    private BigDecimal eventPayPurchaseAmountFirstDay;
     /**
      * 应用下载数据-首日ROI
      */
     @Excel(name = "应用下载数据-首日ROI", width = 15)
     @ApiModelProperty(value = "应用下载数据-首日ROI")
-    private java.lang.Double eventPayFirstDayRoi;
+    private Double eventPayFirstDayRoi;
     /**
      * 应用下载数据-付费次数
      */
     @Excel(name = "应用下载数据-付费次数", width = 15)
     @ApiModelProperty(value = "应用下载数据-付费次数")
-    private java.lang.Long eventPay;
+    private Long eventPay;
     /**
      * 应用下载数据-付费金额
      */
     @Excel(name = "应用下载数据-付费金额", width = 15)
     @ApiModelProperty(value = "应用下载数据-付费金额")
-    private java.math.BigDecimal eventPayPurchaseAmount;
+    private BigDecimal eventPayPurchaseAmount;
     /**
      * 应用下载数据-ROI
      */
     @Excel(name = "应用下载数据-ROI", width = 15)
     @ApiModelProperty(value = "应用下载数据-ROI")
-    private java.lang.Double eventPayRoi;
+    private Double eventPayRoi;
     /**
      * 应用下载数据-注册数
      */
     @Excel(name = "应用下载数据-注册数", width = 15)
     @ApiModelProperty(value = "应用下载数据-注册数")
-    private java.lang.Long eventRegister;
+    private Long eventRegister;
     /**
      * 应用下载数据-注册成本
      */
     @Excel(name = "应用下载数据-注册成本", width = 15)
     @ApiModelProperty(value = "应用下载数据-注册成本")
-    private java.math.BigDecimal eventRegisterCost;
+    private BigDecimal eventRegisterCost;
     /**
      * 应用下载数据-注册率
      */
     @Excel(name = "应用下载数据-注册率", width = 15)
     @ApiModelProperty(value = "应用下载数据-注册率")
-    private java.lang.Double eventRegisterRatio;
+    private Double eventRegisterRatio;
     /**
      * 应用下载数据-完件数
      */
     @Excel(name = "应用下载数据-完件数", width = 15)
     @ApiModelProperty(value = "应用下载数据-完件数")
-    private java.lang.Long eventJinJianApp;
+    private Long eventJinJianApp;
     /**
      * 应用下载数据-完件成本
      */
     @Excel(name = "应用下载数据-完件成本", width = 15)
     @ApiModelProperty(value = "应用下载数据-完件成本")
-    private java.math.BigDecimal eventJinJianAppCost;
+    private BigDecimal eventJinJianAppCost;
     /**
      * 应用下载数据-授信数
      */
     @Excel(name = "应用下载数据-授信数", width = 15)
     @ApiModelProperty(value = "应用下载数据-授信数")
-    private java.lang.Long eventCreditGrantApp;
+    private Long eventCreditGrantApp;
     /**
      * 应用下载数据-授信成本
      */
     @Excel(name = "应用下载数据-授信成本", width = 15)
     @ApiModelProperty(value = "应用下载数据-授信成本")
-    private java.math.BigDecimal eventCreditGrantAppCost;
+    private BigDecimal eventCreditGrantAppCost;
     /**
      * 应用下载数据-付款成功数
      */
     @Excel(name = "应用下载数据-付款成功数", width = 15)
     @ApiModelProperty(value = "应用下载数据-付款成功数")
-    private java.lang.Long eventOrderPaid;
+    private Long eventOrderPaid;
     /**
      * 应用下载数据-付款成功金额
      */
     @Excel(name = "应用下载数据-付款成功金额", width = 15)
     @ApiModelProperty(value = "应用下载数据-付款成功金额")
-    private java.math.BigDecimal eventOrderPaidPurchaseAmount;
+    private BigDecimal eventOrderPaidPurchaseAmount;
     /**
      * 落地页数据-落地页完件数
      */
     @Excel(name = "落地页数据-落地页完件数", width = 15)
     @ApiModelProperty(value = "落地页数据-落地页完件数")
-    private java.lang.Long eventJinJianLandingPage;
+    private Long eventJinJianLandingPage;
     /**
      * 落地页数据-落地页完件成本
      */
     @Excel(name = "落地页数据-落地页完件成本", width = 15)
     @ApiModelProperty(value = "落地页数据-落地页完件成本")
-    private java.math.BigDecimal eventJinJianLandingPageCost;
+    private BigDecimal eventJinJianLandingPageCost;
     /**
      * 落地页数据-落地页授信数
      */
     @Excel(name = "落地页数据-落地页授信数", width = 15)
     @ApiModelProperty(value = "落地页数据-落地页授信数")
-    private java.lang.Long eventCreditGrantLandingPage;
+    private Long eventCreditGrantLandingPage;
     /**
      * 落地页数据-落地页授信成本
      */
     @Excel(name = "落地页数据-落地页授信成本", width = 15)
     @ApiModelProperty(value = "落地页数据-落地页授信成本")
-    private java.math.BigDecimal eventCreditGrantLandingPageCost;
+    private BigDecimal eventCreditGrantLandingPageCost;
     /**
      * 落地页数据-落地页授信率
      */
     @Excel(name = "落地页数据-落地页授信率", width = 15)
     @ApiModelProperty(value = "落地页数据-落地页授信率")
-    private java.lang.Double eventCreditGrantLandingRatio;
+    private Double eventCreditGrantLandingRatio;
     /**
      * 应用下载数据-次留成本(仅支持分日查询)
      */
     @Excel(name = "应用下载数据-次留成本(仅支持分日查询)", width = 15)
     @ApiModelProperty(value = "应用下载数据-次留成本(仅支持分日查询)")
-    private java.math.BigDecimal eventNextDayStayCost;
+    private BigDecimal eventNextDayStayCost;
     /**
      * 应用下载数据-次留率(仅支持分日查询)
      */
     @Excel(name = "应用下载数据-次留率(仅支持分日查询)", width = 15)
     @ApiModelProperty(value = "应用下载数据-次留率(仅支持分日查询)")
-    private java.math.BigDecimal eventNextDayStayRatio;
+    private BigDecimal eventNextDayStayRatio;
     /**
      * 落地页数据-表单提交点击率
      */
     @Excel(name = "落地页数据-表单提交点击率", width = 15)
     @ApiModelProperty(value = "落地页数据-表单提交点击率")
-    private java.lang.Double formActionRatio;
+    private Double formActionRatio;
     /**
      * 应用下载数据-单次付款成本
      */
     @Excel(name = "应用下载数据-单次付款成本", width = 15)
     @ApiModelProperty(value = "应用下载数据-单次付款成本")
-    private java.math.BigDecimal eventOrderPaidCost;
+    private BigDecimal eventOrderPaidCost;
     /**
      * 应用下载数据-次留数(仅支持分日查询)
      */
     @Excel(name = "应用下载数据-次留数(仅支持分日查询)", width = 15)
     @ApiModelProperty(value = "应用下载数据-次留数(仅支持分日查询)")
-    private java.lang.Long eventNextDayStay;
+    private Long eventNextDayStay;
     /**
      * 落地页数据-表单提交单价
      */
     @Excel(name = "落地页数据-表单提交单价", width = 15)
     @ApiModelProperty(value = "落地页数据-表单提交单价")
-    private java.math.BigDecimal formCost;
+    private BigDecimal formCost;
     /**
      * 落地页数据-表单提交数
      */
     @Excel(name = "落地页数据-表单提交数", width = 15)
     @ApiModelProperty(value = "落地页数据-表单提交数")
-    private java.lang.Long formCount;
+    private Long formCount;
     /**
      * 3s播放率
      */
     @Excel(name = "3s播放率", width = 15)
     @ApiModelProperty(value = "3s播放率")
-    private java.lang.Double play_3sRatio;
+    private Double play_3sRatio;
     /**
      * 数据小时
      */
     @Excel(name = "数据小时", width = 15)
     @ApiModelProperty(value = "数据小时")
-    private java.lang.Long statHour;
+    private Long statHour;
     /**
      * click1kCost
      */
     @Excel(name = "click1kCost", width = 15)
     @ApiModelProperty(value = "click1kCost")
-    private java.lang.String click_1kCost;
+    private String click_1kCost;
     /**
      * 落地页数据-有效线索数
      */
     @Excel(name = "落地页数据-有效线索数", width = 15)
     @ApiModelProperty(value = "落地页数据-有效线索数")
-    private java.lang.Long eventValidClues;
+    private Long eventValidClues;
     /**
      * 落地页数据-有效线索成本
      */
     @Excel(name = "落地页数据-有效线索成本", width = 15)
     @ApiModelProperty(value = "落地页数据-有效线索成本")
-    private java.math.BigDecimal eventValidCluesCost;
+    private BigDecimal eventValidCluesCost;
     /**
      * 商品成交数
      */
     @Excel(name = "商品成交数", width = 15)
     @ApiModelProperty(value = "商品成交数")
-    private java.lang.Long adProductCnt;
+    private Long adProductCnt;
     /**
      * 商品访问数
      */
     @Excel(name = "商品访问数", width = 15)
     @ApiModelProperty(value = "商品访问数")
-    private java.lang.Long eventGoodsView;
+    private Long eventGoodsView;
     /**
      * 涨粉量
      */
     @Excel(name = "涨粉量", width = 15)
     @ApiModelProperty(value = "涨粉量")
-    private java.lang.Long merchantRecoFans;
+    private Long merchantRecoFans;
     /**
      * 涨粉量
      */
     @Excel(name = "涨粉量", width = 15)
     @ApiModelProperty(value = "涨粉量")
-    private java.lang.Long eventOrderAmountRoi;
+    private Long eventOrderAmountRoi;
     /**
      * 新增付费人数
      */
     @Excel(name = "新增付费人数", width = 15)
     @ApiModelProperty(value = "新增付费人数")
-    private java.lang.Long eventNewUserPay;
+    private Long eventNewUserPay;
     /**
      * 新增付费人数成本:当日消耗 / 当日新增
      */
     @Excel(name = "新增付费人数成本:当日消耗 / 当日新增", width = 15)
     @ApiModelProperty(value = "新增付费人数成本:当日消耗 / 当日新增")
-    private java.math.BigDecimal eventNewUserPayCost;
+    private BigDecimal eventNewUserPayCost;
     /**
      * 新增付费人数率:当日新增付费人数 / 当日行为数
      */
     @Excel(name = "新增付费人数率:当日新增付费人数 / 当日行为数", width = 15)
     @ApiModelProperty(value = "新增付费人数率:当日新增付费人数 / 当日行为数")
-    private java.math.BigDecimal eventNewUserPayRatio;
+    private BigDecimal eventNewUserPayRatio;
     /**
      * 按钮点击数
      */
     @Excel(name = "按钮点击数", width = 15)
     @ApiModelProperty(value = "按钮点击数")
-    private java.lang.Long eventButtonClick;
+    private Long eventButtonClick;
     /**
      * 按钮点击成本
      */
     @Excel(name = "按钮点击成本", width = 15)
     @ApiModelProperty(value = "按钮点击成本")
-    private java.math.BigDecimal eventButtonClickCost;
+    private BigDecimal eventButtonClickCost;
     /**
      * 按钮点击成率
      */
     @Excel(name = "按钮点击成率", width = 15)
     @ApiModelProperty(value = "按钮点击成率")
-    private java.math.BigDecimal eventButtonClickRatio;
+    private BigDecimal eventButtonClickRatio;
     /**
      * 5s播放率
      */
     @Excel(name = "5s播放率", width = 15)
     @ApiModelProperty(value = "5s播放率")
-    private java.math.BigDecimal play_5sRatio;
+    private BigDecimal play_5sRatio;
     /**
      * 完播率
      */
     @Excel(name = "完播率", width = 15)
     @ApiModelProperty(value = "完播率")
-    private java.math.BigDecimal playEndRatio;
+    private BigDecimal playEndRatio;
     /**
      * 订单支付率
      */
     @Excel(name = "订单支付率", width = 15)
     @ApiModelProperty(value = "订单支付率")
-    private java.math.BigDecimal eventOrderPaidRoi;
+    private BigDecimal eventOrderPaidRoi;
     /**
      * 新增完件人数
      */
     @Excel(name = "新增完件人数", width = 15)
     @ApiModelProperty(value = "新增完件人数")
-    private java.lang.Long eventNewUserJinjianApp;
+    private Long eventNewUserJinjianApp;
     /**
      * 新增完件人数成本
      */
     @Excel(name = "新增完件人数成本", width = 15)
     @ApiModelProperty(value = "新增完件人数成本")
-    private java.math.BigDecimal eventNewUserJinjianAppCost;
+    private BigDecimal eventNewUserJinjianAppCost;
     /**
      * 新增完件人数率
      */
     @Excel(name = "新增完件人数率", width = 15)
     @ApiModelProperty(value = "新增完件人数率")
-    private java.math.BigDecimal eventNewUserJinjianAppRoi;
+    private BigDecimal eventNewUserJinjianAppRoi;
     /**
      * 新增授信人数
      */
     @Excel(name = "新增授信人数", width = 15)
     @ApiModelProperty(value = "新增授信人数")
-    private java.lang.Long eventNewUserCreditGrantApp;
+    private Long eventNewUserCreditGrantApp;
     /**
      * 新增授信人数成本
      */
     @Excel(name = "新增授信人数成本", width = 15)
     @ApiModelProperty(value = "新增授信人数成本")
-    private java.math.BigDecimal eventNewUserCreditGrantAppCost;
+    private BigDecimal eventNewUserCreditGrantAppCost;
     /**
      * 新增授信人数率
      */
     @Excel(name = "新增授信人数率", width = 15)
     @ApiModelProperty(value = "新增授信人数率")
-    private java.math.BigDecimal eventNewUserCreditGrantAppRoi;
+    private BigDecimal eventNewUserCreditGrantAppRoi;
     /**
      * 落地页新增完件人数
      */
     @Excel(name = "落地页新增完件人数", width = 15)
     @ApiModelProperty(value = "落地页新增完件人数")
-    private java.lang.Long eventNewUserJinjianPage;
+    private Long eventNewUserJinjianPage;
     /**
      * 落地页新增完件人数成本
      */
     @Excel(name = "落地页新增完件人数成本", width = 15)
     @ApiModelProperty(value = "落地页新增完件人数成本")
-    private java.math.BigDecimal eventNewUserJinjianPageCost;
+    private BigDecimal eventNewUserJinjianPageCost;
     /**
      * 落地页新增完件人数率
      */
     @Excel(name = "落地页新增完件人数率", width = 15)
     @ApiModelProperty(value = "落地页新增完件人数率")
-    private java.math.BigDecimal eventNewUserJinjianPageRoi;
+    private BigDecimal eventNewUserJinjianPageRoi;
     /**
      * 落地页新增授信人数
      */
     @Excel(name = "落地页新增授信人数", width = 15)
     @ApiModelProperty(value = "落地页新增授信人数")
-    private java.lang.Long eventNewUserCreditGrantPage;
+    private Long eventNewUserCreditGrantPage;
     /**
      * 落地页新增授信人数成本
      */
     @Excel(name = "落地页新增授信人数成本", width = 15)
     @ApiModelProperty(value = "落地页新增授信人数成本")
-    private java.math.BigDecimal eventNewUserCreditGrantPageCost;
+    private BigDecimal eventNewUserCreditGrantPageCost;
     /**
      * 落地页新增授信人数率
      */
     @Excel(name = "落地页新增授信人数率", width = 15)
     @ApiModelProperty(value = "落地页新增授信人数率")
-    private java.math.BigDecimal eventNewUserCreditGrantPageRoi;
+    private BigDecimal eventNewUserCreditGrantPageRoi;
     /**
      * eventAppointForm
      */
     @Excel(name = "eventAppointForm", width = 15)
     @ApiModelProperty(value = "eventAppointForm")
-    private java.lang.Long eventAppointForm;
+    private Long eventAppointForm;
     /**
      * eventAppointFormCost
      */
     @Excel(name = "eventAppointFormCost", width = 15)
     @ApiModelProperty(value = "eventAppointFormCost")
-    private java.math.BigDecimal eventAppointFormCost;
+    private BigDecimal eventAppointFormCost;
     /**
      * eventAppointFormRatio
      */
     @Excel(name = "eventAppointFormRatio", width = 15)
     @ApiModelProperty(value = "eventAppointFormRatio")
-    private java.math.BigDecimal eventAppointFormRatio;
+    private BigDecimal eventAppointFormRatio;
     /**
      * eventAppointJumpClick
      */
     @Excel(name = "eventAppointJumpClick", width = 15)
     @ApiModelProperty(value = "eventAppointJumpClick")
-    private java.lang.Long eventAppointJumpClick;
+    private Long eventAppointJumpClick;
     /**
      * eventAppointJumpClickCost
      */
     @Excel(name = "eventAppointJumpClickCost", width = 15)
     @ApiModelProperty(value = "eventAppointJumpClickCost")
-    private java.math.BigDecimal eventAppointJumpClickCost;
+    private BigDecimal eventAppointJumpClickCost;
     /**
      * eventAppointJumpClickRatio
      */
     @Excel(name = "eventAppointJumpClickRatio", width = 15)
     @ApiModelProperty(value = "eventAppointJumpClickRatio")
-    private java.math.BigDecimal eventAppointJumpClickRatio;
+    private BigDecimal eventAppointJumpClickRatio;
     /**
      * unionEventPayPurchaseAmount7d
      */
     @Excel(name = "unionEventPayPurchaseAmount_7d", width = 15)
     @ApiModelProperty(value = "unionEventPayPurchaseAmount_7d")
-    private java.lang.String unionEventPayPurchaseAmount_7d;
+    private String unionEventPayPurchaseAmount_7d;
     /**
      * 省份
      */
     @Excel(name = "省份", width = 15)
     @ApiModelProperty(value = "省份")
-    private java.lang.String province;
+    private String province;
     /**
      * eventAppInvoked
      */
     @Excel(name = "eventAppInvoked", width = 15)
     @ApiModelProperty(value = "eventAppInvoked")
-    private java.lang.String eventAppInvoked;
+    private String eventAppInvoked;
     /**
      * unionEventPayPurchaseAmount7dRoi
      */
     @Excel(name = "unionEventPayPurchaseAmount_7dRoi", width = 15)
     @ApiModelProperty(value = "unionEventPayPurchaseAmount_7dRoi")
-    private java.lang.String unionEventPayPurchaseAmount_7dRoi;
+    private String unionEventPayPurchaseAmount_7dRoi;
     /**
      * eventAddShoppingCartCost
      */
     @Excel(name = "eventAddShoppingCartCost", width = 15)
     @ApiModelProperty(value = "eventAddShoppingCartCost")
-    private java.lang.String eventAddShoppingCartCost;
+    private String eventAddShoppingCartCost;
     /**
      * 性别
      */
     @Excel(name = "性别", width = 15)
     @ApiModelProperty(value = "性别")
-    private java.lang.String gender;
+    private String gender;
     /**
      * 城市
      */
     @Excel(name = "城市", width = 15)
     @ApiModelProperty(value = "城市")
-    private java.lang.String city;
+    private String city;
     /**
      * eventAdWatchTimesRatio
      */
     @Excel(name = "eventAdWatchTimesRatio", width = 15)
     @ApiModelProperty(value = "eventAdWatchTimesRatio")
-    private java.lang.String eventAdWatchTimesRatio;
+    private String eventAdWatchTimesRatio;
     /**
      * 分享数
      */
     @Excel(name = "分享数", width = 15)
     @ApiModelProperty(value = "分享数")
-    private java.lang.String shares;
+    private String shares;
     /**
      * 商业兴趣
      */
     @Excel(name = "商业兴趣", width = 15)
     @ApiModelProperty(value = "商业兴趣")
-    private java.lang.String businessInterestTags;
+    private String businessInterestTags;
     /**
      * eventWatchAppAd
      */
     @Excel(name = "eventWatchAppAd", width = 15)
     @ApiModelProperty(value = "eventWatchAppAd")
-    private java.lang.String eventWatchAppAd;
+    private String eventWatchAppAd;
     /**
      * eventMultiConversionCost
      */
     @Excel(name = "eventMultiConversionCost", width = 15)
     @ApiModelProperty(value = "eventMultiConversionCost")
-    private java.lang.String eventMultiConversionCost;
+    private String eventMultiConversionCost;
     /**
      * 涨粉成本
      */
     @Excel(name = "涨粉成本", width = 15)
     @ApiModelProperty(value = "涨粉成本")
-    private java.math.BigDecimal merchantRecoFansCost;
+    private BigDecimal merchantRecoFansCost;
     /**
      * 广告投放场景
      */
     @Excel(name = "广告投放场景", width = 15)
     @ApiModelProperty(value = "广告投放场景")
-    private java.lang.String adScene;
+    private String adScene;
     /**
      * eventAdWatchTimesCost
      */
     @Excel(name = "eventAdWatchTimesCost", width = 15)
     @ApiModelProperty(value = "eventAdWatchTimesCost")
-    private java.lang.String eventAdWatchTimesCost;
+    private String eventAdWatchTimesCost;
     /**
      * eventAddShoppingCart
      */
     @Excel(name = "eventAddShoppingCart", width = 15)
     @ApiModelProperty(value = "eventAddShoppingCart")
-    private java.lang.String eventAddShoppingCart;
+    private String eventAddShoppingCart;
     /**
      * 年龄
      */
     @Excel(name = "年龄", width = 15)
     @ApiModelProperty(value = "年龄")
-    private java.lang.String ageSegment;
+    private String ageSegment;
     /**
      * 点赞数
      */
     @Excel(name = "点赞数", width = 15)
     @ApiModelProperty(value = "点赞数")
-    private java.lang.Long photoLike;
+    private Long photoLike;
     /**
      * 微信复制数
      */
     @Excel(name = "微信复制数", width = 15)
     @ApiModelProperty(value = "微信复制数")
-    private java.lang.Long eventAddWechat;
+    private Long eventAddWechat;
     /**
      * 微信复制成本
      */
     @Excel(name = "微信复制成本", width = 15)
     @ApiModelProperty(value = "微信复制成本")
-    private java.math.BigDecimal eventAddWechatCost;
+    private BigDecimal eventAddWechatCost;
     /**
      * 微信复制率
      */
     @Excel(name = "微信复制率", width = 15)
     @ApiModelProperty(value = "微信复制率")
-    private java.math.BigDecimal eventAddWechatRatio;
+    private BigDecimal eventAddWechatRatio;
     /**
      * eventAppInvokedCost
      */
     @Excel(name = "eventAppInvokedCost", width = 15)
     @ApiModelProperty(value = "eventAppInvokedCost")
-    private java.math.BigDecimal eventAppInvokedCost;
+    private BigDecimal eventAppInvokedCost;
     /**
      * eventMultiConversion
      */
     @Excel(name = "eventMultiConversion", width = 15)
     @ApiModelProperty(value = "eventMultiConversion")
-    private java.lang.String eventMultiConversion;
+    private String eventMultiConversion;
     /**
      * eventDspGiftForm
      */
     @Excel(name = "eventDspGiftForm", width = 15)
     @ApiModelProperty(value = "eventDspGiftForm")
-    private java.lang.String eventDspGiftForm;
+    private String eventDspGiftForm;
     /**
      * eventAppInvokedRatio
      */
     @Excel(name = "eventAppInvokedRatio", width = 15)
     @ApiModelProperty(value = "eventAppInvokedRatio")
-    private java.lang.String eventAppInvokedRatio;
+    private String eventAppInvokedRatio;
     /**
      * 封面曝光数
      */
     @Excel(name = "封面曝光数", width = 15)
     @ApiModelProperty(value = "封面曝光数")
-    private java.lang.Long photoShow;
+    private Long photoShow;
     /**
      * eventMultiConversionRatio
      */
     @Excel(name = "eventMultiConversionRatio", width = 15)
     @ApiModelProperty(value = "eventMultiConversionRatio")
-    private java.lang.String eventMultiConversionRatio;
+    private String eventMultiConversionRatio;
     /**
      * 系统
      */
     @Excel(name = "系统", width = 15)
     @ApiModelProperty(value = "系统")
-    private java.lang.String client;
+    private String client;
     /**
      * 商品访问成本
      */
     @Excel(name = "商品访问成本", width = 15)
     @ApiModelProperty(value = "商品访问成本")
-    private java.math.BigDecimal eventGoodsViewCost;
+    private BigDecimal eventGoodsViewCost;
     /**
      * 应用下载数据-授信率
      */
     @Excel(name = "应用下载数据-授信率", width = 15)
     @ApiModelProperty(value = "应用下载数据-授信率")
-    private java.math.BigDecimal eventCreditGrantAppRatio;
+    private BigDecimal eventCreditGrantAppRatio;
     /**
      * eventAdWatchTimes
      */
     @Excel(name = "eventAdWatchTimes", width = 15)
     @ApiModelProperty(value = "eventAdWatchTimes")
-    private java.lang.String eventAdWatchTimes;
+    private String eventAdWatchTimes;
 
     @TableField(exist = false)
-    private java.lang.String startTime;
+    private String startTime;
 
     @TableField(exist = false)
-    private java.lang.String endTime;
+    private String endTime;
 
     @TableField(exist = false)
-    private java.lang.String orderType;
+    private String orderType;
 
     @TableField(exist = false)
-    private java.lang.String upOrDown;
+    private String upOrDown;
     /**
      * 评论数
      */
     @Excel(name = "评论数", width = 15)
     @ApiModelProperty(value = "评论数")
-    private java.lang.Long comments;
+    private Long comments;
     /**
      * 创建时间
      */

+ 1 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaiShouAccountReportServiceImpl.java

@@ -194,7 +194,7 @@ public class KuaiShouAccountReportServiceImpl implements IKuaiShouAccountReportS
             if ("accountId".equals(k) || "authName".equals(k) || v.toString().contains("%") || before.getString(k).contains("%")) {
                 jsonObject.put(k, "-");
             } else {
-                jsonObject.put(k, LinkUtils.countLink(after.getBigDecimal(k) == null ? zero : after.getBigDecimal(k), before.getBigDecimal(k) == null ? zero : before.getBigDecimal(k)));
+                jsonObject.put(k, (LinkUtils.countLink(after.getBigDecimal(k) == null ? zero : after.getBigDecimal(k), before.getBigDecimal(k) == null ? zero : before.getBigDecimal(k))).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP)+"%");
             }
         });
         return jsonObject;

+ 1 - 2
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/controller/BytedanceVideoReportCtrl.java

@@ -113,7 +113,7 @@ public class BytedanceVideoReportCtrl {
             columns.add("cost");
         }
         String filed = JsonResourceUtil.joinFiled(AccountReportConstants.dicMapByVideo, columns);
-        List<String> titles = new ArrayList<>();
+        List<String> titles = new ArrayList<>(JsonResourceUtil.joinTitle(AccountReportConstants.dicMapByVideo, columns));
         //此处增加两个元素是为了保证数据顺序
         if("exportDetail".equals(exportType)){
             titles.add(0,"客户");
@@ -135,7 +135,6 @@ public class BytedanceVideoReportCtrl {
             columns.add(3, "projectName");
             columns.add(4, "createTime");
         }
-
         JSONArray accountIds = requestBody.getJSONArray("accountIds");
         if (accountIds.isEmpty()) {
             accountIds = null;

+ 1 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/BytedanceAccountReportServiceImpl.java

@@ -205,7 +205,7 @@ public class BytedanceAccountReportServiceImpl implements IBytedanceAccountRepor
             if ("accountId".equals(k) || "authName".equals(k) || v.toString().contains("%") || before.getString(k).contains("%")) {
                 jsonObject.put(k, "-");
             } else {
-                jsonObject.put(k, LinkUtils.countLink(after.getBigDecimal(k) == null ? zero : after.getBigDecimal(k), before.getBigDecimal(k) == null ? zero : before.getBigDecimal(k)));
+                jsonObject.put(k, (LinkUtils.countLink(after.getBigDecimal(k) == null ? zero : after.getBigDecimal(k), before.getBigDecimal(k) == null ? zero : before.getBigDecimal(k))).multiply(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP)+"%");
             }
         });
         return jsonObject;