From 501244c6bc1e8cf0ad134ed4011ba62b3d1a8935 Mon Sep 17 00:00:00 2001
From: jiangchao <jiangchao@feewee.cn>
Date: Fri, 26 May 2023 18:16:06 +0800
Subject: [PATCH] feature(*): 考评报表抽取修改

---
 fw-morax-domain/src/main/java/cn/fw/morax/domain/db/eval/EvalUserRankStageReport.java |  5 +++--
 fw-morax-server/src/main/java/cn/fw/morax/server/task/EvalUserReportTask.java         | 12 ++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/fw-morax-domain/src/main/java/cn/fw/morax/domain/db/eval/EvalUserRankStageReport.java b/fw-morax-domain/src/main/java/cn/fw/morax/domain/db/eval/EvalUserRankStageReport.java
index 6502910..b721dc6 100644
--- a/fw-morax-domain/src/main/java/cn/fw/morax/domain/db/eval/EvalUserRankStageReport.java
+++ b/fw-morax-domain/src/main/java/cn/fw/morax/domain/db/eval/EvalUserRankStageReport.java
@@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.YearMonth;
 import java.util.List;
 
@@ -57,11 +58,11 @@ public class EvalUserRankStageReport extends BaseEntity<EvalUserRankStageReport,
     /**
      * 生效时间
      */
-    private LocalDate beginTime;
+    private LocalDateTime beginTime;
 
     /**
      * 结束时间
      */
-    private LocalDate overTime;
+    private LocalDateTime overTime;
 
 }
diff --git a/fw-morax-server/src/main/java/cn/fw/morax/server/task/EvalUserReportTask.java b/fw-morax-server/src/main/java/cn/fw/morax/server/task/EvalUserReportTask.java
index de236a1..9783d9c 100644
--- a/fw-morax-server/src/main/java/cn/fw/morax/server/task/EvalUserReportTask.java
+++ b/fw-morax-server/src/main/java/cn/fw/morax/server/task/EvalUserReportTask.java
@@ -3,6 +3,7 @@ package cn.fw.morax.server.task;
 import cn.fw.common.cache.locker.DistributedLocker;
 import cn.fw.morax.common.constant.Constant;
 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.eval.*;
@@ -185,7 +186,10 @@ public class EvalUserReportTask {
             //门店维度
             calcShop(shopPools, evalGroupIndicators, evalShopReports, dataDate);
             //管理者维度
-            calcManager(userPools, reportUserValues, rankCodes, evalUserReports, rankStageReport, dataDate);
+            //门店维度
+            calcShop(shopPools, evalGroupIndicators, evalShopReports, dataDate);
+            //门店维度
+            calcManager(userPools, reportUserValues, rankCodes, evalUserReports, rankStageReport, date);
         }
 
 
@@ -319,7 +323,7 @@ public class EvalUserReportTask {
         if (PublicUtil.isEmpty(pools)) {
             return;
         }
-        List<Long> shopIds = pools.stream().map(EvalUserPool::getShopId).distinct().collect(Collectors.toList());
+        List<Long> shopIds = pools.stream().map(EvalUserPool::getShopId).collect(Collectors.toList());
         List<ManagerDTO> managerDTOS = ehrRpcService.getRealTimeShopManager(new ArrayList<>(shopIds));
         log.info("查询门店实时管理者：{}，{}", JSON.toJSONString(shopIds), JSON.toJSONString(managerDTOS));
         if (PublicUtil.isEmpty(managerDTOS)) {
@@ -601,8 +605,8 @@ public class EvalUserReportTask {
             reportRankStage.setStageName(rankStage.getName());
         }
         reportRankStage.setEvalGroupIds(evalGroupIds);
-        reportRankStage.setBeginTime(rankStage.getBeginTime());
-        reportRankStage.setOverTime(rankStage.getOverTime());
+        reportRankStage.setBeginTime(rankStage.getBeginTime().atTime(0,0,1));
+        reportRankStage.setOverTime(rankStage.getOverTime().atTime(23,23,59));
         evalUserRankStageReportService.save(reportRankStage);
         return reportRankStage;
     }
--
libgit2 0.22.2