|
@@ -1086,22 +1086,6 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
log.info(projectDTO.getProjectName() + "中有" + size + "个平面设计");
|
|
log.info(projectDTO.getProjectName() + "中有" + size + "个平面设计");
|
|
//平面设计数据为0,项目leader的绩效给20%
|
|
//平面设计数据为0,项目leader的绩效给20%
|
|
if (size == 0) {
|
|
if (size == 0) {
|
|
- //项目下面有平面的情况下,项目leader给15%的绩效,快手给3‰
|
|
|
|
- //Performance performance = new Performance();
|
|
|
|
- //performance.setAppType(2);
|
|
|
|
- //performance.setRoleId("projectLeader");
|
|
|
|
- //performance.setQuarter(thisQuarter);
|
|
|
|
- //performance.setYear(thisYear);
|
|
|
|
- //performance.setStartTime(startTime);
|
|
|
|
- //performance.setEndTime(endTime);
|
|
|
|
- //performance.setTotalCost(quarterCost);
|
|
|
|
- //performance.setCommissionRate(new BigDecimal("0.003")); //快手平台提成比例 3千分之
|
|
|
|
- //performance.setRoleCommissionRate(new BigDecimal("0.2")); //项目没有平面的情况下,提成比例20%
|
|
|
|
- //performance.setTotalPerformance(quarterCost.multiply(new BigDecimal("0.2")).multiply(new BigDecimal("0.003")).setScale(2));
|
|
|
|
- //performance.setUserId(designLeader.getUserId());
|
|
|
|
- //performance.setVideoEfficiency(null); //项目设计师leader没有视频有效率一说
|
|
|
|
- //performanceMapper.insert(performance);
|
|
|
|
-
|
|
|
|
PlaneProjectCost planeProjectCost = new PlaneProjectCost();
|
|
PlaneProjectCost planeProjectCost = new PlaneProjectCost();
|
|
planeProjectCost.setAppType(2); //1头条 2快手
|
|
planeProjectCost.setAppType(2); //1头条 2快手
|
|
planeProjectCost.setProjectId(projectDTO.getProjectId());
|
|
planeProjectCost.setProjectId(projectDTO.getProjectId());
|
|
@@ -1118,7 +1102,7 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
if (null == designLeaderMap.get(designLeader.getUserId())) {
|
|
if (null == designLeaderMap.get(designLeader.getUserId())) {
|
|
designLeader.setEffiRate(planeProjectCost.getProjectPerformance()); //项目绩效
|
|
designLeader.setEffiRate(planeProjectCost.getProjectPerformance()); //项目绩效
|
|
designLeader.setCost(quarterCost); //项目总消耗
|
|
designLeader.setCost(quarterCost); //项目总消耗
|
|
- planeMap.put(designLeader.getUserId(), designLeader);
|
|
|
|
|
|
+ planeMap.put(planeProjectCost.getUserId(), designLeader);
|
|
} else {
|
|
} else {
|
|
//将增加的金额增加到
|
|
//将增加的金额增加到
|
|
planeMap.get(designLeader.getUserId()).setEffiRate(planeMap.get(designLeader.getUserId()).getEffiRate().add(designLeader.getEffiRate()));
|
|
planeMap.get(designLeader.getUserId()).setEffiRate(planeMap.get(designLeader.getUserId()).getEffiRate().add(designLeader.getEffiRate()));
|
|
@@ -1157,22 +1141,6 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
planeProjectCostMapper.insert(planeProjectCost);
|
|
planeProjectCostMapper.insert(planeProjectCost);
|
|
}
|
|
}
|
|
|
|
|
|
- //项目下面有平面的情况下,项目leader给15%的绩效
|
|
|
|
- //Performance performance = new Performance();
|
|
|
|
- //performance.setAppType(2);
|
|
|
|
- //performance.setRoleId("projectLeader");
|
|
|
|
- //performance.setQuarter(thisQuarter);
|
|
|
|
- //performance.setYear(thisYear);
|
|
|
|
- //performance.setStartTime(startTime);
|
|
|
|
- //performance.setEndTime(endTime);
|
|
|
|
- //performance.setTotalCost(quarterCost);
|
|
|
|
- //performance.setCommissionRate(new BigDecimal("0.003")); //快手平台比例3‰
|
|
|
|
- //performance.setRoleCommissionRate(new BigDecimal("0.15")); //项目有平面的情况下设计师leader的提成比例为15%
|
|
|
|
- //performance.setTotalPerformance(quarterCost.multiply(new BigDecimal("0.15")).multiply(new BigDecimal("0.003")));
|
|
|
|
- //performance.setUserId(designLeader.getUserId());
|
|
|
|
- //performance.setVideoEfficiency(null); //项目设计师leader没有视频有效率一说
|
|
|
|
- //performanceMapper.insert(performance);
|
|
|
|
-
|
|
|
|
PlaneProjectCost planeProjectCost = new PlaneProjectCost();
|
|
PlaneProjectCost planeProjectCost = new PlaneProjectCost();
|
|
planeProjectCost.setAppType(2); //1头条 2快手
|
|
planeProjectCost.setAppType(2); //1头条 2快手
|
|
planeProjectCost.setProjectId(projectDTO.getProjectId());
|
|
planeProjectCost.setProjectId(projectDTO.getProjectId());
|
|
@@ -1555,29 +1523,13 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
if (null == designLeaderMap.get(designLeader.getUserId())) {
|
|
if (null == designLeaderMap.get(designLeader.getUserId())) {
|
|
designLeader.setEffiRate(planeProjectCost.getProjectPerformance()); //项目绩效
|
|
designLeader.setEffiRate(planeProjectCost.getProjectPerformance()); //项目绩效
|
|
designLeader.setCost(quarterCost); //项目总消耗
|
|
designLeader.setCost(quarterCost); //项目总消耗
|
|
- planeMap.put(designLeader.getUserId(), designLeader);
|
|
|
|
|
|
+ designLeaderMap.put(designLeader.getUserId(), designLeader);
|
|
} else {
|
|
} else {
|
|
//将增加的金额增加到
|
|
//将增加的金额增加到
|
|
- planeMap.get(designLeader.getUserId()).setEffiRate(planeMap.get(designLeader.getUserId()).getEffiRate().add(designLeader.getEffiRate()));
|
|
|
|
- planeMap.get(designLeader.getUserId()).setCost(planeMap.get(designLeader.getUserId()).getCost().add(designLeader.getCost()));
|
|
|
|
|
|
+ designLeaderMap.get(designLeader.getUserId()).setEffiRate(designLeaderMap.get(designLeader.getUserId()).getEffiRate().add(designLeader.getEffiRate()));
|
|
|
|
+ designLeaderMap.get(designLeader.getUserId()).setCost(designLeaderMap.get(designLeader.getUserId()).getCost().add(designLeader.getCost()));
|
|
}
|
|
}
|
|
planeProjectCostMapper.insert(planeProjectCost);
|
|
planeProjectCostMapper.insert(planeProjectCost);
|
|
-
|
|
|
|
- ////项目下面有平面的情况下,项目leader给15%的绩效,快手给3‰
|
|
|
|
- //Performance performance = new Performance();
|
|
|
|
- //performance.setAppType(1);
|
|
|
|
- //performance.setRoleId("projectLeader");
|
|
|
|
- //performance.setQuarter(thisQuarter);
|
|
|
|
- //performance.setYear(thisYear);
|
|
|
|
- //performance.setStartTime(startTime);
|
|
|
|
- //performance.setEndTime(endTime);
|
|
|
|
- //performance.setTotalCost(quarterCost);
|
|
|
|
- //performance.setCommissionRate(new BigDecimal("0.002")); //头条平台比例2千分之
|
|
|
|
- //performance.setRoleCommissionRate(new BigDecimal("0.2")); //头条设计师leader提成比例
|
|
|
|
- //performance.setTotalPerformance(quarterCost.multiply(new BigDecimal("0.2")).multiply(new BigDecimal("0.002")));
|
|
|
|
- //performance.setUserId(designLeader.getUserId());
|
|
|
|
- //performance.setVideoEfficiency(null); //项目设计师leader没有视频有效率一说
|
|
|
|
- //performanceMapper.insert(performance);
|
|
|
|
}
|
|
}
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
@@ -1629,29 +1581,13 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
if (null == designLeaderMap.get(designLeader.getUserId())) {
|
|
if (null == designLeaderMap.get(designLeader.getUserId())) {
|
|
designLeader.setEffiRate(planeProjectCost.getProjectPerformance()); //项目绩效
|
|
designLeader.setEffiRate(planeProjectCost.getProjectPerformance()); //项目绩效
|
|
designLeader.setCost(quarterCost); //项目总消耗
|
|
designLeader.setCost(quarterCost); //项目总消耗
|
|
- planeMap.put(designLeader.getUserId(), designLeader);
|
|
|
|
|
|
+ designLeaderMap.put(designLeader.getUserId(), designLeader);
|
|
} else {
|
|
} else {
|
|
//将增加的金额增加到
|
|
//将增加的金额增加到
|
|
- planeMap.get(designLeader.getUserId()).setEffiRate(planeMap.get(designLeader.getUserId()).getEffiRate().add(designLeader.getEffiRate()));
|
|
|
|
- planeMap.get(designLeader.getUserId()).setCost(planeMap.get(designLeader.getUserId()).getCost().add(designLeader.getCost()));
|
|
|
|
|
|
+ designLeaderMap.get(designLeader.getUserId()).setEffiRate(designLeaderMap.get(designLeader.getUserId()).getEffiRate().add(designLeader.getEffiRate()));
|
|
|
|
+ designLeaderMap.get(designLeader.getUserId()).setCost(designLeaderMap.get(designLeader.getUserId()).getCost().add(designLeader.getCost()));
|
|
}
|
|
}
|
|
planeProjectCostMapper.insert(planeProjectCost);
|
|
planeProjectCostMapper.insert(planeProjectCost);
|
|
-
|
|
|
|
- ////项目下面有平面的情况下,项目leader给15%的绩效,快手给3‰
|
|
|
|
- //Performance performance = new Performance();
|
|
|
|
- //performance.setAppType(1);
|
|
|
|
- //performance.setRoleId("projectLeader");
|
|
|
|
- //performance.setQuarter(thisQuarter);
|
|
|
|
- //performance.setYear(thisYear);
|
|
|
|
- //performance.setStartTime(startTime);
|
|
|
|
- //performance.setEndTime(endTime);
|
|
|
|
- //performance.setTotalCost(quarterCost);
|
|
|
|
- //performance.setCommissionRate(new BigDecimal("0.002")); //头条平台比例2千分之
|
|
|
|
- //performance.setRoleCommissionRate(new BigDecimal("0.15")); //头条设计师leader提成比例,在有平面设计师的情况下
|
|
|
|
- //performance.setTotalPerformance(quarterCost.multiply(new BigDecimal("0.15")).multiply(new BigDecimal("0.002")));
|
|
|
|
- //performance.setUserId(designLeader.getUserId());
|
|
|
|
- //performance.setVideoEfficiency(null); //项目设计师leader没有视频有效率一说
|
|
|
|
- //performanceMapper.insert(performance);
|
|
|
|
}
|
|
}
|
|
|
|
|
|
//循环planeMap插入数据
|
|
//循环planeMap插入数据
|
|
@@ -1677,7 +1613,7 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
performance.setRoleId(designLeaderMap.get(key).getRoleId());
|
|
performance.setRoleId(designLeaderMap.get(key).getRoleId());
|
|
performance.setQuarter(thisQuarter);
|
|
performance.setQuarter(thisQuarter);
|
|
performance.setYear(thisYear);
|
|
performance.setYear(thisYear);
|
|
- //performance.setCommissionRate(new BigDecimal("0.002")); //头条平台比例2‰
|
|
|
|
|
|
+ performance.setCommissionRate(new BigDecimal("0.002")); //头条平台比例2‰
|
|
performance.setTotalCost(designLeaderMap.get(key).getCost());
|
|
performance.setTotalCost(designLeaderMap.get(key).getCost());
|
|
performance.setTotalPerformance(designLeaderMap.get(key).getEffiRate()); //头条
|
|
performance.setTotalPerformance(designLeaderMap.get(key).getEffiRate()); //头条
|
|
//performance.setRoleCommissionRate(new BigDecimal("0.05"));
|
|
//performance.setRoleCommissionRate(new BigDecimal("0.05"));
|
|
@@ -2706,7 +2642,7 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
|
|
|
|
//快手优化季度绩效报表
|
|
//快手优化季度绩效报表
|
|
@Override
|
|
@Override
|
|
- public List<UserDto2> kuaishouYouhuaQuarterReport(Integer year, Integer quarter) {
|
|
|
|
|
|
+ public List<UserDto2> kuaishouYouhuaQuarterReport(Integer year, Integer quarter) {
|
|
Integer appType = 2;
|
|
Integer appType = 2;
|
|
//1 获取快手下所有人
|
|
//1 获取快手下所有人
|
|
List<UserDto2> userDto2List = userEfficientVideoMapMapper.getKuaishouYunyingDepartUserInfo();
|
|
List<UserDto2> userDto2List = userEfficientVideoMapMapper.getKuaishouYunyingDepartUserInfo();
|
|
@@ -2768,12 +2704,26 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
}
|
|
}
|
|
|
|
|
|
//根据projectId获取其下账户季度消耗信息
|
|
//根据projectId获取其下账户季度消耗信息
|
|
- public List<AccountDTO> getQuarterAccountDetail(Integer year, Integer quarter, Integer appType){
|
|
|
|
- return userEfficientVideoMapMapper.getQuarterAccountDetail(year, quarter, appType);
|
|
|
|
|
|
+ public List<AccountDTO> getQuarterAccountDetail(Integer year, Integer quarter, Integer projectId, Integer appType){
|
|
|
|
+ return userEfficientVideoMapMapper.getQuarterAccountDetail(year, quarter, projectId, appType);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ //根据accountId获取季度视频信息
|
|
|
|
+ public List<VideoDTO> getKuaishouQuarterVideoInfoByAccountId(Integer year, Integer quarter, Long accountId){
|
|
|
|
+ Map<String,String> dateMap = DateUtils.quarterStartEndDate(year, quarter);
|
|
|
|
+ String startDate = dateMap.get("startDate");
|
|
|
|
+ String endDate = dateMap.get("endDate");
|
|
|
|
+ return userEfficientVideoMapMapper.getKuaishouQuarterVideoInfoByAccountId(startDate, endDate, accountId);
|
|
|
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
+ //根据accountId获取季度视频信息
|
|
|
|
+ public List<VideoDTO> getToutiaoQuarterVideoInfoByAccountId(Integer year, Integer quarter, Long accountId){
|
|
|
|
+ Map<String,String> dateMap = DateUtils.quarterStartEndDate(year, quarter);
|
|
|
|
+ String startDate = dateMap.get("startDate");
|
|
|
|
+ String endDate = dateMap.get("endDate");
|
|
|
|
+ return userEfficientVideoMapMapper.getToutiaoQuarterVideoInfoByAccountId(startDate, endDate, accountId);
|
|
|
|
+ }
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|