KPI / fw-morax

Commit d192a4809557a78a3ef88acca1fc29d287921dc6

Authored by 姜超
1 parent f727712b

feature(*): 考评阶段指标上报 

考评阶段指标上报
Inline Side-by-side
Showing 5 changed files with 14 additions and 5 deletions
fw-morax-domain/src/main/java/cn/fw/morax/domain/dto/eval/EvalGroupDTO.java
  View file @d192a48
... ... @@ -30,13 +30,13 @@ public class EvalGroupDTO {
30 30 * 岗位id
31 31 */
32 32 // @NotNull(message = "岗位id不能为空")
33   - private Long postId;
  33 + private List<Long> postIds;
34 34  
35 35 /**
36 36 * 岗位名称
37 37 */
38 38 // @NotBlank(message = "岗位名称不能为空")
39   - private String postName;
  39 + private List<String> postNames;
40 40  
41 41 /**
42 42 * 适用门店ids
... ...
fw-morax-sdk/src/main/java/cn/fw/morax/sdk/api/ISalaryReportService.java
  View file @d192a48
... ... @@ -47,9 +47,9 @@ public interface ISalaryReportService {
47 47 Message<Void> subsidyProject(@Valid @RequestBody GeneralSalaryProjectReq generalSalaryProjectReq);
48 48  
49 49 /**
50   - * 社保扣款项上报
  50 + * 福利补贴项上报
51 51 *
52   - * @param generalSalaryProjectReqs 社保扣款
  52 + * @param generalSalaryProjectReqs 福利补贴项
53 53 */
54 54 @PostMapping("/subsidy/reports")
55 55 Message<Void> subsidyProjects(@Valid @RequestBody CustomList<GeneralSalaryProjectReq> generalSalaryProjectReqs);
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/biz/ApprovalBizService.java
  View file @d192a48
... ... @@ -215,7 +215,7 @@ public class ApprovalBizService {
215 215 Set<Long> postIds = new HashSet<>();
216 216 Set<Long> shopIds = new HashSet<>();
217 217 for (EvalGroupDTO evalGroupDTO : evalGroups) {
218   - postIds.add(evalGroupDTO.getPostId());
  218 +// postIds.add(evalGroupDTO.getPostId());
219 219 shopIds.addAll(evalGroupDTO.getShopIds());
220 220 }
221 221  
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalGroupBizService.java
  View file @d192a48
... ... @@ -90,6 +90,12 @@ public class EvalGroupBizService {
90 90 sortRewardRankLadders(evalGroupDTO.getRewards());
91 91 this.setTargetVos(evalGroupDTO);
92 92 evalGroupSize.incrementAndGet();
  93 + List<Long> postIds = evalGroupDTO.getRewards().stream().flatMap(reward -> reward.getPostIds().stream())
  94 + .distinct().collect(Collectors.toList());
  95 + List<String> postNames = evalGroupDTO.getRewards().stream().flatMap(reward -> reward.getPostNames().stream())
  96 + .distinct().collect(Collectors.toList());
  97 + evalGroupDTO.setPostIds(postIds);
  98 + evalGroupDTO.setPostNames(postNames);
93 99 }
94 100 lastStageOverTime = stage.getOverTime();
95 101 }
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalGroupDataService.java
  View file @d192a48
... ... @@ -51,6 +51,7 @@ public class EvalGroupDataService {
51 51 EvalGroupRank evalGroupRank = PublicUtil.copy(dto, EvalGroupRank.class);
52 52 evalGroupRank.setId(null);
53 53 evalGroupRank.setStatus(SettingStatusEnum.EFFECTIVE);
  54 +
54 55 evalGroupRankService.save(evalGroupRank);
55 56 //之前的考评 删除
56 57 if (PublicUtil.isNotEmpty(dto.getId())) {
... ... @@ -112,6 +113,8 @@ public class EvalGroupDataService {
112 113 EvalGroup evalGroup = PublicUtil.copy(dto, EvalGroup.class);
113 114 evalGroup.setIndicatorNum(dto.getIndicators().size());
114 115 evalGroup.setEgc(PublicUtil.getUUID());
  116 + evalGroup.setPostIds(dto.getPostIds());
  117 + evalGroup.setPostNames(dto.getPostNames());
115 118 evalGroup.setGroupId(evalGroupRank.getGroupId());
116 119 evalGroup.setEvalGroupRankId(evalGroupRank.getId());
117 120 evalGroup.setEvalGroupRankStageId(evalGroupRankStage.getId());
... ...