feature(*): 考评报表修改

考评报表修改

feature(*): 考评报表修改
考评报表修改
姜超
1 parent 69622222
Showing 3 changed files with 23 additions and 259 deletions
fw-morax-domain/src/main/java/cn/fw/morax/domain/db/salary/ReportSalaryDim.java
fw-morax-domain/src/main/java/cn/fw/morax/domain/enums/EvalUseTargetEnum.java
fw-morax-server/src/main/java/cn/fw/morax/server/task/SalaryReportTask.java
@@ -93,7 +93,7 @@ public class ReportSalaryDim extends BaseEntity&lt;ReportSalaryDim, Long&gt; {
     private StarLevelEnum starLevel;
     /**
-     * 总薪酬  =  actRevenueTotalMoney(总收入合计) - actDeductTotalMoney(总扣除合计)
+     * 总薪酬
      */
     private BigDecimal totalReward;
@@ -102,64 +102,4 @@ public class ReportSalaryDim extends BaseEntity&lt;ReportSalaryDim, Long&gt; {
      */
     private BigDecimal kpiScoreRatio;
-    /**
-     * 总收入合计
-     */
-    private BigDecimal actRevenueTotalMoney;
-
-    /**
-     * 总绩效提成
-     */
-    private BigDecimal actKpiMoney;
-
-    /**
-     * 总内部奖励
-     */
-    private BigDecimal actAwardMoney;
-
-    /**
-     * 总福利补贴
-     */
-    private BigDecimal actSubsidyMoney;
-
-    /**
-     * 总试用期工资
-     */
-    private BigDecimal actProbationMoney;
-
-    /**
-     * 总岗位最低补偿
-     */
-    private BigDecimal actJobCompensateMoney;
-
-    /**
-     * 总考评奖励
-     */
-    private BigDecimal actEvalAwardMoney;
-
-    /**
-     * 总扣除合计
-     */
-    private BigDecimal actDeductTotalMoney;
-
-    /**
-     * 总内部罚款扣除
-     */
-    private BigDecimal actPenaltyMoney;
-
-    /**
-     * 总社保扣除
-     */
-    private BigDecimal actNecessaryMoney;
-
-    /**
-     * 总个税扣除
-     */
-    private BigDecimal actPersonTaxMoney;
-
-    /**
-     * 总公积金扣除
-     */
-    private BigDecimal actAccumulationFundMoney;
-
 }
@@ -16,7 +16,7 @@ public enum EvalUseTargetEnum implements IEnum&lt;Integer&gt; {
      */
     NO(1, "无目标"),
     FIRST_TARGET(2, "第一目标"),
-    EXTRA_TARGET(3, "额外目标值"),
+    EXTRA_TARGET(2, "额外目标值"),
     ;
     /**
@@ -6,7 +6,7 @@ import cn.fw.morax.common.constant.TimeTaskConstant;
 import cn.fw.morax.common.utils.DateUtil;
 import cn.fw.morax.common.utils.PublicUtil;
 import cn.fw.morax.domain.bo.salary.SalaryGroupProjectBO;
-import cn.fw.morax.domain.db.kpi.IndicatorUserValue;
+import cn.fw.morax.domain.db.kpi.*;
 import cn.fw.morax.domain.db.salary.*;
 import cn.fw.morax.domain.enums.*;
 import cn.fw.morax.domain.vo.salary.SalaryGroupProjectParamVO;
@@ -49,8 +49,6 @@ import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.Lock;
 import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.function.ToDoubleFunction;
 import java.util.stream.Collectors;
 /**
@@ -88,7 +86,6 @@ public class SalaryReportTask {
     private final CommonService commonService;
     private final EhrRpcService ehrRpcService;
     private final OopRpcService oopRpcService;
-    private final SalaryPoolDetailService salaryPoolDetailService;
     @Value("${special-indicator-code.car-series}")
@@ -226,12 +223,10 @@ public class SalaryReportTask {
                                                   List<SalaryPool> pools,
                                                   Long reportSalaryId) {
         MultiKeyMap<Long, BigDecimal> userSalaryMap = this.getUserIndicatorHitMap(salaryGroupProjects, date, pools);
-        Map<Long, List<SalaryPoolDetail>> salaryPoolDetailMap = this.getSalaryPoolDetailMap(date, pools);
         List<ReportSalaryDimValue> reportSalaryValues = new ArrayList<>();
         //人的维度为基础,计算各个指标信息对应的数据
         for (SalaryPool pool : pools) {
-            List<SalaryPoolDetail> salaryPoolIdDetails = Optional.ofNullable(salaryPoolDetailMap.get(pool.getId())).orElse(Collections.emptyList());
-            ReportSalaryDim reportSalaryDim = saveStaffDim(pool, date, reportSalaryId,salaryPoolIdDetails);
+            ReportSalaryDim reportSalaryDim = saveStaffDim(pool, date, reportSalaryId);
             userDims.add(reportSalaryDim);
             final Long userId = pool.getUserId();
             final Long reportSalaryDimId = reportSalaryDim.getId();
@@ -291,7 +286,9 @@ public class SalaryReportTask {
             if (PublicUtil.isEmpty(shopDimReportIds)) {
                 continue;
             }
-            final Long shopReportSalaryDimId = this.saveShopDimDB(shopId, shopMap, date, reportSalaryId, userDims, shopDimReportIds);
+            BigDecimal averageSalary = calcAverageTotalSalary(userDims, shopDimReportIds);
+            BigDecimal kpiScoreRatio = calcAverageKpiScoreRatio(userDims, shopDimReportIds);
+            final Long shopReportSalaryDimId = this.saveShopDimDB(shopId, shopMap, date, reportSalaryId, averageSalary, kpiScoreRatio);
             for (SalaryGroupProjectBO salaryGroupProject : salaryGroupProjects) {
                 BigDecimal value = calcAverageValue(userSalaryValues, shopDimReportIds, salaryGroupProject.getId().toString());
@@ -344,9 +341,9 @@ public class SalaryReportTask {
             if (PublicUtil.isEmpty(managerStaffDimReportIds)) {
                 continue;
             }
-            //BigDecimal kpiScoreRatio = calcAverageKpiScoreRatio(userDims, managerStaffDimReportIds);
-            //BigDecimal averageSalary = calcAverageTotalSalary(userDims, managerStaffDimReportIds);
-            final Long reportSalaryDimId = this.saveManagerDimDB(manager, date, reportSalaryId, managerMap,manageStaffIds,managerStaffDimReportIds,userDims);
+            BigDecimal kpiScoreRatio = calcAverageKpiScoreRatio(userDims, managerStaffDimReportIds);
+            BigDecimal averageSalary = calcAverageTotalSalary(userDims, managerStaffDimReportIds);
+            final Long reportSalaryDimId = this.saveManagerDimDB(manager, date, reportSalaryId, managerMap, averageSalary, kpiScoreRatio, manageStaffIds);
             for (SalaryGroupProjectBO salaryGroupProject : salaryGroupProjects) {
                 BigDecimal value = calcAverageValue(userSalaryValues, managerStaffDimReportIds, salaryGroupProject.getId().toString());
                 childReportSalaryDimValues.add(this.convertProjectValueDB(salaryGroupProject, value));
@@ -374,44 +371,6 @@ public class SalaryReportTask {
         return staffInfos.stream().collect(Collectors.toMap(StaffBaseInfoDTO::getId, Function.identity(), (v1, v2) -> v1));
     }
-    /**
-     * 抽象处理平均值计算
-     * @param data
-     * @param predicate
-     * @param field
-     * @return
-     */
-    private <T> BigDecimal calcAverage(final Collection<T> data,Predicate<T> predicate, final ToDoubleFunction<T> field) {
-        if (CollectionUtils.isEmpty(data)) {
-            return BigDecimal.ZERO;
-        }
-        Double averageRatioDouble = data.stream()
-                .filter(predicate)
-                .mapToDouble(field)
-                .average()
-                .orElse(0);
-        return BigDecimal.valueOf(averageRatioDouble);
-    }
-
-    /**
-     * 抽象处理平均值计算
-     * @param data
-     * @param field
-     * @return
-     * @param <T>
-     */
-    private <T> BigDecimal calcAverage(final Collection<T> data, final ToDoubleFunction<T> field) {
-        if (CollectionUtils.isEmpty(data)) {
-            return BigDecimal.ZERO;
-        }
-        Double averageRatioDouble = data.stream()
-                .mapToDouble(field)
-                .average()
-                .orElse(0);
-        return BigDecimal.valueOf(averageRatioDouble);
-    }
-
-
     public BigDecimal calcAverageTotalSalary(List<ReportSalaryDim> dims, Set<Long> ReportDimIds) {
         Double averageRatioDouble = dims.stream()
                 .filter(user -> ReportDimIds.contains(user.getId()))
@@ -439,12 +398,8 @@ public class SalaryReportTask {
         return new BigDecimal(averageRatioDouble.toString());
     }
-    public Long saveShopDimDB(Long shopId,
-                              Map<Long, String> shopMap,
-                              LocalDate date,
-                              Long reportSalaryId,
-                              List<ReportSalaryDim> userDims,
-                              Set<Long> shopDimReportIds) {
+    public Long saveShopDimDB(Long shopId, Map<Long, String> shopMap,
+                                         LocalDate date, Long reportSalaryId, BigDecimal averageSalary, BigDecimal kpiScoreRatio) {
         ReportSalaryDim reportSalaryDim = new ReportSalaryDim();
         reportSalaryDim.setDimension(ReportDimensionEnum.SHOP);
         reportSalaryDim.setReferId(shopId);
@@ -452,118 +407,24 @@ public class SalaryReportTask {
         reportSalaryDim.setShopName(shopMap.get(shopId));
         reportSalaryDim.setDataDate(date);
         reportSalaryDim.setReportSalaryId(reportSalaryId);
-        //计算平均值薪酬的额外项
-        extCalcAverage(userDims, shopDimReportIds, reportSalaryDim);
+        reportSalaryDim.setTotalReward(averageSalary);
+        reportSalaryDim.setKpiScoreRatio(kpiScoreRatio);
         reportSalaryDimService.save(reportSalaryDim);
         return reportSalaryDim.getId();
     }
-
-    /**
-     * 计算平均值薪酬的额外项
-     * @param userDims
-     * @param shopDimReportIds
-     * @param reportSalaryDim
-     */
-    private void extCalcAverage(List<ReportSalaryDim> userDims, Set<Long> shopDimReportIds, ReportSalaryDim reportSalaryDim) {
-        List<ReportSalaryDim> filterUserDims = userDims.stream().filter(e -> shopDimReportIds.contains(e.getId())).collect(Collectors.toList());
-        //绩效得分率(N)
-        reportSalaryDim.setKpiScoreRatio(calcAverage(filterUserDims, e -> Optional.ofNullable(e.getKpiScoreRatio()).orElse(BigDecimal.ZERO).doubleValue()));
-        //收入-平均值
-        reportSalaryDim.setActKpiMoney(calcAverage(filterUserDims, e -> Optional.ofNullable(e.getActKpiMoney()).orElse(BigDecimal.ZERO).doubleValue()));
-        reportSalaryDim.setActAwardMoney(calcAverage(filterUserDims, e -> Optional.ofNullable(e.getActAwardMoney()).orElse(BigDecimal.ZERO).doubleValue()));
-        reportSalaryDim.setActSubsidyMoney(calcAverage(filterUserDims, e -> Optional.ofNullable(e.getActSubsidyMoney()).orElse(BigDecimal.ZERO).doubleValue()));
-        reportSalaryDim.setActProbationMoney(calcAverage(filterUserDims, e -> Optional.ofNullable(e.getActProbationMoney()).orElse(BigDecimal.ZERO).doubleValue()));
-        reportSalaryDim.setActJobCompensateMoney(calcAverage(filterUserDims, e -> Optional.ofNullable(e.getActJobCompensateMoney()).orElse(BigDecimal.ZERO).doubleValue()));
-        reportSalaryDim.setActEvalAwardMoney(calcAverage(filterUserDims, e -> Optional.ofNullable(e.getActEvalAwardMoney()).orElse(BigDecimal.ZERO).doubleValue()));
-        //总收入合计平均值
-        reportSalaryDim.setActRevenueTotalMoney(calcAverage(filterUserDims, e -> Optional.ofNullable(e.getActRevenueTotalMoney()).orElse(BigDecimal.ZERO).doubleValue()));
-        //reportSalaryDim.setActRevenueTotalMoney(
-        //        reportSalaryDim.getActKpiMoney()
-        //                .add(reportSalaryDim.getActAwardMoney())
-        //                .add(reportSalaryDim.getActSubsidyMoney())
-        //                .add(reportSalaryDim.getActProbationMoney())
-        //                .add(reportSalaryDim.getActJobCompensateMonry())
-        //                .add(reportSalaryDim.getActEvalAwardMoney())
-        //);
-        //扣除-平均值
-        reportSalaryDim.setActPenaltyMoney(calcAverage(filterUserDims, e -> Optional.ofNullable(e.getActPenaltyMoney()).orElse(BigDecimal.ZERO).doubleValue()));
-        reportSalaryDim.setActNecessaryMoney(calcAverage(filterUserDims, e -> Optional.ofNullable(e.getActNecessaryMoney()).orElse(BigDecimal.ZERO).doubleValue()));
-        reportSalaryDim.setActPersonTaxMoney(calcAverage(filterUserDims, e -> Optional.ofNullable(e.getActPersonTaxMoney()).orElse(BigDecimal.ZERO).doubleValue()));
-        reportSalaryDim.setActAccumulationFundMoney(calcAverage(filterUserDims, e -> Optional.ofNullable(e.getActAccumulationFundMoney()).orElse(BigDecimal.ZERO).doubleValue()));
-        //总扣除合计平均值
-        reportSalaryDim.setActDeductTotalMoney(calcAverage(filterUserDims, e -> Optional.ofNullable(e.getActDeductTotalMoney()).orElse(BigDecimal.ZERO).doubleValue()));
-        //reportSalaryDim.setActDeductTotalMoney(
-        //        reportSalaryDim.getActPenaltyMoney()
-        //                .add(reportSalaryDim.getActNecessaryMoney())
-        //                .add(reportSalaryDim.getActPersonTaxMoney())
-        //                .add(reportSalaryDim.getActAccumulationFundMoney())
-        //);
-        //总薪酬平均值 = 总收入合计 - 总扣除合计 or 直接取平均值
-        reportSalaryDim.setTotalReward(calcAverage(filterUserDims, e -> Optional.ofNullable(e.getTotalReward()).orElse(BigDecimal.ZERO).doubleValue()));
-        //reportSalaryDim.setTotalReward(
-        //        reportSalaryDim.getActRevenueTotalMoney()
-        //                .subtract(reportSalaryDim.getActDeductTotalMoney()));
-    }
-
-    /**
-     * 计算人员的
-     * 增加 薪资类型相关项目处理 ++
-     * @param salaryPoolDetails
-     * @param reportSalaryDim
-     */
-    private void extCaleUserMoney(List<SalaryPoolDetail> salaryPoolDetails, ReportSalaryDim reportSalaryDim) {
-        //额外计算项++
-        Map<SalaryTypeEnum, List<SalaryPoolDetail>> salaryTypeEnumListMap = salaryPoolDetails
-                .stream()
-                .collect(Collectors.groupingBy(SalaryPoolDetail::getType));
-        //收入
-        reportSalaryDim.setActKpiMoney(getSalaryTypeEnumMoney(salaryTypeEnumListMap,SalaryTypeEnum.ROYALTIES));
-        reportSalaryDim.setActAwardMoney(getSalaryTypeEnumMoney(salaryTypeEnumListMap,SalaryTypeEnum.AWARD));
-        reportSalaryDim.setActSubsidyMoney(getSalaryTypeEnumMoney(salaryTypeEnumListMap,SalaryTypeEnum.SUBSIDY));
-        reportSalaryDim.setActProbationMoney(getSalaryTypeEnumMoney(salaryTypeEnumListMap,SalaryTypeEnum.PROBATION));
-        reportSalaryDim.setActJobCompensateMoney(BigDecimal.ZERO);
-        reportSalaryDim.setActEvalAwardMoney(BigDecimal.ZERO);
-        //总收入合计
-        reportSalaryDim.setActRevenueTotalMoney(
-                reportSalaryDim.getActKpiMoney()
-                        .add(reportSalaryDim.getActAwardMoney())
-                        .add(reportSalaryDim.getActSubsidyMoney())
-                        .add(reportSalaryDim.getActProbationMoney())
-                        .add(reportSalaryDim.getActJobCompensateMoney())
-                        .add(reportSalaryDim.getActEvalAwardMoney())
-        );
-        //扣除
-        reportSalaryDim.setActPenaltyMoney(getSalaryTypeEnumMoney(salaryTypeEnumListMap,SalaryTypeEnum.PENALTY));
-        reportSalaryDim.setActNecessaryMoney(getSalaryTypeEnumMoney(salaryTypeEnumListMap,SalaryTypeEnum.NECESSARY));
-        reportSalaryDim.setActPersonTaxMoney(getSalaryTypeEnumMoney(salaryTypeEnumListMap,SalaryTypeEnum.PERSON_TAX));
-        reportSalaryDim.setActAccumulationFundMoney(BigDecimal.ZERO);
-        //总扣除合计
-        reportSalaryDim.setActDeductTotalMoney(
-                reportSalaryDim.getActPenaltyMoney()
-                        .add(reportSalaryDim.getActNecessaryMoney())
-                        .add(reportSalaryDim.getActPersonTaxMoney())
-                        .add(reportSalaryDim.getActAccumulationFundMoney())
-        );
-        //总薪酬 = 总收入合计 - 总扣除合计
-        reportSalaryDim.setTotalReward(
-                reportSalaryDim.getActRevenueTotalMoney()
-                        .subtract(reportSalaryDim.getActDeductTotalMoney()));
-    }
-
-
     public Long saveManagerDimDB(ManagerDTO manager,
                                  LocalDate date,
                                  Long reportSalaryId,
                                  Map<Long, StaffBaseInfoDTO> managerMap,
-                                 List<Long> manageStaffIds,
-                                 Set<Long> managerStaffDimReportIds,
-                                 List<ReportSalaryDim> userDims) {
+                                 BigDecimal averageSalary,
+                                 BigDecimal kpiScoreRatio,
+                                 List<Long> manageStaffIds) {
         ReportSalaryDim reportSalaryDim = new ReportSalaryDim();
         reportSalaryDim.setDimension(ReportDimensionEnum.MANAGER);
         reportSalaryDim.setUserId(manager.getStaffId());
         reportSalaryDim.setUserName(manager.getStaffName());
-        //计算平均值薪酬的额外项
-        extCalcAverage(userDims, managerStaffDimReportIds, reportSalaryDim);
+        reportSalaryDim.setTotalReward(averageSalary);
+        reportSalaryDim.setKpiScoreRatio(kpiScoreRatio);
         reportSalaryDim.setDataDate(date);
         reportSalaryDim.setReportSalaryId(reportSalaryId);
         if (managerMap.containsKey(manager.getStaffId())) {
@@ -689,25 +550,7 @@ public class SalaryReportTask {
         return userGroupIndicatorHitMap;
     }
-    /**
-     * 这个薪酬详情每天6:00 会计算完成,cn.fw.morax.server.task.SalaryCalcTask#cacheCalculableKpiGroup()
-     * @param date
-     * @param pools
-     * @return <薪酬池id: 薪酬池详情list>
-     */
-    private Map<Long, List<SalaryPoolDetail>> getSalaryPoolDetailMap(LocalDate date, List<SalaryPool> pools) {
-        if (CollectionUtils.isEmpty(pools)){
-            return Collections.emptyMap();
-        }
-        List<SalaryPoolDetail> salaryPoolDetailList = salaryPoolDetailService.list(Wrappers.<SalaryPoolDetail>lambdaQuery()
-                .in(SalaryPoolDetail::getSalaryPoolId, pools.stream().map(SalaryPool::getId).collect(Collectors.toSet()))
-                .eq(SalaryPoolDetail::getSalaryDate, date)
-                .eq(SalaryPoolDetail::getYn, Boolean.TRUE));
-        if (CollectionUtils.isEmpty(salaryPoolDetailList)){
-            return Collections.emptyMap();
-        }
-        return salaryPoolDetailList.stream().collect(Collectors.groupingBy(SalaryPoolDetail::getSalaryPoolId));
-    }
+
     public Map<Long, SalaryGroupProjectTargetHitLog> queryUserTargetValue(Long referId, Long userId, LocalDate dataDate) {
         List<SalaryGroupProjectTargetHitLog> targetHitLogs = salaryGroupProjectTargetHitLogService.list(Wrappers.<SalaryGroupProjectTargetHitLog>lambdaQuery()
@@ -858,8 +701,7 @@ public class SalaryReportTask {
                     projectBO.setCodeType(codeType);
                     break;
                 }
-                case FIXATION:
-                case CAR_SERIES: {
+                case FIXATION: CAR_SERIES: {
                     projectBO.setCode(project.getCommissionCode());
                     projectBO.setCodeType(IndicatorCodeTypeEnum.COMBINE_INDICATOR);
                     break;
@@ -879,7 +721,7 @@ public class SalaryReportTask {
         return projects;
     }
-    public ReportSalaryDim saveStaffDim(SalaryPool pool, LocalDate date, Long reportSalaryRankId,List<SalaryPoolDetail> salaryPoolDetails){
+    public ReportSalaryDim saveStaffDim(SalaryPool pool, LocalDate date, Long reportSalaryRankId){
         ReportSalaryDim reportSalaryDim = new ReportSalaryDim();
         reportSalaryDim.setDimension(ReportDimensionEnum.STAFF);
         reportSalaryDim.setReferId(pool.getUserId());
@@ -893,32 +735,14 @@ public class SalaryReportTask {
         reportSalaryDim.setDataDate(date);
         reportSalaryDim.setReportSalaryId(reportSalaryRankId);
         reportSalaryDim.setStarLevel(pool.getStarLevel());
+        reportSalaryDim.setTotalReward(pool.getReward());
 //        KpiPool kpiPool = kpiPoolCommonService.queryPool(pool);
 //        if (PublicUtil.isNotEmpty(kpiPool)) {
 //            BigDecimal kpiScoreRatio = Optional.ofNullable(kpiPool.getKpiScoreRatio()).orElse(BigDecimal.ZERO);
 //            reportSalaryDim.setKpiScoreRatio(kpiScoreRatio.multiply(Constant.ONE_HUNDRED));
 //        }
-        //薪资类型相关项目处理
-        extCaleUserMoney(salaryPoolDetails, reportSalaryDim);
         reportSalaryDimService.save(reportSalaryDim);
         return reportSalaryDim;
     }
-    /**
-     * 获取 SalaryTypeEnum 对应的薪酬总值
-     * @param salaryTypeEnumListMap
-     * @param salaryTypeEnum
-     * @return
-     */
-    private BigDecimal getSalaryTypeEnumMoney(Map<SalaryTypeEnum, List<SalaryPoolDetail>> salaryTypeEnumListMap,SalaryTypeEnum salaryTypeEnum){
-        if (CollectionUtils.isEmpty(salaryTypeEnumListMap)){
-            return BigDecimal.ZERO;
-        }
-        List<SalaryPoolDetail> list = salaryTypeEnumListMap.get(salaryTypeEnum);
-        if (CollectionUtils.isEmpty(list)){
-            return BigDecimal.ZERO;
-        }
-        return list.stream().filter(Objects::nonNull).map(SalaryPoolDetail::getSalaryAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
-    }
-
 }