|
@@ -99,11 +99,11 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
|
|
|
|
//快手有效视频(新)
|
|
|
kuaishouNewEffiVideo(calcDate, effiCalcStart, effiFirstWeekCalcEnd, thisYear, thisMonth, thisQuarter, DateUtils.formatDate(friday), DateUtils.formatDate(thursday));
|
|
|
- //头条有效视频
|
|
|
- //toutiaoNewEffiVideo(calcDate, effiCalcStart, effiFirstWeekCalcEnd, thisYear, thisMonth, thisQuarter, DateUtils.formatDate(friday), DateUtils.formatDate(thursday));
|
|
|
+ //头条有效视频(新)
|
|
|
+ toutiaoNewEffiVideo(calcDate, effiCalcStart, effiFirstWeekCalcEnd, thisYear, thisMonth, thisQuarter, DateUtils.formatDate(friday), DateUtils.formatDate(thursday));
|
|
|
|
|
|
//总视频
|
|
|
- //kuaishouNewVideo( calcDate, thisYear, thisQuarter, thisMonth, DateUtils.formatDate(friday), DateUtils.formatDate(thursday));
|
|
|
+ kuaishouNewVideo( calcDate, thisYear, thisQuarter, thisMonth, DateUtils.formatDate(friday), DateUtils.formatDate(thursday));
|
|
|
}
|
|
|
|
|
|
//快手有效视频统计
|
|
@@ -2328,24 +2328,36 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
|
//根据userid,appType,年度,季度查询有效视频列表
|
|
|
public List<MaterialInfo> getEffiWeekVideoList(Integer appType, String startDate, String endDate, String userId){
|
|
|
List<MaterialInfo> materialInfoList = userEfficientVideoMapMapper.getEffiWeekVideoList(appType, startDate, endDate, userId);
|
|
|
- BigDecimal cost = null;
|
|
|
- if(appType == 2){
|
|
|
- for(MaterialInfo materialInfo:materialInfoList){
|
|
|
- cost = userEfficientVideoMapMapper.videoTotalCostInDates(materialInfo.getCode(),startDate, endDate);
|
|
|
- if(cost == null){
|
|
|
- cost = BigDecimal.ZERO;
|
|
|
- }
|
|
|
- materialInfo.setCost(cost);
|
|
|
- }
|
|
|
- }else if(appType == 1){
|
|
|
- for(MaterialInfo materialInfo:materialInfoList){
|
|
|
- cost = userEfficientVideoMapMapper.toutiaoVideoTotalCostInDates(materialInfo.getCode(),startDate, endDate);
|
|
|
- if(cost == null){
|
|
|
- cost = BigDecimal.ZERO;
|
|
|
- }
|
|
|
- materialInfo.setCost(cost);
|
|
|
- }
|
|
|
- }
|
|
|
+
|
|
|
+ //String effiCalcStart = null;
|
|
|
+ //String effiCalcEnd =null;
|
|
|
+ //try {
|
|
|
+ // effiCalcStart = DateUtils.formatDate(DateUtils.addDay(startDate, -14)); //计算有效视频开始的时间
|
|
|
+ // log.info("周有效视频开始时间:" + effiCalcStart);
|
|
|
+ // effiCalcEnd = DateUtils.formatDate(DateUtils.addDay(startDate, -1)); //计算有效视频结束的时间
|
|
|
+ // log.info("周有效视频结束时间:" + effiCalcEnd);
|
|
|
+ //} catch (ParseException e) {
|
|
|
+ // e.printStackTrace();
|
|
|
+ //}
|
|
|
+ //
|
|
|
+ //BigDecimal cost = null;
|
|
|
+ //if(appType == 2){
|
|
|
+ // for(MaterialInfo materialInfo:materialInfoList){
|
|
|
+ // cost = userEfficientVideoMapMapper.videoTotalCostInDates(materialInfo.getCode(),effiCalcStart, effiCalcEnd);
|
|
|
+ // if(cost == null){
|
|
|
+ // cost = BigDecimal.ZERO;
|
|
|
+ // }
|
|
|
+ // materialInfo.setCost(cost);
|
|
|
+ // }
|
|
|
+ //}else if(appType == 1){
|
|
|
+ // for(MaterialInfo materialInfo:materialInfoList){
|
|
|
+ // cost = userEfficientVideoMapMapper.toutiaoVideoTotalCostInDates(materialInfo.getCode(),effiCalcStart, effiCalcEnd);
|
|
|
+ // if(cost == null){
|
|
|
+ // cost = BigDecimal.ZERO;
|
|
|
+ // }
|
|
|
+ // materialInfo.setCost(cost);
|
|
|
+ // }
|
|
|
+ //}
|
|
|
return materialInfoList;
|
|
|
}
|
|
|
|