|
@@ -73,7 +73,7 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
String effiCalcStart = DateUtils.formatDate(DateUtils.addDay(friday, -14)); //计算有效视频开始的时间
|
|
String effiCalcStart = DateUtils.formatDate(DateUtils.addDay(friday, -14)); //计算有效视频开始的时间
|
|
log.info("有效视频统计的开始时间为" + effiCalcStart);
|
|
log.info("有效视频统计的开始时间为" + effiCalcStart);
|
|
String effiCalcEnd = DateUtils.formatDate(DateUtils.addDay(friday, -1)); //计算有效视频结束的时间
|
|
String effiCalcEnd = DateUtils.formatDate(DateUtils.addDay(friday, -1)); //计算有效视频结束的时间
|
|
- log.info("有效视频统计的结束时间为" + effiCalcStart);
|
|
|
|
|
|
+ log.info("有效视频统计的结束时间为" + effiCalcEnd);
|
|
String effiStart = DateUtils.formatDate(DateUtils.addDay(friday, -21)); //有效视频发布开始时间
|
|
String effiStart = DateUtils.formatDate(DateUtils.addDay(friday, -21)); //有效视频发布开始时间
|
|
log.info("有效视频发布的开始时间为" + effiStart);
|
|
log.info("有效视频发布的开始时间为" + effiStart);
|
|
String effiEnd = DateUtils.formatDate(DateUtils.addDay(friday, -15)); //有效视频发布结束时间
|
|
String effiEnd = DateUtils.formatDate(DateUtils.addDay(friday, -15)); //有效视频发布结束时间
|
|
@@ -331,6 +331,10 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
int top30 = new BigDecimal(String.valueOf(planLength)).multiply(new BigDecimal("0.3")).setScale(0, BigDecimal.ROUND_HALF_UP).intValue();
|
|
int top30 = new BigDecimal(String.valueOf(planLength)).multiply(new BigDecimal("0.3")).setScale(0, BigDecimal.ROUND_HALF_UP).intValue();
|
|
int middle50 = new BigDecimal(String.valueOf(planLength)).multiply(new BigDecimal("0.5")).setScale(0, BigDecimal.ROUND_HALF_UP).intValue();
|
|
int middle50 = new BigDecimal(String.valueOf(planLength)).multiply(new BigDecimal("0.5")).setScale(0, BigDecimal.ROUND_HALF_UP).intValue();
|
|
|
|
|
|
|
|
+ //测试数据
|
|
|
|
+ // top30 = 1;
|
|
|
|
+ // middle50 =1;
|
|
|
|
+
|
|
//循环前30%有绩效的人数并计算其绩效,并入库
|
|
//循环前30%有绩效的人数并计算其绩效,并入库
|
|
for (int i = 0; i <= top30 - 1; i++) {
|
|
for (int i = 0; i <= top30 - 1; i++) {
|
|
//总消耗--获取这个人的总消耗
|
|
//总消耗--获取这个人的总消耗
|
|
@@ -404,6 +408,10 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
int shotTop30 = new BigDecimal(String.valueOf(shotLength)).multiply(new BigDecimal("0.3")).setScale(0, BigDecimal.ROUND_HALF_UP).intValue();
|
|
int shotTop30 = new BigDecimal(String.valueOf(shotLength)).multiply(new BigDecimal("0.3")).setScale(0, BigDecimal.ROUND_HALF_UP).intValue();
|
|
int shotMiddle50 = new BigDecimal(String.valueOf(shotLength)).multiply(new BigDecimal("0.5")).setScale(0, BigDecimal.ROUND_HALF_UP).intValue();
|
|
int shotMiddle50 = new BigDecimal(String.valueOf(shotLength)).multiply(new BigDecimal("0.5")).setScale(0, BigDecimal.ROUND_HALF_UP).intValue();
|
|
|
|
|
|
|
|
+ //测试完删除
|
|
|
|
+ // shotTop30 = 1;
|
|
|
|
+ // shotMiddle50 = 1;
|
|
|
|
+
|
|
//循环前30%有绩效的人数并计算其绩效,并入库
|
|
//循环前30%有绩效的人数并计算其绩效,并入库
|
|
for (int i = 0; i <= shotTop30 - 1; i++) {
|
|
for (int i = 0; i <= shotTop30 - 1; i++) {
|
|
//总消耗--获取这个人所在项目的总消耗
|
|
//总消耗--获取这个人所在项目的总消耗
|
|
@@ -477,6 +485,10 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
int clipTop30 = new BigDecimal(String.valueOf(clipLength)).multiply(new BigDecimal("0.3")).setScale(0, BigDecimal.ROUND_HALF_UP).intValue();
|
|
int clipTop30 = new BigDecimal(String.valueOf(clipLength)).multiply(new BigDecimal("0.3")).setScale(0, BigDecimal.ROUND_HALF_UP).intValue();
|
|
int clipMiddle50 = new BigDecimal(String.valueOf(clipLength)).multiply(new BigDecimal("0.5")).setScale(0, BigDecimal.ROUND_HALF_UP).intValue();
|
|
int clipMiddle50 = new BigDecimal(String.valueOf(clipLength)).multiply(new BigDecimal("0.5")).setScale(0, BigDecimal.ROUND_HALF_UP).intValue();
|
|
|
|
|
|
|
|
+ //测试完删除
|
|
|
|
+ //clipTop30 = 1;
|
|
|
|
+ //clipMiddle50 = 1;
|
|
|
|
+
|
|
//循环前30%有绩效的人数并计算其绩效,并入库
|
|
//循环前30%有绩效的人数并计算其绩效,并入库
|
|
for (int i = 0; i <= clipTop30 - 1; i++) {
|
|
for (int i = 0; i <= clipTop30 - 1; i++) {
|
|
//总消耗--获取这个人所在项目的总消耗
|
|
//总消耗--获取这个人所在项目的总消耗
|
|
@@ -540,6 +552,11 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
|
|
|
|
//循环project
|
|
//循环project
|
|
for (ProjectDTO projectDTO : projectDTOS) {
|
|
for (ProjectDTO projectDTO : projectDTOS) {
|
|
|
|
+ //测试使用
|
|
|
|
+ //if(projectDTO.getProjectId() != 42L){
|
|
|
|
+ // continue;
|
|
|
|
+ //}
|
|
|
|
+
|
|
BigDecimal quarterCost = userEfficientVideoMapMapper.getProjectQuarterCostById(startTime, endTime, projectDTO.getProjectId());
|
|
BigDecimal quarterCost = userEfficientVideoMapMapper.getProjectQuarterCostById(startTime, endTime, projectDTO.getProjectId());
|
|
List<UserDto2> planeList = userEfficientVideoMapMapper.getPlaneByProjectId(projectDTO.getProjectId());
|
|
List<UserDto2> planeList = userEfficientVideoMapMapper.getPlaneByProjectId(projectDTO.getProjectId());
|
|
//此项目当中平面数量
|
|
//此项目当中平面数量
|
|
@@ -562,7 +579,7 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
|
|
|
|
if (null == planeMap.get(plane.getUserId())) {
|
|
if (null == planeMap.get(plane.getUserId())) {
|
|
plane.setEffiRate(averageQuarterCost);
|
|
plane.setEffiRate(averageQuarterCost);
|
|
- planeMap.put("plane.getUserId()", plane);
|
|
|
|
|
|
+ planeMap.put(plane.getUserId(), plane);
|
|
} else {
|
|
} else {
|
|
//将增加的金额增加到
|
|
//将增加的金额增加到
|
|
planeMap.get(plane.getUserId()).setEffiRate(planeMap.get(plane.getUserId()).getEffiRate().add(plane.getEffiRate()));
|
|
planeMap.get(plane.getUserId()).setEffiRate(planeMap.get(plane.getUserId()).getEffiRate().add(plane.getEffiRate()));
|
|
@@ -602,7 +619,7 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
BigDecimal totalCost = BigDecimal.ZERO; //剪辑总消耗
|
|
BigDecimal totalCost = BigDecimal.ZERO; //剪辑总消耗
|
|
|
|
|
|
for (String clipUserId : clipList) {
|
|
for (String clipUserId : clipList) {
|
|
- BigDecimal clipCost = userEfficientVideoMapMapper.getClipQuarterCost(2, thisYear, thisQuarter, clipUserId); //媒体类型 //1头条 2快手
|
|
|
|
|
|
+ BigDecimal clipCost = userEfficientVideoMapMapper.getClipQuarterCost(2, thisQuarter, thisYear, clipUserId); //媒体类型 //1头条 2快手
|
|
totalCost = totalCost.add(clipCost);
|
|
totalCost = totalCost.add(clipCost);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -924,7 +941,7 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
BigDecimal totalCost = BigDecimal.ZERO; //剪辑总消耗
|
|
BigDecimal totalCost = BigDecimal.ZERO; //剪辑总消耗
|
|
|
|
|
|
for (String clipUserId : clipList) {
|
|
for (String clipUserId : clipList) {
|
|
- BigDecimal clipCost = userEfficientVideoMapMapper.getClipQuarterCost(1, thisYear, thisQuarter, clipUserId); //媒体类型 //1头条 2快手
|
|
|
|
|
|
+ BigDecimal clipCost = userEfficientVideoMapMapper.getClipQuarterCost(1, thisQuarter, thisYear, clipUserId); //媒体类型 //1头条 2快手
|
|
totalCost = totalCost.add(clipCost);
|
|
totalCost = totalCost.add(clipCost);
|
|
}
|
|
}
|
|
|
|
|