Commit 501244c6bc1e8cf0ad134ed4011ba62b3d1a8935

Authored by 姜超
1 parent efc347d8

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

考评报表抽取修改
fw-morax-domain/src/main/java/cn/fw/morax/domain/db/eval/EvalUserRankStageReport.java
... ... @@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode;
9 9 import lombok.experimental.Accessors;
10 10  
11 11 import java.time.LocalDate;
  12 +import java.time.LocalDateTime;
12 13 import java.time.YearMonth;
13 14 import java.util.List;
14 15  
... ... @@ -57,11 +58,11 @@ public class EvalUserRankStageReport extends BaseEntity<EvalUserRankStageReport,
57 58 /**
58 59 * 生效时间
59 60 */
60   - private LocalDate beginTime;
  61 + private LocalDateTime beginTime;
61 62  
62 63 /**
63 64 * 结束时间
64 65 */
65   - private LocalDate overTime;
  66 + private LocalDateTime overTime;
66 67  
67 68 }
... ...
fw-morax-server/src/main/java/cn/fw/morax/server/task/EvalUserReportTask.java
... ... @@ -3,6 +3,7 @@ package cn.fw.morax.server.task;
3 3 import cn.fw.common.cache.locker.DistributedLocker;
4 4 import cn.fw.morax.common.constant.Constant;
5 5 import cn.fw.morax.common.constant.TimeTaskConstant;
  6 +import cn.fw.morax.common.utils.DateUtil;
6 7 import cn.fw.morax.common.utils.PublicUtil;
7 8 import cn.fw.morax.domain.bo.salary.SalaryGroupProjectBO;
8 9 import cn.fw.morax.domain.db.eval.*;
... ... @@ -185,7 +186,10 @@ public class EvalUserReportTask {
185 186 //门店维度
186 187 calcShop(shopPools, evalGroupIndicators, evalShopReports, dataDate);
187 188 //管理者维度
188   - calcManager(userPools, reportUserValues, rankCodes, evalUserReports, rankStageReport, dataDate);
  189 + //门店维度
  190 + calcShop(shopPools, evalGroupIndicators, evalShopReports, dataDate);
  191 + //门店维度
  192 + calcManager(userPools, reportUserValues, rankCodes, evalUserReports, rankStageReport, date);
189 193 }
190 194  
191 195  
... ... @@ -319,7 +323,7 @@ public class EvalUserReportTask {
319 323 if (PublicUtil.isEmpty(pools)) {
320 324 return;
321 325 }
322   - List<Long> shopIds = pools.stream().map(EvalUserPool::getShopId).distinct().collect(Collectors.toList());
  326 + List<Long> shopIds = pools.stream().map(EvalUserPool::getShopId).collect(Collectors.toList());
323 327 List<ManagerDTO> managerDTOS = ehrRpcService.getRealTimeShopManager(new ArrayList<>(shopIds));
324 328 log.info("查询门店实时管理者:{},{}", JSON.toJSONString(shopIds), JSON.toJSONString(managerDTOS));
325 329 if (PublicUtil.isEmpty(managerDTOS)) {
... ... @@ -601,8 +605,8 @@ public class EvalUserReportTask {
601 605 reportRankStage.setStageName(rankStage.getName());
602 606 }
603 607 reportRankStage.setEvalGroupIds(evalGroupIds);
604   - reportRankStage.setBeginTime(rankStage.getBeginTime());
605   - reportRankStage.setOverTime(rankStage.getOverTime());
  608 + reportRankStage.setBeginTime(rankStage.getBeginTime().atTime(0,0,1));
  609 + reportRankStage.setOverTime(rankStage.getOverTime().atTime(23,23,59));
606 610 evalUserRankStageReportService.save(reportRankStage);
607 611 return reportRankStage;
608 612 }
... ...