|
@@ -1,5 +1,6 @@
|
|
|
package org.jeecg.modules.system.service.impl;
|
|
|
|
|
|
+import cn.com.ctop.common.module.entity.MaterialInfo;
|
|
|
import cn.com.ctop.performanceappraisal.entity.Performance;
|
|
|
import cn.com.ctop.performanceappraisal.mapper.PerformanceMapper;
|
|
|
import cn.com.ctop.planeprojectcost.entity.PlaneProjectCost;
|
|
@@ -1628,17 +1629,18 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
|
return resultMap;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
//获取快手绩效时时数据接口
|
|
|
@Override
|
|
|
public List<UserDto2> kuaishouPerformanceInfoNow() {
|
|
|
//0 获取当前季度的时间
|
|
|
Map<String, Integer> dateMap = DateUtils.getYearQuarter(new Date());
|
|
|
- Integer year = dateMap.get("year");
|
|
|
- Integer quarter = dateMap.get("quarter");
|
|
|
+ //Integer year = dateMap.get("year");
|
|
|
+ //Integer quarter = dateMap.get("quarter");
|
|
|
+ int year = 2019;
|
|
|
+ int quarter = 4;
|
|
|
Map<String, String> timeMap = DateUtils.quarterStartEndDate(year, quarter);
|
|
|
- String startTime = timeMap.get("startTime");
|
|
|
- String endTime = timeMap.get("endTime");
|
|
|
+ String startTime = timeMap.get("startDate");
|
|
|
+ String endTime = timeMap.get("endDate");
|
|
|
|
|
|
//1 获取快手下所有人
|
|
|
List<UserDto2> userDto2List = userEfficientVideoMapMapper.getKuaishouDepartUserInfo();
|
|
@@ -1650,13 +1652,16 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
|
//2.2 获取有效视频总数
|
|
|
Integer videoCount = userEfficientVideoMapMapper.getQuarterMaterialCountByUserId(userDto.getRoleCode(), startTime, endTime, userDto.getUserId());
|
|
|
//2.3 总消耗
|
|
|
- BigDecimal cost = BigDecimal.ZERO;
|
|
|
+ BigDecimal cost = null;
|
|
|
if ("clip".equals(roleCode)) {
|
|
|
- cost = userEfficientVideoMapMapper.getTotalCostByPlanId(userDto.getUserId(), startTime, endTime);
|
|
|
+ cost = userEfficientVideoMapMapper.getTotalCostByClipId(userDto.getUserId(), startTime, endTime);
|
|
|
} else if ("plan".equals(roleCode)) {
|
|
|
cost = userEfficientVideoMapMapper.getTotalCostByPlanId(userDto.getUserId(), startTime, endTime);
|
|
|
} else if ("shot".equals(roleCode)) {
|
|
|
- cost = userEfficientVideoMapMapper.getTotalCostByPlanId(userDto.getUserId(), startTime, endTime);
|
|
|
+ cost = userEfficientVideoMapMapper.getTotalCostByShotId(userDto.getUserId(), startTime, endTime);
|
|
|
+ }
|
|
|
+ if(cost == null){
|
|
|
+ cost = BigDecimal.ZERO;
|
|
|
}
|
|
|
userDto.setCost(cost);
|
|
|
userDto.setVideoCount(videoCount);
|
|
@@ -1672,8 +1677,8 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
|
Integer year = dateMap.get("year");
|
|
|
Integer quarter = dateMap.get("quarter");
|
|
|
Map<String, String> timeMap = DateUtils.quarterStartEndDate(year, quarter);
|
|
|
- String startTime = timeMap.get("startTime");
|
|
|
- String endTime = timeMap.get("endTime");
|
|
|
+ String startTime = timeMap.get("startDate");
|
|
|
+ String endTime = timeMap.get("endDate");
|
|
|
|
|
|
//1 获取头条所有人
|
|
|
List<UserDto2> userDto2List = userEfficientVideoMapMapper.getToutiaoDepartUserInfo();
|
|
@@ -1685,13 +1690,16 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
|
//2.2 获取视频总数
|
|
|
Integer videoCount = userEfficientVideoMapMapper.getQuarterMaterialCountByUserId(userDto.getRoleCode(), startTime, endTime, userDto.getUserId());
|
|
|
//2.3 总消耗
|
|
|
- BigDecimal cost = BigDecimal.ZERO;
|
|
|
+ BigDecimal cost = null;
|
|
|
if ("clip".equals(roleCode)) {
|
|
|
- cost = userEfficientVideoMapMapper.toutiaoGetTotalCostByPlanId(userDto.getUserId(), startTime, endTime);
|
|
|
+ cost = userEfficientVideoMapMapper.toutiaoGetTotalCostByClipId(userDto.getUserId(), startTime, endTime);
|
|
|
} else if ("plan".equals(roleCode)) {
|
|
|
cost = userEfficientVideoMapMapper.toutiaoGetTotalCostByPlanId(userDto.getUserId(), startTime, endTime);
|
|
|
} else if ("shot".equals(roleCode)) {
|
|
|
- cost = userEfficientVideoMapMapper.toutiaoGetTotalCostByPlanId(userDto.getUserId(), startTime, endTime);
|
|
|
+ cost = userEfficientVideoMapMapper.toutiaoGetTotalCostByShotId(userDto.getUserId(), startTime, endTime);
|
|
|
+ }
|
|
|
+ if(cost == null){
|
|
|
+ cost = BigDecimal.ZERO;
|
|
|
}
|
|
|
userDto.setCost(cost);
|
|
|
userDto.setVideoCount(videoCount);
|
|
@@ -1700,7 +1708,7 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
|
return userDto2List;
|
|
|
}
|
|
|
|
|
|
- //快手绩效时时数据接口
|
|
|
+ //快手绩效周报数据接口
|
|
|
@Override
|
|
|
public List<UserDto2> kuaishouWeekReport(String startDate, String endDate) {
|
|
|
//1 获取快手下所有人
|
|
@@ -1715,11 +1723,11 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
|
//2.3 总消耗
|
|
|
BigDecimal cost = null;
|
|
|
if ("clip".equals(roleCode)) {
|
|
|
- cost = userEfficientVideoMapMapper.getTotalCostByPlanId(userDto.getUserId(), startDate, endDate);
|
|
|
+ cost = userEfficientVideoMapMapper.getTotalCostByClipId(userDto.getUserId(), startDate, endDate);
|
|
|
} else if ("plan".equals(roleCode)) {
|
|
|
cost = userEfficientVideoMapMapper.getTotalCostByPlanId(userDto.getUserId(), startDate, endDate);
|
|
|
} else if ("shot".equals(roleCode)) {
|
|
|
- cost = userEfficientVideoMapMapper.getTotalCostByPlanId(userDto.getUserId(), startDate, endDate);
|
|
|
+ cost = userEfficientVideoMapMapper.getTotalCostByShotId(userDto.getUserId(), startDate, endDate);
|
|
|
}
|
|
|
if(cost == null){
|
|
|
cost = BigDecimal.ZERO;
|
|
@@ -1746,11 +1754,11 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
|
//2.3 总消耗
|
|
|
BigDecimal cost = null;
|
|
|
if ("clip".equals(roleCode)) {
|
|
|
- cost = userEfficientVideoMapMapper.toutiaoGetTotalCostByPlanId(userDto.getUserId(), startDate, endDate);
|
|
|
+ cost = userEfficientVideoMapMapper.toutiaoGetTotalCostByClipId(userDto.getUserId(), startDate, endDate);
|
|
|
} else if ("plan".equals(roleCode)) {
|
|
|
cost = userEfficientVideoMapMapper.toutiaoGetTotalCostByPlanId(userDto.getUserId(), startDate, endDate);
|
|
|
} else if ("shot".equals(roleCode)) {
|
|
|
- cost = userEfficientVideoMapMapper.toutiaoGetTotalCostByPlanId(userDto.getUserId(), startDate, endDate);
|
|
|
+ cost = userEfficientVideoMapMapper.toutiaoGetTotalCostByShotId(userDto.getUserId(), startDate, endDate);
|
|
|
}
|
|
|
|
|
|
if(cost == null){
|
|
@@ -1768,14 +1776,14 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
|
public List<UserDto2> kuaishouQuarterReport(Integer year, Integer quarter) {
|
|
|
//0 获取当季度的开始和结束时间
|
|
|
Map<String, String> timeMap = DateUtils.quarterStartEndDate(year, quarter);
|
|
|
- String startTime = timeMap.get("startTime");
|
|
|
- String endTime = timeMap.get("endTime");
|
|
|
+ String startTime = timeMap.get("startDate");
|
|
|
+ String endTime = timeMap.get("endDate");
|
|
|
|
|
|
//1 获取快手下所有人
|
|
|
List<UserDto2> userDto2List = userEfficientVideoMapMapper.getKuaishouDepartUserInfo();
|
|
|
//2 循环所有人,并查询出每个人的有效视频数、总视频数、总消耗
|
|
|
for (UserDto2 userDto : userDto2List) {
|
|
|
- String roleCode = userDto.getRoleCode();
|
|
|
+ //String roleCode = userDto.getRoleCode();
|
|
|
//2.1 获取有效视频数量
|
|
|
Integer effiVideoCount = userEfficientVideoMapMapper.getEffiVideoCountByUserId(2, year, quarter, userDto.getUserId(), userDto.getRoleId());
|
|
|
//2.2 获取有效视频总数
|
|
@@ -1801,14 +1809,14 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
|
public List<UserDto2> toutiaoQuarterReport(Integer year, Integer quarter) {
|
|
|
//0 获取当季度的开始和结束时间
|
|
|
Map<String, String> timeMap = DateUtils.quarterStartEndDate(year, quarter);
|
|
|
- String startTime = timeMap.get("startTime");
|
|
|
- String endTime = timeMap.get("endTime");
|
|
|
+ String startTime = timeMap.get("startDate");
|
|
|
+ String endTime = timeMap.get("endDate");
|
|
|
|
|
|
//1 获取快手下所有人
|
|
|
List<UserDto2> userDto2List = userEfficientVideoMapMapper.getKuaishouDepartUserInfo();
|
|
|
//2 循环所有人,并查询出每个人的有效视频数、总视频数、总消耗
|
|
|
for (UserDto2 userDto : userDto2List) {
|
|
|
- String roleCode = userDto.getRoleCode();
|
|
|
+ //String roleCode = userDto.getRoleCode();
|
|
|
//2.1 获取有效视频数量
|
|
|
Integer effiVideoCount = userEfficientVideoMapMapper.getEffiVideoCountByUserId(1, year, quarter, userDto.getUserId(), userDto.getRoleId());
|
|
|
//2.2 获取有效视频总数
|
|
@@ -1829,5 +1837,16 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
|
return userDto2List;
|
|
|
}
|
|
|
|
|
|
+ //根据userid,appType,年度,季度查询有效视频列表
|
|
|
+ public List<MaterialInfo> effiVideoList(Integer appType, Integer year, Integer quarter, String userId){
|
|
|
+ if(year == null || quarter == null){
|
|
|
+ Map<String, Integer> dateMap = DateUtils.getYearQuarter(new Date());
|
|
|
+ year = dateMap.get("year");
|
|
|
+ quarter = dateMap.get("quarter");
|
|
|
+ }
|
|
|
+ List<MaterialInfo> materialInfoList = userEfficientVideoMapMapper.getEffiVideoList(appType, year, quarter, userId);
|
|
|
+ return materialInfoList;
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|