feature(*): 考评报表抽取修改

考评报表抽取修改

feature(*): 考评报表抽取修改
考评报表抽取修改
姜超
1 parent 501244c6
Showing 2 changed files with 40 additions and 41 deletions
fw-morax-domain/src/main/java/cn/fw/morax/domain/db/eval/EvalUserRankStageReport.java
fw-morax-server/src/main/java/cn/fw/morax/server/task/EvalUserReportTask.java
@@ -25,7 +25,8 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName(autoResultMap = true)
-public class EvalUserRankStageReport extends BaseEntity<EvalUserRankStageReport, Long> {
+public class
+EvalUserRankStageReport extends BaseEntity<EvalUserRankStageReport, Long> {
     private static final long serialVersionUID = 1L;
@@ -40,6 +40,7 @@ import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.time.YearMonth;
 import java.time.temporal.TemporalAdjusters;
@@ -68,8 +69,6 @@ public class EvalUserReportTask {
     private final EvalUserRankStageReportService evalUserRankStageReportService;
     private final EvalUserValueReportService evalUserValueReportService;
     private final EvalGroupIndicatorService evalGroupIndicatorService;
-    private final IndicatorUserValueService indicatorUserValueService;
-    private final EvalIndicatorValueService evalIndicatorValueService;
     private final PlatformTransactionManager platformTransactionManager;
     private final EvalUserRankReportService evalUserRankReportService;
     private final EvalGroupRankStageService evalGroupRankStageService;
@@ -185,9 +184,6 @@ public class EvalUserReportTask {
             List<EvalUserValueReport> reportUserValues = calcUser(userPools, evalGroupIndicators, evalUserReports, dataDate);
             //门店维度
             calcShop(shopPools, evalGroupIndicators, evalShopReports, dataDate);
-            //管理者维度
-            //门店维度
-            calcShop(shopPools, evalGroupIndicators, evalShopReports, dataDate);
             //门店维度
             calcManager(userPools, reportUserValues, rankCodes, evalUserReports, rankStageReport, date);
         }
@@ -323,7 +319,7 @@ public class EvalUserReportTask {
         if (PublicUtil.isEmpty(pools)) {
             return;
         }
-        List<Long> shopIds = pools.stream().map(EvalUserPool::getShopId).collect(Collectors.toList());
+        List<Long> shopIds = pools.stream().map(EvalUserPool::getShopId).distinct().collect(Collectors.toList());
         List<ManagerDTO> managerDTOS = ehrRpcService.getRealTimeShopManager(new ArrayList<>(shopIds));
         log.info("查询门店实时管理者：{}，{}", JSON.toJSONString(shopIds), JSON.toJSONString(managerDTOS));
         if (PublicUtil.isEmpty(managerDTOS)) {
@@ -342,7 +338,8 @@ public class EvalUserReportTask {
             if (PublicUtil.isEmpty(managerStaffDimReportIds)) {
                 continue;
             }
-            final Long managerEvalUserReportId = this.saveManagerDimDB(manager, rankStageReport, managerMap, manageStaffIds, date);
+            EvalUserReport evalUserReport = createManager(rankStageReport, date);
+            final Long managerEvalUserReportId = this.saveManagerDimDB(evalUserReport, manager, pools, managerMap, manageStaffIds);
             for (EvalUserRankCodeReport codeReport : rankCodes) {
                 BigDecimal value = calcAverageValue(reportUserValues, managerStaffDimReportIds, codeReport.getCode());
@@ -428,6 +425,7 @@ public class EvalUserReportTask {
             report.setScoreRatio(shopPool.getScoreRatio().multiply(Constant.ONE_HUNDRED));
             report.setEvalUserRankStageReportId(evalUserRankStageReportId);
             report.setShopId(shopPool.getShopId());
+            report.setEvalShopPoolId(shopPool.getId());
             report.setShopName(shopPool.getShopName());
             report.setDataDate(date);
             evalShopReports.add(report);
@@ -436,33 +434,6 @@ public class EvalUserReportTask {
         return evalShopReports;
     }
-    public Map<Long, BigDecimal> queryUserOriginValue(EvalGroupIndicatorParam param, List<Long> userIds, LocalDate dataDate) {
-        final String code = param.getCode();
-        final IndicatorCodeTypeEnum codeType = param.getCodeType();
-        Map<Long, BigDecimal> referValueMap = Maps.newHashMapWithExpectedSize(userIds.size());
-        //无目标
-        if (IndicatorCodeTypeEnum.INDICATOR.equals(codeType)) {
-            List<IndicatorUserValue> indicatorUserValues = indicatorUserValueService.list(Wrappers.<IndicatorUserValue>lambdaQuery()
-                            .eq(IndicatorUserValue::getIndicatorCode, code)
-                            .eq(IndicatorUserValue::getDataDate, dataDate)
-                            .in(IndicatorUserValue::getUserId, userIds)
-                            .eq(IndicatorUserValue::getDimensionType, DimensionTypeEnum.STAFF)
-                            .eq(IndicatorUserValue::getYn, Boolean.TRUE)
-            );
-            for (IndicatorUserValue userValue : indicatorUserValues) {
-                referValueMap.put(userValue.getUserId(), commonService.queryIndicatorValueVO(code, userValue,
-                        param.getTargetType(), param.getDataType()));
-            }
-            return referValueMap;
-        }
-        for (Long userId : userIds) {
-            EvalIndicatorValue evalIndicatorValue = evalIndicatorValueService.queryLastValue(userId,
-                    DimensionTypeEnum.STAFF, code, dataDate);
-            referValueMap.put(userId, commonService.queryEvalIndicatorValueVO(code, evalIndicatorValue, param.getTargetType(), param.getDataType()));
-        }
-        return referValueMap;
-    }
-
     public Map<Long, EvalGroupIndicatorTargetHitLog> queryTargetValue(Long referId, List<Long> poolIds, LocalDate dataDate, EvalScopeEnum scopeType) {
         List<EvalGroupIndicatorTargetHitLog> targetHitLogs = evalGroupIndicatorTargetHitLogService.list(Wrappers.<EvalGroupIndicatorTargetHitLog>lambdaQuery()
                 .eq(EvalGroupIndicatorTargetHitLog::getReferId, referId)
@@ -611,16 +582,18 @@ public class EvalUserReportTask {
         return reportRankStage;
     }
-    public Long saveManagerDimDB(ManagerDTO manager, EvalUserRankStageReport rankStageReport,
-                                           Map<Long, StaffBaseInfoDTO> managerMap,
-                                           List<Long> manageStaffIds, LocalDate date) {
+    public EvalUserReport createManager(EvalUserRankStageReport rankStageReport, LocalDate date) {
         EvalUserReport evalUserReport = new EvalUserReport();
-        evalUserReport.setEvalUserRankReportId(rankStageReport.getEvalGroupRankId());
-        evalUserReport.setEvalUserRankStageReportId(rankStageReport.getEvalGroupRankStageId());
+        evalUserReport.setEvalUserRankReportId(rankStageReport.getEvalUserRankReportId());
+        evalUserReport.setEvalUserRankStageReportId(rankStageReport.getId());
         evalUserReport.setDimension(ReportDimensionEnum.MANAGER);
+        evalUserReport.setDataDate(date);
+        return evalUserReport;
+    }
+
+    public Long saveManagerDimDB(EvalUserReport evalUserReport, ManagerDTO manager, List<EvalUserPool> pools, Map<Long, StaffBaseInfoDTO> managerMap, List<Long> manageStaffIds) {
         evalUserReport.setUserId(manager.getStaffId());
         evalUserReport.setUserName(manager.getStaffName());
-        evalUserReport.setDataDate(date);
         if (managerMap.containsKey(manager.getStaffId())) {
             StaffBaseInfoDTO staffInfo = managerMap.get(manager.getStaffId());
             evalUserReport.setShopId(staffInfo.getShopId());
@@ -645,6 +618,31 @@ public class EvalUserReportTask {
                 .distinct()
                 .collect(Collectors.toList());
+        Double averageScoreDouble = pools.stream()
+                .filter(pool -> manageStaffIds.contains(pool.getUserId()))
+                .mapToDouble(userValue -> Optional.ofNullable(userValue.getScore()).orElse(BigDecimal.ZERO).doubleValue())
+                .average()
+                .orElse(0);
+        BigDecimal score = new BigDecimal(averageScoreDouble.toString()).divide(BigDecimal.ONE, 4, RoundingMode.HALF_UP);
+
+        Double averageScoreRatioDouble = pools.stream()
+                .filter(pool -> manageStaffIds.contains(pool.getUserId()))
+                .mapToDouble(userValue -> Optional.ofNullable(userValue.getScoreRatio()).orElse(BigDecimal.ZERO).doubleValue())
+                .average()
+                .orElse(0);
+        BigDecimal scoreRatio = new BigDecimal(averageScoreRatioDouble.toString()).divide(BigDecimal.ONE, 4, RoundingMode.HALF_UP);
+
+        Double averageRewardDouble = pools.stream()
+                .filter(pool -> manageStaffIds.contains(pool.getUserId()))
+                .mapToDouble(userValue -> Optional.ofNullable(userValue.getScore()).orElse(BigDecimal.ZERO).doubleValue())
+                .average()
+                .orElse(0);
+        BigDecimal reward = new BigDecimal(averageRewardDouble.toString()).divide(BigDecimal.ONE, 4, RoundingMode.HALF_UP);
+
+        evalUserReport.setScore(score);
+        evalUserReport.setScoreRatio(scoreRatio.multiply(Constant.ONE_HUNDRED));
+        evalUserReport.setReward(reward);
+
         evalUserReportService.save(evalUserReport);
         EvalUserExtraReport evalUserExtraReport = EvalUserExtraReport.builder()
                 .evalUserReportId(evalUserReport.getId())