|
@@ -1628,10 +1628,10 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
public List<UserDto2> kuaishouPerformanceInfoNow() {
|
|
public List<UserDto2> kuaishouPerformanceInfoNow() {
|
|
//0 获取当前季度的时间
|
|
//0 获取当前季度的时间
|
|
Map<String, Integer> dateMap = DateUtils.getYearQuarter(new Date());
|
|
Map<String, Integer> dateMap = DateUtils.getYearQuarter(new Date());
|
|
- //Integer year = dateMap.get("year");
|
|
|
|
- //Integer quarter = dateMap.get("quarter");
|
|
|
|
- int year = 2019;
|
|
|
|
- int quarter = 4;
|
|
|
|
|
|
+ Integer year = dateMap.get("year");
|
|
|
|
+ Integer quarter = dateMap.get("quarter");
|
|
|
|
+ //int year = 2019;
|
|
|
|
+ //int quarter = 4;
|
|
Map<String, String> timeMap = DateUtils.quarterStartEndDate(year, quarter);
|
|
Map<String, String> timeMap = DateUtils.quarterStartEndDate(year, quarter);
|
|
String startTime = timeMap.get("startDate");
|
|
String startTime = timeMap.get("startDate");
|
|
String endTime = timeMap.get("endDate");
|
|
String endTime = timeMap.get("endDate");
|
|
@@ -1670,10 +1670,10 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
public List<UserDto2> kuaishouYouhuaPerformanceInfoNow() {
|
|
public List<UserDto2> kuaishouYouhuaPerformanceInfoNow() {
|
|
//0 获取当前季度的时间
|
|
//0 获取当前季度的时间
|
|
Map<String, Integer> dateMap = DateUtils.getYearQuarter(new Date());
|
|
Map<String, Integer> dateMap = DateUtils.getYearQuarter(new Date());
|
|
- //Integer year = dateMap.get("year");
|
|
|
|
- //Integer quarter = dateMap.get("quarter");
|
|
|
|
- int year = 2019;
|
|
|
|
- int quarter = 4;
|
|
|
|
|
|
+ Integer year = dateMap.get("year");
|
|
|
|
+ Integer quarter = dateMap.get("quarter");
|
|
|
|
+ //int year = 2019;
|
|
|
|
+ //int quarter = 4;
|
|
Map<String, String> timeMap = DateUtils.quarterStartEndDate(year, quarter);
|
|
Map<String, String> timeMap = DateUtils.quarterStartEndDate(year, quarter);
|
|
String startTime = timeMap.get("startDate");
|
|
String startTime = timeMap.get("startDate");
|
|
String endTime = timeMap.get("endDate");
|
|
String endTime = timeMap.get("endDate");
|
|
@@ -1698,10 +1698,10 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
public List<UserDto2> toutiaoYouhuaPerformanceInfoNow() {
|
|
public List<UserDto2> toutiaoYouhuaPerformanceInfoNow() {
|
|
//0 获取当前季度的时间
|
|
//0 获取当前季度的时间
|
|
Map<String, Integer> dateMap = DateUtils.getYearQuarter(new Date());
|
|
Map<String, Integer> dateMap = DateUtils.getYearQuarter(new Date());
|
|
- //Integer year = dateMap.get("year");
|
|
|
|
- //Integer quarter = dateMap.get("quarter");
|
|
|
|
- int year = 2019;
|
|
|
|
- int quarter = 4;
|
|
|
|
|
|
+ Integer year = dateMap.get("year");
|
|
|
|
+ Integer quarter = dateMap.get("quarter");
|
|
|
|
+ //int year = 2019;
|
|
|
|
+ //int quarter = 4;
|
|
Map<String, String> timeMap = DateUtils.quarterStartEndDate(year, quarter);
|
|
Map<String, String> timeMap = DateUtils.quarterStartEndDate(year, quarter);
|
|
String startTime = timeMap.get("startDate");
|
|
String startTime = timeMap.get("startDate");
|
|
String endTime = timeMap.get("endDate");
|
|
String endTime = timeMap.get("endDate");
|
|
@@ -1895,7 +1895,7 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
String endTime = timeMap.get("endDate");
|
|
String endTime = timeMap.get("endDate");
|
|
|
|
|
|
//1 获取快手下所有人
|
|
//1 获取快手下所有人
|
|
- List<UserDto2> userDto2List = userEfficientVideoMapMapper.getKuaishouDepartUserInfo();
|
|
|
|
|
|
+ List<UserDto2> userDto2List = userEfficientVideoMapMapper.getKuaishouDepartAllUserInfo();
|
|
//2 循环所有人,并查询出每个人的有效视频数、总视频数、总消耗
|
|
//2 循环所有人,并查询出每个人的有效视频数、总视频数、总消耗
|
|
for (UserDto2 userDto : userDto2List) {
|
|
for (UserDto2 userDto : userDto2List) {
|
|
//String roleCode = userDto.getRoleCode();
|
|
//String roleCode = userDto.getRoleCode();
|
|
@@ -1910,7 +1910,9 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
}
|
|
}
|
|
//2.4 当季度绩效
|
|
//2.4 当季度绩效
|
|
BigDecimal performance = userEfficientVideoMapMapper.getQuarterPerformance(userDto.getUserId(), year, quarter, 2);
|
|
BigDecimal performance = userEfficientVideoMapMapper.getQuarterPerformance(userDto.getUserId(), year, quarter, 2);
|
|
-
|
|
|
|
|
|
+ if(performance==null){
|
|
|
|
+ performance=BigDecimal.ZERO;
|
|
|
|
+ }
|
|
userDto.setEffiRate(performance);
|
|
userDto.setEffiRate(performance);
|
|
userDto.setCost(cost);
|
|
userDto.setCost(cost);
|
|
userDto.setVideoCount(videoCount);
|
|
userDto.setVideoCount(videoCount);
|
|
@@ -1928,7 +1930,7 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
String endTime = timeMap.get("endDate");
|
|
String endTime = timeMap.get("endDate");
|
|
|
|
|
|
//1 获取头条下所有人
|
|
//1 获取头条下所有人
|
|
- List<UserDto2> userDto2List = userEfficientVideoMapMapper.getToutiaoDepartUserInfo();
|
|
|
|
|
|
+ List<UserDto2> userDto2List = userEfficientVideoMapMapper.getToutiaoDepartAllUserInfo();
|
|
//2 循环所有人,并查询出每个人的有效视频数、总视频数、总消耗
|
|
//2 循环所有人,并查询出每个人的有效视频数、总视频数、总消耗
|
|
for (UserDto2 userDto : userDto2List) {
|
|
for (UserDto2 userDto : userDto2List) {
|
|
//String roleCode = userDto.getRoleCode();
|
|
//String roleCode = userDto.getRoleCode();
|
|
@@ -1943,7 +1945,9 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
}
|
|
}
|
|
//2.4 当季度绩效
|
|
//2.4 当季度绩效
|
|
BigDecimal performance = userEfficientVideoMapMapper.getQuarterPerformance(userDto.getUserId(), year, quarter, 1);
|
|
BigDecimal performance = userEfficientVideoMapMapper.getQuarterPerformance(userDto.getUserId(), year, quarter, 1);
|
|
-
|
|
|
|
|
|
+ if(performance==null){
|
|
|
|
+ performance=BigDecimal.ZERO;
|
|
|
|
+ }
|
|
userDto.setEffiRate(performance);
|
|
userDto.setEffiRate(performance);
|
|
userDto.setCost(cost);
|
|
userDto.setCost(cost);
|
|
userDto.setVideoCount(videoCount);
|
|
userDto.setVideoCount(videoCount);
|
|
@@ -1969,10 +1973,8 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
return materialInfoList;
|
|
return materialInfoList;
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
-
|
|
|
|
//快手优化季度绩效报表
|
|
//快手优化季度绩效报表
|
|
- //@Override
|
|
|
|
|
|
+ @Override
|
|
public List<UserDto2> kuaishouYouhuaQuarterReport(Integer year, Integer quarter) {
|
|
public List<UserDto2> kuaishouYouhuaQuarterReport(Integer year, Integer quarter) {
|
|
//1 获取快手下所有人
|
|
//1 获取快手下所有人
|
|
List<UserDto2> userDto2List = userEfficientVideoMapMapper.getKuaishouYunyingDepartUserInfo();
|
|
List<UserDto2> userDto2List = userEfficientVideoMapMapper.getKuaishouYunyingDepartUserInfo();
|
|
@@ -1985,6 +1987,9 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
}
|
|
}
|
|
//当季度绩效
|
|
//当季度绩效
|
|
BigDecimal performance = userEfficientVideoMapMapper.getQuarterPerformance(userDto.getUserId(), year, quarter, 2);
|
|
BigDecimal performance = userEfficientVideoMapMapper.getQuarterPerformance(userDto.getUserId(), year, quarter, 2);
|
|
|
|
+ if(performance==null){
|
|
|
|
+ performance=BigDecimal.ZERO;
|
|
|
|
+ }
|
|
userDto.setEffiRate(performance);
|
|
userDto.setEffiRate(performance);
|
|
userDto.setCost(cost);
|
|
userDto.setCost(cost);
|
|
userDto.setYear(year);
|
|
userDto.setYear(year);
|
|
@@ -2008,6 +2013,9 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
}
|
|
}
|
|
//当季度绩效
|
|
//当季度绩效
|
|
BigDecimal performance = userEfficientVideoMapMapper.getQuarterPerformance(userDto.getUserId(), year, quarter, 1);
|
|
BigDecimal performance = userEfficientVideoMapMapper.getQuarterPerformance(userDto.getUserId(), year, quarter, 1);
|
|
|
|
+ if(performance==null){
|
|
|
|
+ performance=BigDecimal.ZERO;
|
|
|
|
+ }
|
|
userDto.setEffiRate(performance);
|
|
userDto.setEffiRate(performance);
|
|
userDto.setCost(cost);
|
|
userDto.setCost(cost);
|
|
userDto.setYear(year);
|
|
userDto.setYear(year);
|