|
@@ -2,7 +2,6 @@ package org.jeecg.modules.system.service.impl;
|
|
|
|
|
|
import cn.com.ctop.performanceappraisal.entity.Performance;
|
|
|
import cn.com.ctop.performanceappraisal.mapper.PerformanceMapper;
|
|
|
-import cn.com.ctop.performanceappraisal.service.IOptimizerConfigService;
|
|
|
import cn.com.ctop.planeprojectcost.entity.PlaneProjectCost;
|
|
|
import cn.com.ctop.planeprojectcost.mapper.PlaneProjectCostMapper;
|
|
|
import cn.com.ctop.userefficientvideomap.entity.*;
|
|
@@ -326,7 +325,7 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
|
//循环前30%有绩效的人数并计算其绩效,并入库
|
|
|
for (int i = 0; i <= top30 - 1; i++) {
|
|
|
//总消耗--获取这个人所在项目的总消耗
|
|
|
- BigDecimal totalCost = userEfficientVideoMapMapper.getProjectTotalCostByUserId(planList.get(i).getUserId(), startTime, endTime);
|
|
|
+ BigDecimal totalCost = userEfficientVideoMapMapper.getTotalCostByPlanId(planList.get(i).getUserId(), startTime, endTime);
|
|
|
//总绩效=总消耗*提点比例(5‰)*提成比例(编导40%)
|
|
|
BigDecimal totalPerformance = totalCost.multiply(new BigDecimal("0.005")).multiply(new BigDecimal("0.4"));
|
|
|
|
|
@@ -351,7 +350,7 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
|
//循环中间50%有绩效的人,计算绩效并入库
|
|
|
for (int i = 0; i <= middle50 - 1; i++) {
|
|
|
//总消耗--获取这个人所在项目的总消耗
|
|
|
- BigDecimal totalCost = userEfficientVideoMapMapper.getProjectTotalCostByUserId(planList.get(i).getUserId(), startTime, endTime);
|
|
|
+ BigDecimal totalCost = userEfficientVideoMapMapper.getTotalCostByPlanId(planList.get(i).getUserId(), startTime, endTime);
|
|
|
//总绩效=总消耗*提点比例(3‰)*提成比例(编导40%)
|
|
|
BigDecimal totalPerformance = totalCost.multiply(new BigDecimal("0.003")).multiply(new BigDecimal("0.4"));
|
|
|
|
|
@@ -399,7 +398,7 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
|
//循环前30%有绩效的人数并计算其绩效,并入库
|
|
|
for (int i = 0; i <= shotTop30 - 1; i++) {
|
|
|
//总消耗--获取这个人所在项目的总消耗
|
|
|
- BigDecimal totalCost = userEfficientVideoMapMapper.getProjectTotalCostByUserId(shotList.get(i).getUserId(), startTime, endTime);
|
|
|
+ BigDecimal totalCost = userEfficientVideoMapMapper.getTotalCostByShotId(shotList.get(i).getUserId(), startTime, endTime);
|
|
|
//总绩效=总消耗*提点比例(5‰)*提成比例(拍摄10%)
|
|
|
BigDecimal totalPerformance = totalCost.multiply(new BigDecimal("0.005")).multiply(new BigDecimal("0.1"));
|
|
|
|
|
@@ -424,7 +423,7 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
|
//循环中间50%有绩效的人,计算绩效并入库
|
|
|
for (int i = 0; i <= shotMiddle50 - 1; i++) {
|
|
|
//总消耗--获取这个人所在项目的总消耗
|
|
|
- BigDecimal totalCost = userEfficientVideoMapMapper.getProjectTotalCostByUserId(shotList.get(i).getUserId(), startTime, endTime);
|
|
|
+ BigDecimal totalCost = userEfficientVideoMapMapper.getTotalCostByShotId(shotList.get(i).getUserId(), startTime, endTime);
|
|
|
//总绩效=总消耗*提点比例(3‰)*提成比例(拍摄10%)
|
|
|
BigDecimal totalPerformance = totalCost.multiply(new BigDecimal("0.003")).multiply(new BigDecimal("0.1"));
|
|
|
|
|
@@ -472,7 +471,7 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
|
//循环前30%有绩效的人数并计算其绩效,并入库
|
|
|
for (int i = 0; i <= clipTop30 - 1; i++) {
|
|
|
//总消耗--获取这个人所在项目的总消耗
|
|
|
- BigDecimal totalCost = userEfficientVideoMapMapper.getProjectTotalCostByUserId(clipList.get(i).getUserId(), startTime, endTime);
|
|
|
+ BigDecimal totalCost = userEfficientVideoMapMapper.getTotalCostByClipId(clipList.get(i).getUserId(), startTime, endTime);
|
|
|
//总绩效=总消耗*提点比例(5‰)*提成比例(剪辑30%)
|
|
|
BigDecimal totalPerformance = totalCost.multiply(new BigDecimal("0.005")).multiply(new BigDecimal("0.3"));
|
|
|
|
|
@@ -497,7 +496,7 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
|
//循环中间50%有绩效的人,计算绩效并入库
|
|
|
for (int i = 0; i <= clipMiddle50 - 1; i++) {
|
|
|
//总消耗--获取这个人所在项目的总消耗
|
|
|
- BigDecimal totalCost = userEfficientVideoMapMapper.getProjectTotalCostByUserId(clipList.get(i).getUserId(), startTime, endTime);
|
|
|
+ BigDecimal totalCost = userEfficientVideoMapMapper.getTotalCostByClipId(clipList.get(i).getUserId(), startTime, endTime);
|
|
|
//总绩效=总消耗*提点比例(3‰)*提成比例(剪辑30%)
|
|
|
BigDecimal totalPerformance = totalCost.multiply(new BigDecimal("0.003")).multiply(new BigDecimal("0.3"));
|
|
|
|
|
@@ -928,12 +927,12 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
|
performance.setRoleId(userDto.getRoleId());
|
|
|
performance.setQuarter(thisQuarter);
|
|
|
performance.setYear(thisYear);
|
|
|
- performance.setCommissionRate(new BigDecimal("0.002"));
|
|
|
+ performance.setCommissionRate(new BigDecimal("0.002")); //千分之
|
|
|
performance.setTotalCost(totalCost);
|
|
|
performance.setTotalPerformance(totalPerformance);
|
|
|
performance.setStartTime(startTime);
|
|
|
performance.setEndTime(endTime);
|
|
|
- performance.setRoleCommissionRate(new BigDecimal("20"));
|
|
|
+ performance.setRoleCommissionRate(new BigDecimal("20")); //百分之
|
|
|
performance.setUserId(userDto.getUserId());
|
|
|
performanceMapper.insert(performance);
|
|
|
}
|