ea6b2fd6
姜超
feature(*): 门店奖惩分配
|
1
2
3
|
package cn.fw.morax.service.biz.eval;
import cn.fw.common.exception.BusinessException;
|
ea6b2fd6
姜超
feature(*): 门店奖惩分配
|
4
|
import cn.fw.morax.common.constant.Constant;
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
5
|
import cn.fw.morax.common.utils.DateUtil;
|
ea6b2fd6
姜超
feature(*): 门店奖惩分配
|
6
7
|
import cn.fw.morax.common.utils.PublicUtil;
import cn.fw.morax.domain.db.eval.*;
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
8
9
|
import cn.fw.morax.domain.db.kpi.*;
import cn.fw.morax.domain.dto.eval.EvalGroupIndicatorRankDTO;
|
a9445e72
姜超
feature(*): 查看考评详情
|
10
|
import cn.fw.morax.domain.dto.eval.EvalUserRankDTO;
|
c06a04fb
姜超
feature(*): 考评指标详情
|
11
|
import cn.fw.morax.domain.enums.*;
|
c043db4c
姜超
feature(*): 查看考评详情
|
12
|
import cn.fw.morax.domain.vo.EvalPoolVO;
|
19325c46
姜超
feature(*): 查看考评详情
|
13
|
import cn.fw.morax.domain.vo.EvalSelectorVO;
|
ea6b2fd6
姜超
feature(*): 门店奖惩分配
|
14
15
|
import cn.fw.morax.domain.vo.SelectorVO;
import cn.fw.morax.domain.vo.eval.*;
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
16
17
18
|
import cn.fw.morax.domain.vo.kpi.IndicatorUserValueVO;
import cn.fw.morax.domain.vo.kpi.KpiIndicatorRankStaffVO;
import cn.fw.morax.domain.vo.kpi.KpiIndicatorRankVO;
|
c06a04fb
姜超
feature(*): 考评指标详情
|
19
|
import cn.fw.morax.service.biz.CommonService;
|
ea6b2fd6
姜超
feature(*): 门店奖惩分配
|
20
|
import cn.fw.morax.service.data.eval.*;
|
c06a04fb
姜超
feature(*): 考评指标详情
|
21
|
import cn.fw.morax.service.data.kpi.IndicatorUserValueService;
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
22
|
import com.alibaba.fastjson.JSON;
|
74153fda
姜超
feature(*): 修改门店指标展示
|
23
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
ea6b2fd6
姜超
feature(*): 门店奖惩分配
|
24
25
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
26
|
import com.google.common.collect.Lists;
|
ea6b2fd6
姜超
feature(*): 门店奖惩分配
|
27
28
|
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
|
ea6b2fd6
姜超
feature(*): 门店奖惩分配
|
29
30
31
32
33
34
35
36
|
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.time.LocalDate;
import java.time.YearMonth;
import java.util.*;
|
c06a04fb
姜超
feature(*): 考评指标详情
|
37
|
import java.util.function.Function;
|
ea6b2fd6
姜超
feature(*): 门店奖惩分配
|
38
39
40
41
42
43
44
45
46
47
|
import java.util.stream.Collectors;
import static cn.fw.common.businessvalidator.Validator.BV;
@Service
@Slf4j
@RequiredArgsConstructor
public class EvalGroupPoolService {
private final EvalGroupIndicatorPreconditionLaddersService evalGroupIndicatorPreconditionLaddersService;
|
9bac7a5e
姜超
feature(*): 判断是否命...
|
48
|
private final EvalGroupRewardPreconditionHitLogService evalGroupRewardPreconditionHitLogService;
|
ea6b2fd6
姜超
feature(*): 门店奖惩分配
|
49
|
private final EvalGroupIndicatorPreconditionService evalGroupIndicatorPreconditionService;
|
c06a04fb
姜超
feature(*): 考评指标详情
|
50
|
private final EvalGroupIndicatorTargetHitLogService evalGroupIndicatorTargetHitLogService;
|
e3e8a6ac
姜超
feature(*): 考评详情
|
51
|
private final EvalGroupRewardTargetHitLogService evalGroupRewardTargetHitLogService;
|
ea6b2fd6
姜超
feature(*): 门店奖惩分配
|
52
|
private final EvalGroupRewardPreconditionService evalGroupRewardPreconditionService;
|
ea6b2fd6
姜超
feature(*): 门店奖惩分配
|
53
|
private final EvalGroupIndicatorLaddersService evalGroupIndicatorLaddersService;
|
c06a04fb
姜超
feature(*): 考评指标详情
|
54
55
|
private final EvalGroupIndicatorHitLogService evalGroupIndicatorHitLogService;
private final EvalPoolIndicatorDetailService evalPoolIndicatorDetailService;
|
ea6b2fd6
姜超
feature(*): 门店奖惩分配
|
56
57
|
private final EvalGroupIndicatorParamService evalGroupIndicatorParamService;
private final EvalGroupRewardLaddersService evalGroupRewardLaddersService;
|
c06a04fb
姜超
feature(*): 考评指标详情
|
58
|
private final EvalPoolRewardDetailService evalPoolRewardDetailService;
|
ea6b2fd6
姜超
feature(*): 门店奖惩分配
|
59
|
private final EvalGroupRewardParamService evalGroupRewardParamService;
|
5ff2c525
姜超
feature(*): 并列排名计算
|
60
|
private final EvalGroupRewardRankLogService evalGroupRewardRankLogService;
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
61
|
private final EvalGroupRewardHitLogService evalGroupRewardHitLogService;
|
c06a04fb
姜超
feature(*): 考评指标详情
|
62
63
|
private final IndicatorUserValueService indicatorUserValueService;
private final EvalIndicatorValueService evalIndicatorValueService;
|
c06a04fb
姜超
feature(*): 考评指标详情
|
64
|
private final EvalGroupUserService evalGroupUserService;
|
9161579f
姜超
feature(*): 排名返回名称
|
65
|
private final EvalGroupRewardService evalGroupRewardService;
|
19325c46
姜超
feature(*): 查看考评详情
|
66
67
|
private final EvalGroupRankStageService evalGroupRankStageService;
private final EvalGroupRankService evalGroupRankService;
|
9161579f
姜超
feature(*): 排名返回名称
|
68
|
private final EvalGroupService evalGroupService;
|
c06a04fb
姜超
feature(*): 考评指标详情
|
69
|
private final EvalUserPoolService evalUserPoolService;
|
c1b3c16f
姜超
feature(*): 门店考评池查询
|
70
|
private final EvalShopPoolService evalShopPoolService;
|
c06a04fb
姜超
feature(*): 考评指标详情
|
71
72
|
private final CommonService commonService;
private final EvalService evalService;
|
ea6b2fd6
姜超
feature(*): 门店奖惩分配
|
73
74
75
76
|
/**
* 查询考评详情
*
|
15a68981
姜超
feature(*): 处理百分数
|
77
78
|
* @return
*/
|
c1b3c16f
姜超
feature(*): 门店考评池查询
|
79
80
81
82
83
84
85
86
87
88
|
public EvalShopPoolVO queryShopPoolDetail(final Long poolId) {
EvalShopPool evalShopPool = evalShopPoolService.getById(poolId);
if (PublicUtil.isEmpty(evalShopPool)) {
throw new BusinessException("人员考评数据不存在");
}
return shopPoolDetail(evalShopPool);
}
public EvalShopPoolVO shopPoolDetail(EvalShopPool pool) {
EvalShopPoolVO evalShopPoolVO = PublicUtil.copy(pool, EvalShopPoolVO.class);
|
f53a1f59
姜超
feature(*): 百分率处理
|
89
|
evalShopPoolVO.convertScoreRatio();
|
c1b3c16f
姜超
feature(*): 门店考评池查询
|
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
|
LocalDate dataDate = evalShopPoolVO.getDataDate();
this.setShopIndicatorDetails(evalShopPoolVO, dataDate);
this.setShopRewardDetails(evalShopPoolVO, dataDate);
evalShopPoolVO.setDataDate(dataDate);
Eval eval = evalService.getById(pool.getEvalId());
BV.notNull(pool, "考评池不存在");
evalShopPoolVO.setEvalType(eval.getType());
return evalShopPoolVO;
}
/**
* 查询考评详情
*
* @return
*/
|
a9445e72
姜超
feature(*): 查看考评详情
|
109
110
111
112
113
|
public List<EvalUserRankStageVO> queryRankStagePools(EvalUserRankDTO dto) {
final Long userId = dto.getUserId();
final Long postId = dto.getPostId();
final Long shopId = dto.getShopId();
final Long evalGroupRankId = dto.getEvalGroupRankId();
|
19325c46
姜超
feature(*): 查看考评详情
|
114
|
List<EvalUserPool> pools = evalUserPoolService.list(Wrappers.<EvalUserPool>lambdaQuery()
|
a9445e72
姜超
feature(*): 查看考评详情
|
115
116
|
.eq(EvalUserPool::getPostId, postId)
.eq(EvalUserPool::getShopId, shopId)
|
19325c46
姜超
feature(*): 查看考评详情
|
117
118
119
120
121
|
.eq(EvalUserPool::getUserId, userId)
.eq(EvalUserPool::getEvalGroupRankId, evalGroupRankId)
.eq(EvalUserPool::getYn, Boolean.TRUE)
.orderByDesc(EvalUserPool::getScoreRatio)
);
|
a9445e72
姜超
feature(*): 查看考评详情
|
122
123
|
Map<Long, List<EvalUserPool>> stagePoolMap = pools.stream().collect(Collectors.groupingBy(EvalUserPool::getEvalGroupRankStageId));
List<Long> evalGroupRankStageIds = pools.stream().map(EvalUserPool::getEvalGroupRankStageId).collect(Collectors.toList());
|
19325c46
姜超
feature(*): 查看考评详情
|
124
125
|
List<EvalGroupRankStage> stages = evalGroupRankStageService.list(Wrappers.<EvalGroupRankStage>lambdaQuery()
|
a9445e72
姜超
feature(*): 查看考评详情
|
126
|
.in(EvalGroupRankStage::getId, evalGroupRankStageIds)
|
19325c46
姜超
feature(*): 查看考评详情
|
127
|
.eq(EvalGroupRankStage::getYn, Boolean.TRUE)
|
a9445e72
姜超
feature(*): 查看考评详情
|
128
|
.orderByAsc(EvalGroupRankStage::getBeginTime)
|
19325c46
姜超
feature(*): 查看考评详情
|
129
130
|
);
|
a9445e72
姜超
feature(*): 查看考评详情
|
131
132
133
134
135
|
List<EvalUserRankStageVO> stageVos = PublicUtil.copyList(stages, EvalUserRankStageVO.class);
for (EvalUserRankStageVO stageVO : stageVos) {
List<EvalUserPool> rankPools = stagePoolMap.get(stageVO.getId());
if (PublicUtil.isNotEmpty(rankPools)) {
EvalUserPool stagePool = rankPools.get(0);
|
c043db4c
姜超
feature(*): 查看考评详情
|
136
|
EvalUserPoolVO evalUserPoolVO = this.poolDetail(stagePool);
|
e376b24c
姜超
feature(*): 修改个人考评
|
137
|
this.setRewardPunish(evalUserPoolVO);
|
a9445e72
姜超
feature(*): 查看考评详情
|
138
139
|
stageVO.setPool(evalUserPoolVO);
}
|
15a68981
姜超
feature(*): 处理百分数
|
140
|
}
|
a9445e72
姜超
feature(*): 查看考评详情
|
141
|
return stageVos;
|
15a68981
姜超
feature(*): 处理百分数
|
142
143
|
}
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
144
145
|
public EvalUserPoolVO poolDetail(EvalUserPool pool) {
EvalUserPoolVO evalUserPoolVO = PublicUtil.copy(pool, EvalUserPoolVO.class);
|
f53a1f59
姜超
feature(*): 百分率处理
|
146
|
evalUserPoolVO.convertScoreRatio();
|
ea6b2fd6
姜超
feature(*): 门店奖惩分配
|
147
148
149
|
LocalDate localDate = getPoolLastData(evalUserPoolVO);
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
150
151
152
|
this.setIndicatorDetails(evalUserPoolVO, localDate);
this.setRewardDetails(evalUserPoolVO, localDate);
this.setIgnore(evalUserPoolVO);
|
c06a04fb
姜超
feature(*): 考评指标详情
|
153
|
evalUserPoolVO.setDataDate(localDate);
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
154
|
|
ea6b2fd6
姜超
feature(*): 门店奖惩分配
|
155
156
157
|
return evalUserPoolVO;
}
|
e376b24c
姜超
feature(*): 修改个人考评
|
158
159
160
161
162
163
|
public void setRewardPunish(EvalUserPoolVO evalUserPoolVO) {
evalUserPoolVO.setRewardScore(BigDecimal.ZERO);
evalUserPoolVO.setPunishScore(BigDecimal.ZERO);
evalUserPoolVO.setOriginScore(evalUserPoolVO.getScore());
}
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
164
165
166
167
168
169
170
171
172
173
174
175
176
|
public void setIgnore(EvalUserPoolVO pool) {
EvalGroupUser evalGroupUser = evalGroupUserService.getMonthLastData(pool.getEvalGroupId(), pool.getUserId(), pool.getMonthly());
if (PublicUtil.isEmpty(evalGroupUser)) {
log.error("考评人员数据未找到,{}", JSON.toJSONString(pool));
pool.setInclusion(Boolean.TRUE);
return;
}
//不纳入绩效计算 并且 绩效组人员不为空
pool.setInclusion(Boolean.FALSE.equals(evalGroupUser.getIgnored()));
pool.setIgnoreCause(evalGroupUser.getIgnoreCause());
}
|
ea6b2fd6
姜超
feature(*): 门店奖惩分配
|
177
178
179
180
181
|
public void setIndicatorDetails(EvalUserPoolVO pool, LocalDate localDate) {
Long evalGroupId = pool.getEvalGroupId();
Long poolId = pool.getId();
DecimalFormat decimalFormat = new DecimalFormat("##########.##");
|
c06a04fb
姜超
feature(*): 考评指标详情
|
182
|
List<EvalPoolIndicatorDetailVO> indicatorDetails = evalPoolIndicatorDetailService.getStaffIndicatorValues(poolId, evalGroupId, localDate);
|
ea6b2fd6
姜超
feature(*): 门店奖惩分配
|
183
184
185
186
187
188
189
190
191
192
|
BigDecimal totalScore = BigDecimal.ZERO;
BigDecimal staffScore = BigDecimal.ZERO;
BigDecimal baseScore;
for (EvalPoolIndicatorDetailVO indicatorValueVO : indicatorDetails) {
baseScore = new BigDecimal(indicatorValueVO.getBaseScore());
totalScore = totalScore.add(baseScore);
staffScore = staffScore.add(indicatorValueVO.getScore());
indicatorValueVO.setScoreFormat(decimalFormat.format(indicatorValueVO.getScore()));
|
4946d6d0
姜超
feature(*): 修改展示
|
193
194
|
if (BigDecimal.ZERO.compareTo(indicatorValueVO.getScore()) == 0 || BigDecimal.ZERO.compareTo(baseScore) == 0) {
indicatorValueVO.setScoreRatioFormat("0");
|
5d2a2a83
姜超
feature(*): 基本工资不能下钻
|
195
|
continue;
|
4946d6d0
姜超
feature(*): 修改展示
|
196
|
}
|
ea6b2fd6
姜超
feature(*): 门店奖惩分配
|
197
198
199
|
BigDecimal indicatorScoreRatio = indicatorValueVO.getScore().divide(baseScore, 2, RoundingMode.DOWN).multiply(Constant.ONE_HUNDRED);
indicatorValueVO.setScoreRatioFormat(decimalFormat.format(indicatorScoreRatio));
}
|
08c31209
姜超
feature(*): 考评详情
|
200
201
|
BigDecimal staffScoreRatio = (BigDecimal.ZERO.compareTo(totalScore) == 0) ? BigDecimal.ZERO :
staffScore.divide(totalScore, 2, RoundingMode.DOWN).multiply(Constant.ONE_HUNDRED);
|
ea6b2fd6
姜超
feature(*): 门店奖惩分配
|
202
203
|
pool.setScoreRatioFormat(decimalFormat.format(staffScoreRatio));
pool.setIndicators(indicatorDetails);
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
204
205
|
pool.setScoreRatio(staffScoreRatio);
pool.setTotalScore(totalScore);
|
ea6b2fd6
姜超
feature(*): 门店奖惩分配
|
206
207
|
}
|
c1b3c16f
姜超
feature(*): 门店考评池查询
|
208
209
210
211
212
|
public void setShopIndicatorDetails(EvalShopPoolVO pool, LocalDate localDate) {
Long evalGroupId = pool.getEvalGroupId();
Long poolId = pool.getId();
DecimalFormat decimalFormat = new DecimalFormat("##########.##");
|
e7121b9d
姜超
feature(*): 查询修改
|
213
|
List<EvalPoolIndicatorDetailVO> indicatorDetails = evalPoolIndicatorDetailService.getShopIndicatorValues(poolId, evalGroupId, localDate);
|
c1b3c16f
姜超
feature(*): 门店考评池查询
|
214
215
216
217
218
219
220
221
222
223
224
225
226
|
BigDecimal totalScore = BigDecimal.ZERO;
BigDecimal staffScore = BigDecimal.ZERO;
BigDecimal baseScore;
for (EvalPoolIndicatorDetailVO indicatorValueVO : indicatorDetails) {
baseScore = new BigDecimal(indicatorValueVO.getBaseScore());
totalScore = totalScore.add(baseScore);
staffScore = staffScore.add(indicatorValueVO.getScore());
indicatorValueVO.setScoreFormat(decimalFormat.format(indicatorValueVO.getScore()));
BigDecimal indicatorScoreRatio = indicatorValueVO.getScore().divide(baseScore, 2, RoundingMode.DOWN).multiply(Constant.ONE_HUNDRED);
indicatorValueVO.setScoreRatioFormat(decimalFormat.format(indicatorScoreRatio));
}
|
347b9a76
姜超
feature(*): 考评审批
|
227
|
pool.setScoreRatioFormat(decimalFormat.format(pool.getScoreRatio()));
|
c1b3c16f
姜超
feature(*): 门店考评池查询
|
228
|
pool.setIndicators(indicatorDetails);
|
c1b3c16f
姜超
feature(*): 门店考评池查询
|
229
230
231
|
pool.setTotalScore(totalScore);
}
|
ea6b2fd6
姜超
feature(*): 门店奖惩分配
|
232
233
234
235
236
|
public void setRewardDetails(EvalUserPoolVO pool, LocalDate localDate) {
Long evalGroupId = pool.getEvalGroupId();
Long poolId = pool.getId();
DecimalFormat decimalFormat = new DecimalFormat("##########.##");
|
e3e8a6ac
姜超
feature(*): 考评详情
|
237
|
List<EvalPoolRewardDetailVO> rewardValues = evalPoolRewardDetailService.getStaffRewardValues(poolId, evalGroupId, localDate);
|
ea6b2fd6
姜超
feature(*): 门店奖惩分配
|
238
239
240
241
242
243
244
245
246
247
|
BigDecimal totalReward = BigDecimal.ZERO;
for (EvalPoolRewardDetailVO rewardValue : rewardValues) {
totalReward = totalReward.add(rewardValue.getAmount());
}
pool.setReward(totalReward);
pool.setRewards(rewardValues);
}
|
c1b3c16f
姜超
feature(*): 门店考评池查询
|
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
|
public void setShopRewardDetails(EvalShopPoolVO pool, LocalDate localDate) {
Long evalGroupId = pool.getEvalGroupId();
Long poolId = pool.getId();
DecimalFormat decimalFormat = new DecimalFormat("##########.##");
List<EvalPoolRewardDetailVO> rewardValues = evalPoolRewardDetailService.getStaffRewardValues(poolId, evalGroupId, localDate);
BigDecimal totalReward = BigDecimal.ZERO;
for (EvalPoolRewardDetailVO rewardValue : rewardValues) {
totalReward = totalReward.add(rewardValue.getAmount());
}
pool.setReward(totalReward);
pool.setRewards(rewardValues);
}
|
ea6b2fd6
姜超
feature(*): 门店奖惩分配
|
264
265
266
267
268
269
270
271
|
/**
* 查询用户绩效池
*
* @param userId
* @param yearMonth
* @return
*/
|
c043db4c
姜超
feature(*): 查看考评详情
|
272
|
public EvalPoolVO evalPoolSelector(Long userId, YearMonth yearMonth) {
|
f90ec7e4
姜超
feature(*): 新增台阶类型
|
273
274
|
List<EvalUserPool> pools = userEvalPool(userId, yearMonth);
if (CollectionUtils.isEmpty(pools)) {
|
c043db4c
姜超
feature(*): 查看考评详情
|
275
|
return null;
|
19325c46
姜超
feature(*): 查看考评详情
|
276
|
}
|
c043db4c
姜超
feature(*): 查看考评详情
|
277
|
String userName = pools.stream().findFirst().map(EvalUserPool::getUserName).orElse("");
|
19325c46
姜超
feature(*): 查看考评详情
|
278
|
List<EvalSelectorVO> selectors = new ArrayList<>();
|
c043db4c
姜超
feature(*): 查看考评详情
|
279
|
EvalPoolVO evalPoolVO = new EvalPoolVO(userId, userName, selectors);
|
19325c46
姜超
feature(*): 查看考评详情
|
280
281
282
283
|
Map<Long, String> rankNameMap = this.getRankNameMap(pools);
Map<String, List<EvalUserPool>> shopPostMap = pools.stream().collect(Collectors.groupingBy(pool -> pool.getShopName() + "(" + pool.getPostName() + ")"));
//门店、岗位维度
for (Map.Entry<String, List<EvalUserPool>> shopPostEntry : shopPostMap.entrySet()) {
|
19325c46
姜超
feature(*): 查看考评详情
|
284
|
List<EvalUserGroupRankVO> ranks = new ArrayList<>();
|
c043db4c
姜超
feature(*): 查看考评详情
|
285
286
287
288
289
|
List<EvalUserPool> shopPostPools = shopPostEntry.getValue();
Long shopId = shopPostPools.stream().findFirst().map(EvalUserPool::getShopId).get();
Long postId = shopPostPools.stream().findFirst().map(EvalUserPool::getPostId).get();
Map<Long, List<EvalUserPool>> rankPools = shopPostPools.stream().collect(Collectors.groupingBy(EvalUserPool::getEvalGroupRankId));
//排名维度
|
19325c46
姜超
feature(*): 查看考评详情
|
290
|
for (Map.Entry<Long, List<EvalUserPool>> rankEntry : rankPools.entrySet()) {
|
19325c46
姜超
feature(*): 查看考评详情
|
291
292
293
294
295
296
297
298
299
300
|
List<EvalUserPool> userRankPools = rankEntry.getValue();
double averageKpiScoreRatio = userRankPools.stream()
.mapToDouble(r -> Optional.ofNullable(r.getScoreRatio()).orElse(BigDecimal.ZERO).doubleValue())
.average()
.orElse(0);
BigDecimal reward = userRankPools.stream().map(EvalUserPool::getReward).reduce(BigDecimal.ZERO, BigDecimal::add);
EvalUserGroupRankVO rank = new EvalUserGroupRankVO();
rank.setEvalGroupRankName(rankNameMap.getOrDefault(rankEntry.getKey(), ""));
rank.setScoreRatio(new BigDecimal(averageKpiScoreRatio).multiply(Constant.ONE_HUNDRED));
rank.setReward(reward);
|
c043db4c
姜超
feature(*): 查看考评详情
|
301
|
rank.setEvalGroupRankId(rankEntry.getKey());
|
19325c46
姜超
feature(*): 查看考评详情
|
302
303
304
|
ranks.add(rank);
}
EvalSelectorVO evalSelectorVO = new EvalSelectorVO(shopPostEntry.getKey(), ranks);
|
c043db4c
姜超
feature(*): 查看考评详情
|
305
306
|
evalSelectorVO.setShopId(shopId);
evalSelectorVO.setPostId(postId);
|
19325c46
姜超
feature(*): 查看考评详情
|
307
308
|
selectors.add(evalSelectorVO);
}
|
c043db4c
姜超
feature(*): 查看考评详情
|
309
|
return evalPoolVO;
|
19325c46
姜超
feature(*): 查看考评详情
|
310
311
312
313
314
315
316
317
318
319
|
}
public Map<Long, String> getRankNameMap(List<EvalUserPool> pools) {
List<Long> evalGroupRankIds = pools.stream().map(EvalUserPool::getEvalGroupRankId).distinct().collect(Collectors.toList());
List<EvalGroupRank> evalGroupRanks = evalGroupRankService.list(Wrappers.<EvalGroupRank>lambdaQuery()
.in(EvalGroupRank::getId, evalGroupRankIds)
.eq(EvalGroupRank::getYn, Boolean.TRUE)
);
if (PublicUtil.isEmpty(evalGroupRanks)) {
return new HashMap<>();
|
ea6b2fd6
姜超
feature(*): 门店奖惩分配
|
320
|
}
|
19325c46
姜超
feature(*): 查看考评详情
|
321
|
return evalGroupRanks.stream().collect(Collectors.toMap(EvalGroupRank::getId, EvalGroupRank::getName, (v1, v2) -> v1));
|
ea6b2fd6
姜超
feature(*): 门店奖惩分配
|
322
323
|
}
|
19325c46
姜超
feature(*): 查看考评详情
|
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
|
/**
* 查询用户绩效池
*
* @param userId
* @param yearMonth
* @return
*/
// public Set<SelectorVO> evalPoolSelector(Long userId, YearMonth yearMonth) {
// List<EvalUserPool> pools = userEvalPool(userId, yearMonth);
// if (CollectionUtils.isEmpty(pools)) {
// return new HashSet<>();
// }
// return pools.stream().map(r -> SelectorVO.whit(r.getId(), r.getPostName(), r.getShopName() + "")).collect(Collectors.toSet());
// }
|
eccb0d64
姜超
feature(*): 考评详情查询
|
339
|
|
ea6b2fd6
姜超
feature(*): 门店奖惩分配
|
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
|
/**
* 查询用户月度绩效池列表
*
* @param userId 用户id
* @param yearMonth 月度
* @return 返回结果
*/
public List<EvalUserPool> userEvalPool(final Long userId, final YearMonth yearMonth) {
List<EvalUserPool> pools = evalUserPoolService.list(Wrappers.<EvalUserPool>lambdaQuery()
.eq(EvalUserPool::getUserId, userId)
.eq(EvalUserPool::getMonthly, yearMonth)
.eq(EvalUserPool::getYn, Boolean.TRUE)
.orderByDesc(EvalUserPool::getCreateTime)
);
if (CollectionUtils.isEmpty(pools)) {
return new ArrayList<>();
}
return pools;
}
/**
* 获取绩效池详情最近日期
*
* @param pool
* @return
*/
public LocalDate getPoolLastData(EvalUserPoolVO pool) {
List<EvalGroupUser> users = evalGroupUserService.list(Wrappers.<EvalGroupUser>lambdaQuery()
.eq(EvalGroupUser::getEvalGroupId, pool.getEvalGroupId())
.eq(EvalGroupUser::getYn, Boolean.TRUE)
.orderByDesc(EvalGroupUser::getDataDate)
);
BV.isNotEmpty(users, "考评组为空");
return users.stream().findFirst().get().getDataDate();
}
|
347b9a76
姜超
feature(*): 考评审批
|
378
379
|
public EvalPoolIndicatorDetailVO staffHitIndicatorDetail(Long evalPoolId, Long evalGroupIndicatorId, LocalDate dataDate) {
EvalUserPool pool = evalUserPoolService.getById(evalPoolId);
|
9f47fb88
姜超
feature(*): 薪酬组人员日期
|
380
381
382
|
if (PublicUtil.isEmpty(pool)) {
return null;
}
|
347b9a76
姜超
feature(*): 考评审批
|
383
384
385
386
387
388
|
Long userId = pool.getUserId();
return getHitIndicatorDetail(evalPoolId, EvalScopeEnum.STAFF, userId, evalGroupIndicatorId, dataDate);
}
public EvalPoolIndicatorDetailVO shopHitIndicatorDetail(Long evalPoolId, Long evalGroupIndicatorId, LocalDate dataDate) {
EvalShopPool pool = evalShopPoolService.getById(evalPoolId);
|
9f47fb88
姜超
feature(*): 薪酬组人员日期
|
389
390
391
392
|
if (PublicUtil.isEmpty(pool)) {
return null;
}
// BV.notNull(pool, "考评池不存在");
|
347b9a76
姜超
feature(*): 考评审批
|
393
394
395
|
Long userId = pool.getShopId();
return getHitIndicatorDetail(evalPoolId, EvalScopeEnum.SHOP, userId, evalGroupIndicatorId, dataDate);
}
|
c1b3c16f
姜超
feature(*): 门店考评池查询
|
396
|
|
c06a04fb
姜超
feature(*): 考评指标详情
|
397
398
399
400
401
402
403
|
/**
* 员工考评得分详情
*
* @param evalPoolId
* @param evalGroupIndicatorId
* @return
*/
|
347b9a76
姜超
feature(*): 考评审批
|
404
|
public EvalPoolIndicatorDetailVO getHitIndicatorDetail(Long evalPoolId, EvalScopeEnum scopeType, Long referId, Long evalGroupIndicatorId, LocalDate dataDate) {
|
74153fda
姜超
feature(*): 修改门店指标展示
|
405
|
EvalPoolIndicatorDetailVO indicatorDetail = evalPoolIndicatorDetailService.getIndicatorValue(evalPoolId, scopeType, evalGroupIndicatorId, dataDate);
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
406
|
BV.notNull(indicatorDetail, "考评指标明细不存在");
|
c06a04fb
姜超
feature(*): 考评指标详情
|
407
408
|
//命中记录
|
7060fbd3
姜超
feature(*): 修改代码格式
|
409
|
Optional<EvalGroupIndicatorHitLog> hitLog = evalGroupIndicatorHitLogService.getHitLog(evalGroupIndicatorId,
|
f692be3a
姜超
feature(*): 查询修改
|
410
|
evalPoolId, scopeType, dataDate);
|
15a68981
姜超
feature(*): 处理百分数
|
411
412
|
indicatorDetail.setHitLadderValue(hitLog.map(EvalGroupIndicatorHitLog::getHitLadderValue).orElse(BigDecimal.ZERO));
indicatorDetail.setHitCommissionValue(hitLog.map(EvalGroupIndicatorHitLog::getHitCommissionValue).orElse(BigDecimal.ZERO));
|
7060fbd3
姜超
feature(*): 修改代码格式
|
413
|
Long hitLadderId = hitLog.map(EvalGroupIndicatorHitLog::getEvalGroupIndicatorLaddersId).orElse(0L);
|
c06a04fb
姜超
feature(*): 考评指标详情
|
414
|
|
7060fbd3
姜超
feature(*): 修改代码格式
|
415
|
//阶梯
|
c06a04fb
姜超
feature(*): 考评指标详情
|
416
|
if (ScoreWayEnum.LADDER.equals(indicatorDetail.getScoreWay())) {
|
7060fbd3
姜超
feature(*): 修改代码格式
|
417
|
indicatorDetail.setLadders(getIndicatorLadders(evalGroupIndicatorId, hitLadderId, indicatorDetail.getLaddersType()));
|
c06a04fb
姜超
feature(*): 考评指标详情
|
418
419
|
}
|
f692be3a
姜超
feature(*): 查询修改
|
420
421
|
//参数
Map<ParamTypeEnum, List<EvalGroupIndicatorParamVO>> paramMap = this.getEvalGroupIndicatorParamMap(evalGroupIndicatorId,
|
347b9a76
姜超
feature(*): 考评审批
|
422
|
referId, evalPoolId, scopeType, dataDate);
|
c06a04fb
姜超
feature(*): 考评指标详情
|
423
424
425
426
427
|
indicatorDetail.setLadderParams(paramMap.getOrDefault(ParamTypeEnum.LADDER, new ArrayList<>()));
indicatorDetail.setCommissionParams(paramMap.getOrDefault(ParamTypeEnum.COMMISSION, new ArrayList<>()));
//条件
|
f692be3a
姜超
feature(*): 查询修改
|
428
|
List<EvalGroupIndicatorPreconditionVO> preconditionVOS = this.getHitPreconditionVo(evalGroupIndicatorId,
|
347b9a76
姜超
feature(*): 考评审批
|
429
|
referId, evalPoolId, scopeType, dataDate);
|
c06a04fb
姜超
feature(*): 考评指标详情
|
430
|
indicatorDetail.setConds(preconditionVOS);
|
f692be3a
姜超
feature(*): 查询修改
|
431
432
433
434
435
436
437
438
439
440
441
|
//处理百分数
processPercent(indicatorDetail);
return indicatorDetail;
}
public List<EvalGroupIndicatorPreconditionVO> getHitPreconditionVo(Long evalGroupIndicatorId,
Long referId,
Long evalPoolId,
EvalScopeEnum scopeType,
LocalDate dataDate) {
|
74153fda
姜超
feature(*): 修改门店指标展示
|
442
|
List<EvalGroupIndicatorPreconditionVO> preconditionVOS = evalGroupIndicatorPreconditionService.getConds(evalPoolId, scopeType, evalGroupIndicatorId, dataDate);
|
c06a04fb
姜超
feature(*): 考评指标详情
|
443
444
445
446
447
448
449
450
|
for (EvalGroupIndicatorPreconditionVO preconditionVO : preconditionVOS) {
//有目标记录
if (! TargetTypeEnum.NO.equals(preconditionVO.getTargetType())) {
EvalGroupIndicatorTargetHitLog evalGroupIndicatorTargetHitLog = evalGroupIndicatorTargetHitLogService.getOne(Wrappers.<EvalGroupIndicatorTargetHitLog>lambdaQuery()
.eq(EvalGroupIndicatorTargetHitLog::getReferId, preconditionVO.getId())
.eq(EvalGroupIndicatorTargetHitLog::getTargetType, IndicatorTypeEnum.PRE)
.eq(EvalGroupIndicatorTargetHitLog::getDataDate, dataDate)
.eq(EvalGroupIndicatorTargetHitLog::getPoolId, evalPoolId)
|
f692be3a
姜超
feature(*): 查询修改
|
451
|
.eq(EvalGroupIndicatorTargetHitLog::getScopeType, scopeType)
|
c06a04fb
姜超
feature(*): 考评指标详情
|
452
453
454
455
456
|
.eq(EvalGroupIndicatorTargetHitLog::getYn, Boolean.TRUE)
);
Optional<EvalGroupIndicatorTargetHitLog> targetHitLog = Optional.ofNullable(evalGroupIndicatorTargetHitLog);
preconditionVO.setReachValue(targetHitLog.map(EvalGroupIndicatorTargetHitLog::getReachValue).orElse(BigDecimal.ZERO));
preconditionVO.setIndicatorValue(targetHitLog.map(EvalGroupIndicatorTargetHitLog::getValue).orElse(BigDecimal.ZERO));
|
f692be3a
姜超
feature(*): 查询修改
|
457
|
} else {
|
74153fda
姜超
feature(*): 修改门店指标展示
|
458
|
BigDecimal indicatorOriginValue = queryUserOriginValue(preconditionVO.getCode(), referId, scopeType, dataDate, preconditionVO.getCodeType());
|
f692be3a
姜超
feature(*): 查询修改
|
459
|
preconditionVO.setIndicatorValue(indicatorOriginValue);
|
c06a04fb
姜超
feature(*): 考评指标详情
|
460
461
462
463
464
|
}
//条件阶梯
List<EvalGroupIndicatorPreconditionLaddersVO> preconditionLaddersVOS = evalGroupIndicatorPreconditionLaddersService.getVOS(
preconditionVO.getId(), preconditionVO.getTargetType(), preconditionVO.getDataType());
|
f692be3a
姜超
feature(*): 查询修改
|
465
|
Long hitLaddersId = preconditionVO.getHitLaddersId();
|
c06a04fb
姜超
feature(*): 考评指标详情
|
466
|
for (EvalGroupIndicatorPreconditionLaddersVO preconditionLaddersVO : preconditionLaddersVOS) {
|
f692be3a
姜超
feature(*): 查询修改
|
467
|
if (PublicUtil.isNotEmpty(hitLaddersId) && preconditionLaddersVO.getId().equals(hitLaddersId)) {
|
c06a04fb
姜超
feature(*): 考评指标详情
|
468
469
470
471
472
|
preconditionLaddersVO.setHit(Boolean.TRUE);
}
}
preconditionVO.setLadders(preconditionLaddersVOS);
}
|
f692be3a
姜超
feature(*): 查询修改
|
473
|
return preconditionVOS;
|
c06a04fb
姜超
feature(*): 考评指标详情
|
474
475
|
}
|
7060fbd3
姜超
feature(*): 修改代码格式
|
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
|
public List<EvalGroupIndicatorLaddersVO> getIndicatorLadders(Long evalGroupIndicatorId, Long hitLadderId, DataTypeEnum laddersType) {
List<EvalGroupIndicatorLadders> ladders = evalGroupIndicatorLaddersService.list(Wrappers.<EvalGroupIndicatorLadders>lambdaQuery()
.eq(EvalGroupIndicatorLadders::getEvalGroupIndicatorId, evalGroupIndicatorId)
.eq(EvalGroupIndicatorLadders::getYn, Boolean.TRUE)
.orderByAsc(EvalGroupIndicatorLadders::getLower)
);
BV.isNotEmpty(ladders, "阶梯配置为空");
List<EvalGroupIndicatorLaddersVO> laddersVOS = PublicUtil.copyList(ladders, EvalGroupIndicatorLaddersVO.class);
for (EvalGroupIndicatorLaddersVO laddersVO : laddersVOS) {
laddersVO.setHit(hitLadderId.equals(laddersVO.getId()) ? Boolean.TRUE : Boolean.FALSE);
laddersVO.convertLadderToPercent(laddersType);
}
return laddersVOS;
}
|
c06a04fb
姜超
feature(*): 考评指标详情
|
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
|
public void processPercent(EvalPoolIndicatorDetailVO detail) {
//提成
for (EvalGroupIndicatorParamVO paramVO : Optional.ofNullable(detail.getCommissionParams()).orElse(new ArrayList<>())) {
//指标原始值
if (DataTypeEnum.RATIO.equals(paramVO.getDataType())) {
paramVO.setIndicatorValue(Optional.ofNullable(paramVO.getIndicatorValue()).orElse(BigDecimal.ZERO).multiply(Constant.ONE_HUNDRED));
}
//有目标
if (! TargetTypeEnum.NO.equals(paramVO.getTargetType())) {
paramVO.setReachValue(Optional.ofNullable(paramVO.getReachValue()).orElse(BigDecimal.ZERO).multiply(Constant.ONE_HUNDRED));
}
}
for (EvalGroupIndicatorParamVO paramVO : Optional.ofNullable(detail.getLadderParams()).orElse(new ArrayList<>())) {
//指标原始值
if (DataTypeEnum.RATIO.equals(paramVO.getDataType())) {
paramVO.setIndicatorValue(Optional.ofNullable(paramVO.getIndicatorValue()).orElse(BigDecimal.ZERO).multiply(Constant.ONE_HUNDRED));
}
//有目标
if (! TargetTypeEnum.NO.equals(paramVO.getTargetType())) {
paramVO.setReachValue(Optional.ofNullable(paramVO.getReachValue()).orElse(BigDecimal.ZERO).multiply(Constant.ONE_HUNDRED));
}
}
for (EvalGroupIndicatorPreconditionVO preconditionVO : Optional.ofNullable(detail.getConds()).orElse(new ArrayList<>())) {
//指标原始值
if (DataTypeEnum.RATIO.equals(preconditionVO.getDataType())) {
preconditionVO.setIndicatorValue(Optional.ofNullable(preconditionVO.getIndicatorValue()).orElse(BigDecimal.ZERO).multiply(Constant.ONE_HUNDRED));
}
//有目标
if (! TargetTypeEnum.NO.equals(preconditionVO.getTargetType())) {
preconditionVO.setReachValue(Optional.ofNullable(preconditionVO.getReachValue()).orElse(BigDecimal.ZERO).multiply(Constant.ONE_HUNDRED));
}
}
|
c06a04fb
姜超
feature(*): 考评指标详情
|
526
527
528
529
530
531
532
533
534
535
536
|
}
/**
* 获取绩效参数
*
* @param evalGroupIndicatorId
* @param dataDate
* @return
*/
public Map<ParamTypeEnum, List<EvalGroupIndicatorParamVO>> getEvalGroupIndicatorParamMap(Long evalGroupIndicatorId,
|
f692be3a
姜超
feature(*): 查询修改
|
537
538
539
|
Long referId,
Long evalPoolId,
EvalScopeEnum scopeType,
|
c06a04fb
姜超
feature(*): 考评指标详情
|
540
|
LocalDate dataDate) {
|
c06a04fb
姜超
feature(*): 考评指标详情
|
541
|
List<EvalGroupIndicatorParamVO> paramVos = evalGroupIndicatorParamService.getParamVos(evalGroupIndicatorId);
|
f692be3a
姜超
feature(*): 查询修改
|
542
543
|
Map<Long, EvalGroupIndicatorTargetHitLog> paramTargetHitLogMap = this.getParamHitMap(evalPoolId,
scopeType, dataDate, paramVos);
|
7060fbd3
姜超
feature(*): 修改代码格式
|
544
545
546
547
548
|
for (EvalGroupIndicatorParamVO paramVO : paramVos) {
String code = paramVO.getCode();
Long paramId = paramVO.getId();
//无目标
|
e376b24c
姜超
feature(*): 修改个人考评
|
549
550
551
552
553
|
// if (TargetTypeEnum.NO.equals(paramVO.getTargetType())) {
// BigDecimal indicatorOriginValue = queryUserOriginValue(code, referId, scopeType,dataDate, paramVO.getCodeType());
// paramVO.setIndicatorValue(indicatorOriginValue);
// continue;
// }
|
7060fbd3
姜超
feature(*): 修改代码格式
|
554
555
556
557
558
|
//有目标
Optional<EvalGroupIndicatorTargetHitLog> hitLogOptional = Optional.ofNullable(paramTargetHitLogMap.get(paramId));
paramVO.setIndicatorValue(hitLogOptional.map(EvalGroupIndicatorTargetHitLog::getValue).orElse(BigDecimal.ZERO));
paramVO.setReachValue(hitLogOptional.map(EvalGroupIndicatorTargetHitLog::getReachValue).orElse(BigDecimal.ZERO));
|
e376b24c
姜超
feature(*): 修改个人考评
|
559
560
|
paramVO.setExtraReachValue(hitLogOptional.map(EvalGroupIndicatorTargetHitLog::getReachValue).orElse(BigDecimal.ZERO));
paramVO.setUseTarget(hitLogOptional.map(EvalGroupIndicatorTargetHitLog::getUseTarget).orElse(EvalUseTargetEnum.NO));
|
7060fbd3
姜超
feature(*): 修改代码格式
|
561
562
563
564
565
566
567
|
}
Map<ParamTypeEnum, List<EvalGroupIndicatorParamVO>> indicatorParamMap = paramVos.stream()
.collect(Collectors.groupingBy(EvalGroupIndicatorParamVO::getParamType));
return indicatorParamMap;
}
|
f692be3a
姜超
feature(*): 查询修改
|
568
569
570
571
|
public Map<Long, EvalGroupIndicatorTargetHitLog> getParamHitMap(Long poolId,
EvalScopeEnum scopeType,
LocalDate dataDate,
List<EvalGroupIndicatorParamVO> paramVos) {
|
e376b24c
姜超
feature(*): 修改个人考评
|
572
573
574
|
// List<Long> hasTargetParamIds = paramVos.stream()
// .filter(param -> (! TargetTypeEnum.NO.equals(param.getTargetType())))
// .map(EvalGroupIndicatorParamVO::getId).collect(Collectors.toList());
|
c06a04fb
姜超
feature(*): 考评指标详情
|
575
576
|
Map<Long, EvalGroupIndicatorTargetHitLog> paramTargetHitLogMap = new HashMap<>();
|
e376b24c
姜超
feature(*): 修改个人考评
|
577
578
579
580
581
582
583
584
585
586
|
List<EvalGroupIndicatorTargetHitLog> targetHitLogs = evalGroupIndicatorTargetHitLogService.list(Wrappers.<EvalGroupIndicatorTargetHitLog>lambdaQuery()
// .in(EvalGroupIndicatorTargetHitLog::getReferId, hasTargetParamIds)
.in(EvalGroupIndicatorTargetHitLog::getTargetType, IndicatorTypeEnum.EXAMINE)
.eq(EvalGroupIndicatorTargetHitLog::getDataDate, dataDate)
.eq(EvalGroupIndicatorTargetHitLog::getPoolId, poolId)
.eq(EvalGroupIndicatorTargetHitLog::getScopeType, scopeType)
.eq(EvalGroupIndicatorTargetHitLog::getYn, Boolean.TRUE)
);
paramTargetHitLogMap = targetHitLogs.stream()
.collect(Collectors.toMap(EvalGroupIndicatorTargetHitLog::getReferId, Function.identity(), (v1, v2) -> v1));
|
7060fbd3
姜超
feature(*): 修改代码格式
|
587
588
|
return paramTargetHitLogMap;
}
|
c06a04fb
姜超
feature(*): 考评指标详情
|
589
|
|
74153fda
姜超
feature(*): 修改门店指标展示
|
590
591
|
public BigDecimal queryUserOriginValue(String code, Long referId, EvalScopeEnum scopeType, LocalDate dataDate, IndicatorCodeTypeEnum codeType) {
DimensionTypeEnum dimensionType = (EvalScopeEnum.STAFF.equals(scopeType)) ? DimensionTypeEnum.STAFF : DimensionTypeEnum.SHOP;
|
7060fbd3
姜超
feature(*): 修改代码格式
|
592
593
|
//无目标
if (IndicatorCodeTypeEnum.INDICATOR.equals(codeType)) {
|
74153fda
姜超
feature(*): 修改门店指标展示
|
594
595
596
597
598
599
600
601
|
LambdaQueryWrapper<IndicatorUserValue> queryWrapper = Wrappers.<IndicatorUserValue>lambdaQuery();
if (EvalScopeEnum.STAFF.equals(scopeType)) {
queryWrapper.eq(IndicatorUserValue::getUserId, referId);
} else {
queryWrapper.eq(IndicatorUserValue::getShopId, referId);
}
IndicatorUserValue indicatorUserValue = indicatorUserValueService.getOne(queryWrapper
.eq(IndicatorUserValue::getIndicatorCode, code)
|
c06a04fb
姜超
feature(*): 考评指标详情
|
602
|
.eq(IndicatorUserValue::getDataDate, dataDate)
|
74153fda
姜超
feature(*): 修改门店指标展示
|
603
|
.eq(IndicatorUserValue::getDimensionType, dimensionType)
|
c06a04fb
姜超
feature(*): 考评指标详情
|
604
|
.eq(IndicatorUserValue::getYn, Boolean.TRUE)
|
7060fbd3
姜超
feature(*): 修改代码格式
|
605
606
607
608
609
|
, Boolean.FALSE
);
BigDecimal indicatorOriginValue = commonService.queryIndicatorValue(code, indicatorUserValue);
return indicatorOriginValue;
} else {
|
74153fda
姜超
feature(*): 修改门店指标展示
|
610
611
612
|
EvalIndicatorValue evalIndicatorValue = evalIndicatorValueService.queryLastValue(referId,
dimensionType, code, dataDate);
|
7060fbd3
姜超
feature(*): 修改代码格式
|
613
614
|
BigDecimal indicatorOriginValue = commonService.queryEvalIndicatorValue(code, evalIndicatorValue);
return indicatorOriginValue;
|
c06a04fb
姜超
feature(*): 考评指标详情
|
615
|
}
|
c06a04fb
姜超
feature(*): 考评指标详情
|
616
617
|
}
|
347b9a76
姜超
feature(*): 考评审批
|
618
619
620
621
622
623
624
625
626
627
628
629
630
631
|
public EvalPoolRewardDetailVO staffHitRewardDetail(Long evalPoolId, Long evalGroupRewardId, LocalDate dataDate) {
EvalUserPool pool = evalUserPoolService.getById(evalPoolId);
BV.notNull(pool, "考评池不存在");
Long userId = pool.getUserId();
return getHitRewardDetail(evalPoolId, EvalScopeEnum.STAFF, userId, evalGroupRewardId, dataDate);
}
public EvalPoolRewardDetailVO shopHitRewardDetail(Long evalPoolId, Long evalGroupRewardId, LocalDate dataDate) {
EvalShopPool pool = evalShopPoolService.getById(evalPoolId);
BV.notNull(pool, "考评池不存在");
Long referId = pool.getShopId();
return getHitRewardDetail(evalPoolId, EvalScopeEnum.SHOP, referId, evalGroupRewardId, dataDate);
}
|
e3e8a6ac
姜超
feature(*): 考评详情
|
632
|
/**
|
347b9a76
姜超
feature(*): 考评审批
|
633
|
* 奖惩详情
|
e3e8a6ac
姜超
feature(*): 考评详情
|
634
635
636
637
638
639
|
*
* @param evalPoolId
* @param evalGroupRewardId
* @param dataDate
* @return
*/
|
347b9a76
姜超
feature(*): 考评审批
|
640
|
public EvalPoolRewardDetailVO getHitRewardDetail(Long evalPoolId, EvalScopeEnum scopeType, Long referId, Long evalGroupRewardId, LocalDate dataDate) {
|
e3e8a6ac
姜超
feature(*): 考评详情
|
641
|
|
e3e8a6ac
姜超
feature(*): 考评详情
|
642
|
EvalPoolRewardDetailVO reward = evalPoolRewardDetailService.getStaffRewardValue(evalPoolId, evalGroupRewardId, dataDate);
|
6d467cb8
姜超
feature(*): 计算修改
|
643
|
BV.notNull(reward, "考评奖惩明细不存在");
|
e3e8a6ac
姜超
feature(*): 考评详情
|
644
|
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
645
|
//命中记录
|
347b9a76
姜超
feature(*): 考评审批
|
646
|
Optional<EvalGroupRewardHitLog> hitLog = this.getRewardHitLog(evalGroupRewardId, evalPoolId, scopeType, dataDate);
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
647
648
|
reward.setHitLadderValue(hitLog.map(EvalGroupRewardHitLog::getHitLadderValue).orElse(BigDecimal.ZERO));
reward.setHitCommissionValue(hitLog.map(EvalGroupRewardHitLog::getHitCommissionValue).orElse(BigDecimal.ZERO));
|
7f3e5385
姜超
feature(*): 展示占比字段
|
649
|
reward.setProportionValue(hitLog.map(EvalGroupRewardHitLog::getProportionValue).orElse(BigDecimal.ZERO));
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
650
651
|
Long hitLadderId = hitLog.map(EvalGroupRewardHitLog::getEvalGroupRewardLaddersId).orElse(0L);
|
e3e8a6ac
姜超
feature(*): 考评详情
|
652
653
|
//参数
Map<ParamTypeEnum, List<EvalGroupRewardParamVO>> rewardParamMap = this.getEvalGroupRewardParamMap(evalGroupRewardId,
|
347b9a76
姜超
feature(*): 考评审批
|
654
|
evalPoolId, scopeType, referId, dataDate);
|
e3e8a6ac
姜超
feature(*): 考评详情
|
655
656
657
|
reward.setLadderParams(rewardParamMap.getOrDefault(ParamTypeEnum.LADDER, new ArrayList<>()));
reward.setCommissionParams(rewardParamMap.getOrDefault(ParamTypeEnum.COMMISSION, new ArrayList<>()));
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
658
659
660
|
//阶梯
reward.setLadders(this.getLadderVos(reward, hitLadderId));
|
e3e8a6ac
姜超
feature(*): 考评详情
|
661
|
//条件
|
9bac7a5e
姜超
feature(*): 判断是否命...
|
662
|
reward.setConds(getConds(evalPoolId, scopeType, referId, evalGroupRewardId, dataDate));
|
e3e8a6ac
姜超
feature(*): 考评详情
|
663
664
665
666
667
668
|
//处理百分数
processRewardPercent(reward);
return reward;
}
|
f692be3a
姜超
feature(*): 查询修改
|
669
670
671
672
673
674
675
676
677
678
679
|
public Optional<EvalGroupRewardHitLog> getRewardHitLog(Long evalGroupRewardId, Long evalPoolId, EvalScopeEnum scopeType, LocalDate dataDate) {
EvalGroupRewardHitLog indicatorHitLog = evalGroupRewardHitLogService.getOne(Wrappers.<EvalGroupRewardHitLog>lambdaQuery()
.eq(EvalGroupRewardHitLog::getEvalGroupRewardId, evalGroupRewardId)
.eq(EvalGroupRewardHitLog::getDataDate, dataDate)
.eq(EvalGroupRewardHitLog::getPoolId, evalPoolId)
.eq(EvalGroupRewardHitLog::getScopeType, scopeType)
.eq(EvalGroupRewardHitLog::getYn, Boolean.TRUE)
);
return Optional.ofNullable(indicatorHitLog);
}
|
9bac7a5e
姜超
feature(*): 判断是否命...
|
680
|
public List<EvalGroupRewardPreconditionVO> getConds(Long poolId, EvalScopeEnum scopeType, Long referId, Long evalGroupRewardId, LocalDate dataDate) {
|
db4579e4
姜超
feature(*): 新增台阶类型
|
681
682
683
684
685
686
687
688
|
List<EvalGroupRewardPrecondition> preconditions = evalGroupRewardPreconditionService.list(Wrappers.<EvalGroupRewardPrecondition>lambdaQuery()
.eq(EvalGroupRewardPrecondition::getEvalGroupRewardId, evalGroupRewardId)
.eq(EvalGroupRewardPrecondition::getYn, Boolean.TRUE)
.orderByAsc(EvalGroupRewardPrecondition::getSort)
);
List<EvalGroupRewardPreconditionVO> preconditionVos = PublicUtil.copyList(preconditions, EvalGroupRewardPreconditionVO.class);
for (EvalGroupRewardPreconditionVO precondition : preconditionVos) {
if (TargetTypeEnum.NO.equals(precondition.getTargetType())) {
|
9bac7a5e
姜超
feature(*): 判断是否命...
|
689
690
691
692
693
694
695
696
697
698
|
LambdaQueryWrapper<IndicatorUserValue> queryWrapper = Wrappers.<IndicatorUserValue>lambdaQuery()
.in(IndicatorUserValue::getIndicatorCode, precondition.getCode())
.eq(IndicatorUserValue::getDataDate, dataDate)
.eq(IndicatorUserValue::getYn, Boolean.TRUE);
if (EvalScopeEnum.STAFF.equals(scopeType)) {
queryWrapper.eq(IndicatorUserValue::getUserId, referId);
} else {
queryWrapper.eq(IndicatorUserValue::getShopId, referId);
}
IndicatorUserValue indicatorUserValue = indicatorUserValueService.getOne(queryWrapper, Boolean.FALSE);
|
db4579e4
姜超
feature(*): 新增台阶类型
|
699
700
|
BigDecimal indicatorOriginValue = commonService.queryIndicatorValue(precondition.getCode(), indicatorUserValue);
precondition.setIndicatorValue(indicatorOriginValue);
|
9bac7a5e
姜超
feature(*): 判断是否命...
|
701
|
precondition.setHit(indicatorOriginValue.compareTo(precondition.getCondValue()) >= 0);
|
db4579e4
姜超
feature(*): 新增台阶类型
|
702
703
704
705
706
|
} else {
EvalGroupRewardTargetHitLog targetHitLog = evalGroupRewardTargetHitLogService.getOne(Wrappers.<EvalGroupRewardTargetHitLog>lambdaQuery()
.in(EvalGroupRewardTargetHitLog::getReferId, precondition.getId())
.eq(EvalGroupRewardTargetHitLog::getDataDate, dataDate)
.eq(EvalGroupRewardTargetHitLog::getPoolId, poolId)
|
9bac7a5e
姜超
feature(*): 判断是否命...
|
707
|
.eq(EvalGroupRewardTargetHitLog::getScopeType, scopeType)
|
db4579e4
姜超
feature(*): 新增台阶类型
|
708
709
710
711
712
713
|
.eq(EvalGroupRewardTargetHitLog::getYn, Boolean.TRUE),
Boolean.FALSE
);
Optional<EvalGroupRewardTargetHitLog> hitLog = Optional.ofNullable(targetHitLog);
precondition.setIndicatorValue(hitLog.map(EvalGroupRewardTargetHitLog::getValue).orElse(BigDecimal.ZERO));
precondition.setReachValue(hitLog.map(EvalGroupRewardTargetHitLog::getReachValue).orElse(BigDecimal.ZERO));
|
9bac7a5e
姜超
feature(*): 判断是否命...
|
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
|
precondition.setHit(precondition.getReachValue().compareTo(precondition.getCondValue()) >= 0);
}
if (ConditionTypeEnum.RANK.equals(precondition.getCondType())) {
EvalGroupRewardPreconditionHitLog preconditionHitLog = evalGroupRewardPreconditionHitLogService.getOne(Wrappers.<EvalGroupRewardPreconditionHitLog>lambdaQuery()
.eq(EvalGroupRewardPreconditionHitLog::getPreconditionId, precondition.getId())
.eq(EvalGroupRewardPreconditionHitLog::getDataDate, dataDate)
.eq(EvalGroupRewardPreconditionHitLog::getPoolId, poolId)
.eq(EvalGroupRewardPreconditionHitLog::getScopeType, scopeType)
.eq(EvalGroupRewardPreconditionHitLog::getYn, Boolean.TRUE)
, Boolean.FALSE
);
if (PublicUtil.isNotEmpty(preconditionHitLog)) {
Optional<EvalGroupRewardPreconditionHitLog> condOption = Optional.ofNullable(preconditionHitLog);
precondition.setRankCondValue(condOption.map(EvalGroupRewardPreconditionHitLog::getCondValue).orElse(BigDecimal.ZERO));
precondition.setRank(condOption.map(EvalGroupRewardPreconditionHitLog::getRank).orElse(0));
precondition.setHit(precondition.getRankCondValue().intValue() >= precondition.getRank());
}
|
db4579e4
姜超
feature(*): 新增台阶类型
|
731
|
}
|
db4579e4
姜超
feature(*): 新增台阶类型
|
732
733
734
735
|
}
return preconditionVos;
}
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
736
737
738
739
740
|
public List<EvalGroupRewardLaddersVO> getLadderVos(EvalPoolRewardDetailVO reward, Long hitLadderId) {
List<EvalGroupRewardLadders> rewardLadders = evalGroupRewardLaddersService.list(Wrappers.<EvalGroupRewardLadders>lambdaQuery()
.eq(EvalGroupRewardLadders::getEvalGroupRewardId, reward.getEvalGroupRewardId())
.eq(EvalGroupRewardLadders::getYn, Boolean.TRUE)
|
581e1dda
姜超
feature(*): 奖惩台阶展示修改
|
741
|
.last("order by rank_order_type ASC, lower ASC")
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
742
743
|
);
List<EvalGroupRewardLaddersVO> rewardLaddersVOS = new ArrayList<>();
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
744
745
746
747
748
749
750
751
752
|
for (EvalGroupRewardLadders rewardLadder : rewardLadders) {
EvalGroupRewardLaddersVO rewardLaddersVO = PublicUtil.copy(rewardLadder, EvalGroupRewardLaddersVO.class);
rewardLaddersVO.processPercent(reward.getCalMethod(), reward.getRankType(), reward.getLaddersType());
rewardLaddersVO.setHit(hitLadderId.equals(rewardLadder.getId()) ? Boolean.TRUE : Boolean.FALSE);
rewardLaddersVOS.add(rewardLaddersVO);
}
return rewardLaddersVOS;
}
|
e3e8a6ac
姜超
feature(*): 考评详情
|
753
|
public Map<ParamTypeEnum, List<EvalGroupRewardParamVO>> getEvalGroupRewardParamMap(Long evalGroupRewardId,
|
f692be3a
姜超
feature(*): 查询修改
|
754
755
756
757
|
Long evalPoolId,
EvalScopeEnum scopeType,
Long referId,
LocalDate dataDate) {
|
e3e8a6ac
姜超
feature(*): 考评详情
|
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
|
List<EvalGroupRewardParam> params = evalGroupRewardParamService.list(Wrappers.<EvalGroupRewardParam>lambdaQuery()
.eq(EvalGroupRewardParam::getEvalGroupRewardId, evalGroupRewardId)
.eq(EvalGroupRewardParam::getYn, Boolean.TRUE)
);
List<EvalGroupRewardParamVO> paramVos = PublicUtil.copyList(params, EvalGroupRewardParamVO.class);
List<Long> hasTargetParamIds = paramVos.stream()
.filter(param -> (! TargetTypeEnum.NO.equals(param.getTargetType())))
.map(EvalGroupRewardParamVO::getId).collect(Collectors.toList());
Map<Long, EvalGroupRewardTargetHitLog> paramTargetHitLogMap = new HashMap<>();
if (PublicUtil.isNotEmpty(hasTargetParamIds)) {
List<EvalGroupRewardTargetHitLog> targetHitLogs = evalGroupRewardTargetHitLogService.list(Wrappers.<EvalGroupRewardTargetHitLog>lambdaQuery()
.in(EvalGroupRewardTargetHitLog::getReferId, hasTargetParamIds)
.eq(EvalGroupRewardTargetHitLog::getDataDate, dataDate)
.eq(EvalGroupRewardTargetHitLog::getPoolId, evalPoolId)
|
f692be3a
姜超
feature(*): 查询修改
|
775
|
.eq(EvalGroupRewardTargetHitLog::getScopeType, scopeType)
|
e3e8a6ac
姜超
feature(*): 考评详情
|
776
777
778
779
780
781
782
783
784
785
786
787
|
.eq(EvalGroupRewardTargetHitLog::getYn, Boolean.TRUE)
);
paramTargetHitLogMap = targetHitLogs.stream()
.collect(Collectors.toMap(EvalGroupRewardTargetHitLog::getReferId, Function.identity(), (v1, v2) -> v1));
}
for (EvalGroupRewardParamVO paramVO : paramVos) {
paramVO.convertToPercent();
String code = paramVO.getCode();
Long paramId = paramVO.getId();
//无目标
if (TargetTypeEnum.NO.equals(paramVO.getTargetType())) {
|
74153fda
姜超
feature(*): 修改门店指标展示
|
788
|
BigDecimal indicatorOriginValue = queryUserOriginValue(code, referId, scopeType,dataDate, paramVO.getCodeType());
|
7060fbd3
姜超
feature(*): 修改代码格式
|
789
|
paramVO.setIndicatorValue(indicatorOriginValue);
|
e3e8a6ac
姜超
feature(*): 考评详情
|
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
|
continue;
}
//有目标
Optional<EvalGroupRewardTargetHitLog> hitLogOptional = Optional.ofNullable(paramTargetHitLogMap.get(paramId));
paramVO.setIndicatorValue(hitLogOptional.map(EvalGroupRewardTargetHitLog::getValue).orElse(BigDecimal.ZERO));
paramVO.setReachValue(hitLogOptional.map(EvalGroupRewardTargetHitLog::getReachValue).orElse(BigDecimal.ZERO));
}
Map<ParamTypeEnum, List<EvalGroupRewardParamVO>> indicatorParamMap = paramVos.stream()
.collect(Collectors.groupingBy(EvalGroupRewardParamVO::getParamType));
return indicatorParamMap;
}
public void processRewardPercent(EvalPoolRewardDetailVO detail) {
|
7f3e5385
姜超
feature(*): 展示占比字段
|
805
806
807
|
if (PublicUtil.isNotEmpty(detail.getProportionValue())) {
detail.setProportionValue(detail.getProportionValue().multiply(Constant.ONE_HUNDRED));
}
|
e3e8a6ac
姜超
feature(*): 考评详情
|
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
|
//提成
for (EvalGroupRewardParamVO paramVO : Optional.ofNullable(detail.getCommissionParams()).orElse(new ArrayList<>())) {
//指标原始值
if (DataTypeEnum.RATIO.equals(paramVO.getDataType())) {
paramVO.setIndicatorValue(Optional.ofNullable(paramVO.getIndicatorValue()).orElse(BigDecimal.ZERO).multiply(Constant.ONE_HUNDRED));
}
//有目标
if (! TargetTypeEnum.NO.equals(paramVO.getTargetType())) {
paramVO.setReachValue(Optional.ofNullable(paramVO.getReachValue()).orElse(BigDecimal.ZERO).multiply(Constant.ONE_HUNDRED));
}
}
for (EvalGroupRewardParamVO paramVO : Optional.ofNullable(detail.getLadderParams()).orElse(new ArrayList<>())) {
//指标原始值
if (DataTypeEnum.RATIO.equals(paramVO.getDataType())) {
paramVO.setIndicatorValue(Optional.ofNullable(paramVO.getIndicatorValue()).orElse(BigDecimal.ZERO).multiply(Constant.ONE_HUNDRED));
}
//有目标
if (! TargetTypeEnum.NO.equals(paramVO.getTargetType())) {
paramVO.setReachValue(Optional.ofNullable(paramVO.getReachValue()).orElse(BigDecimal.ZERO).multiply(Constant.ONE_HUNDRED));
}
}
for (EvalGroupRewardPreconditionVO preconditionVO : Optional.ofNullable(detail.getConds()).orElse(new ArrayList<>())) {
//指标原始值
|
beac6c98
姜超
feature(*): 分配查询
|
833
|
preconditionVO.convertValueToPercent();
|
f8a8c4c5
姜超
feature(*): 渲染值修改
|
834
|
|
beac6c98
姜超
feature(*): 分配查询
|
835
836
837
838
839
840
841
|
// if (DataTypeEnum.RATIO.equals(preconditionVO.getDataType())) {
// preconditionVO.setCondValue(Optional.ofNullable(preconditionVO.getIndicatorValue()).orElse(BigDecimal.ZERO).multiply(Constant.ONE_HUNDRED));
// }
// //有目标
// if (! TargetTypeEnum.NO.equals(preconditionVO.getTargetType())) {
// preconditionVO.setReachValue(Optional.ofNullable(preconditionVO.getReachValue()).orElse(BigDecimal.ZERO).multiply(Constant.ONE_HUNDRED));
// }
|
e3e8a6ac
姜超
feature(*): 考评详情
|
842
843
844
|
}
}
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
845
846
847
848
849
850
|
/**
* 查询指标排名
*
* @param dto
* @return
*/
|
e1778851
姜超
feature(*): 计算考评调整
|
851
|
public KpiIndicatorRankVO queryIndicatorRank(EvalGroupIndicatorRankDTO dto, EvalScopeEnum scopeType) {
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
852
853
854
855
856
857
|
Long referId = null;
String code = null;
String name = null;
IndicatorTypeEnum indicatorTypeEnum = IndicatorTypeEnum.EXAMINE;
TargetTypeEnum targetType = null;
DataTypeEnum dataType = null;
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
858
859
860
861
862
863
864
|
IndicatorCodeTypeEnum codeType = null;
if (dto.getIsEvalGroupIndicator()) {
if (PublicUtil.isNotEmpty(dto.getEvalGroupIndicatorParamId())) {
referId = dto.getEvalGroupIndicatorParamId();
EvalGroupIndicatorParam evalGroupIndicatorParam = evalGroupIndicatorParamService.getById(referId);
BV.notNull(evalGroupIndicatorParam, "数据不存在");
targetType = evalGroupIndicatorParam.getTargetType();
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
865
866
867
868
869
|
dataType = evalGroupIndicatorParam.getDataType();
codeType = evalGroupIndicatorParam.getCodeType();
code = evalGroupIndicatorParam.getCode();
name = evalGroupIndicatorParam.getName();
} else {
|
8a90c0e6
姜超
feature(*): 导入修改
|
870
|
referId = dto.getEvalGroupIndicatorPreconditionId();
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
871
872
873
874
|
indicatorTypeEnum = IndicatorTypeEnum.PRE;
EvalGroupIndicatorPrecondition evalGroupIndicatorPrecondition = evalGroupIndicatorPreconditionService.getById(referId);
BV.notNull(evalGroupIndicatorPrecondition, "数据不存在");
targetType = evalGroupIndicatorPrecondition.getTargetType();
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
875
876
877
878
879
880
881
882
883
884
885
|
dataType = evalGroupIndicatorPrecondition.getDataType();
codeType = evalGroupIndicatorPrecondition.getCodeType();
code = evalGroupIndicatorPrecondition.getCode();
name = evalGroupIndicatorPrecondition.getName();
}
} else {
if (PublicUtil.isNotEmpty(dto.getEvalGroupRewardParamId())) {
referId = dto.getEvalGroupRewardParamId();
EvalGroupRewardParam evalGroupRewardParam = evalGroupRewardParamService.getById(referId);
BV.notNull(evalGroupRewardParam, "数据不存在");
targetType = evalGroupRewardParam.getTargetType();
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
886
887
888
889
890
891
892
893
894
895
|
dataType = evalGroupRewardParam.getDataType();
codeType = evalGroupRewardParam.getCodeType();
code = evalGroupRewardParam.getCode();
name = evalGroupRewardParam.getName();
} else {
referId = dto.getEvalGroupRewardPreconditionId();
indicatorTypeEnum = IndicatorTypeEnum.PRE;
EvalGroupRewardPrecondition evalGroupRewardPrecondition = evalGroupRewardPreconditionService.getById(referId);
BV.notNull(evalGroupRewardPrecondition, "数据不存在");
targetType = evalGroupRewardPrecondition.getTargetType();
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
896
897
898
899
900
901
902
|
dataType = evalGroupRewardPrecondition.getDataType();
codeType = evalGroupRewardPrecondition.getCodeType();
code = evalGroupRewardPrecondition.getCode();
name = evalGroupRewardPrecondition.getName();
}
}
|
e1778851
姜超
feature(*): 计算考评调整
|
903
|
KpiIndicatorRankVO result = KpiIndicatorRankVO.builder()
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
904
905
906
907
908
909
910
|
.indicatorCode(code)
.indicatorName(name)
.dataType(dataType)
.targetType(targetType)
.deadlineDate(DateUtil.localDate2Date(dto.getDataDate()))
.build();
|
e1778851
姜超
feature(*): 计算考评调整
|
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
|
if (EvalScopeEnum.STAFF.equals(scopeType)) {
return getStaffIndicatorRank(dto, result, referId, indicatorTypeEnum, codeType);
}
return getShopIndicatorRank(dto, result, referId, indicatorTypeEnum, codeType);
}
public KpiIndicatorRankVO getStaffIndicatorRank(EvalGroupIndicatorRankDTO dto,
KpiIndicatorRankVO result,
Long referId,
IndicatorTypeEnum indicatorTypeEnum,
IndicatorCodeTypeEnum codeType) {
String code = result.getIndicatorCode();
LocalDate dataDate = dto.getDataDate();
TargetTypeEnum targetType = result.getTargetType();
List<EvalUserPool> pools = evalUserPoolService.list(Wrappers.<EvalUserPool>lambdaQuery()
.eq(EvalUserPool::getEvalGroupId, dto.getEvalGroupId())
.eq(EvalUserPool::getMonthly, YearMonth.from(dataDate))
.eq(EvalUserPool::getYn, Boolean.TRUE)
);
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
931
|
if (! TargetTypeEnum.NO.equals(targetType)) {
|
e1778851
姜超
feature(*): 计算考评调整
|
932
|
return queryTargetIndicatorRank(result, pools, dto.getDataDate(), referId, indicatorTypeEnum, dto.getIsEvalGroupIndicator());
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
933
934
935
|
}
if (IndicatorCodeTypeEnum.INDICATOR.equals(codeType)) {
|
e1778851
姜超
feature(*): 计算考评调整
|
936
937
|
result.setStaffs(getNoTargetIndicatorRanks(code, dataDate, pools));
return result;
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
938
939
|
}
|
e1778851
姜超
feature(*): 计算考评调整
|
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
|
result.setStaffs(getNoTargetEvalIndicatorRanks(code, dataDate, pools));
return result;
}
public KpiIndicatorRankVO getShopIndicatorRank(EvalGroupIndicatorRankDTO dto,
KpiIndicatorRankVO result,
Long referId,
IndicatorTypeEnum indicatorTypeEnum,
IndicatorCodeTypeEnum codeType) {
String code = result.getIndicatorCode();
LocalDate dataDate = dto.getDataDate();
TargetTypeEnum targetType = result.getTargetType();
List<EvalShopPool> pools = evalShopPoolService.list(Wrappers.<EvalShopPool>lambdaQuery()
.eq(EvalShopPool::getEvalGroupId, dto.getEvalGroupId())
.eq(EvalShopPool::getMonthly, YearMonth.from(dataDate))
.eq(EvalShopPool::getYn, Boolean.TRUE)
);
List<EvalIndicatorRankShopVO> shopVos = null;
if (! TargetTypeEnum.NO.equals(targetType)) {
shopVos = getShopTargetIndicatorRanks(referId, dataDate, pools, indicatorTypeEnum, result.getDataType());
} else {
if (IndicatorCodeTypeEnum.INDICATOR.equals(codeType)) {
shopVos = getShopNoTargetIndicatorRanks(code, dataDate, pools);
} else {
shopVos = getShopNoTargetEvalIndicatorRanks(code, dataDate, pools);
}
}
Collections.sort(shopVos);
calcShopRank(shopVos);
result.setShops(shopVos);
return result;
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
973
974
975
976
977
978
979
980
981
982
983
984
|
}
/**
* 无目标指标排名
*
* @param indicatorCode
* @param localDate
* @param pools
* @return
*/
public List<KpiIndicatorRankStaffVO> getNoTargetIndicatorRanks(String indicatorCode, LocalDate localDate, List<EvalUserPool> pools) {
Set<Long> userIds = pools.stream().map(EvalUserPool::getUserId).collect(Collectors.toSet());
|
e1778851
姜超
feature(*): 计算考评调整
|
985
|
List<IndicatorUserValueVO> indicatorUserValues = indicatorUserValueService.getStaffReportData(indicatorCode, YearMonth.from(localDate), userIds);
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
|
Map<Long, IndicatorUserValueVO> indicatorUserValueMap = indicatorUserValues.stream()
.collect(Collectors.toMap(IndicatorUserValueVO::getUserId, Function.identity(), (v1, v2) -> v1));
List<KpiIndicatorRankStaffVO> staffRanks = Lists.newArrayListWithCapacity(indicatorUserValues.size());
for (EvalUserPool kpiPool : pools) {
KpiIndicatorRankStaffVO rankStaffVO = new KpiIndicatorRankStaffVO();
rankStaffVO.setUserId(kpiPool.getUserId());
rankStaffVO.setUserName(kpiPool.getUserName());
rankStaffVO.setPostId(kpiPool.getPostId());
rankStaffVO.setPostName(kpiPool.getPostName());
rankStaffVO.setShopId(kpiPool.getShopId());
rankStaffVO.setShopName(kpiPool.getShopName());
rankStaffVO.setInclusion(kpiPool.getInclusion());
if (indicatorUserValueMap.containsKey(kpiPool.getUserId())) {
IndicatorUserValueVO indicatorUserValueVO = indicatorUserValueMap.get(kpiPool.getUserId());
rankStaffVO.setOriginValue(commonService.queryIndicatorValueVO(indicatorCode, indicatorUserValueVO));
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
|
}
staffRanks.add(rankStaffVO);
}
Collections.sort(staffRanks);
calcRank(staffRanks);
return staffRanks;
}
/**
* 无目标指标排名
*
* @param indicatorCode
* @param localDate
* @param pools
* @return
*/
|
e1778851
姜超
feature(*): 计算考评调整
|
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
|
public List<EvalIndicatorRankShopVO> getShopNoTargetIndicatorRanks(String indicatorCode, LocalDate localDate, List<EvalShopPool> pools) {
Set<Long> shopIds = pools.stream().map(EvalShopPool::getShopId).collect(Collectors.toSet());
List<IndicatorUserValueVO> indicatorUserValues = indicatorUserValueService.getShopReportData(indicatorCode, YearMonth.from(localDate), shopIds);
Map<Long, IndicatorUserValueVO> indicatorUserValueMap = indicatorUserValues.stream()
.collect(Collectors.toMap(IndicatorUserValueVO::getUserId, Function.identity(), (v1, v2) -> v1));
List<EvalIndicatorRankShopVO> staffRanks = Lists.newArrayListWithCapacity(indicatorUserValues.size());
for (EvalShopPool pool : pools) {
EvalIndicatorRankShopVO rankShopVO = new EvalIndicatorRankShopVO();
rankShopVO.setShopId(pool.getShopId());
rankShopVO.setShopName(pool.getShopName());
if (indicatorUserValueMap.containsKey(pool.getShopId())) {
IndicatorUserValueVO indicatorUserValueVO = indicatorUserValueMap.get(pool.getShopId());
rankShopVO.setOriginValue(commonService.queryIndicatorValueVO(indicatorCode, indicatorUserValueVO));
}
staffRanks.add(rankShopVO);
}
return staffRanks;
}
/**
* 无目标指标排名
*
* @param indicatorCode
* @param localDate
* @param pools
* @return
*/
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
1050
1051
1052
1053
|
public List<KpiIndicatorRankStaffVO> getNoTargetEvalIndicatorRanks(String indicatorCode, LocalDate localDate, List<EvalUserPool> pools) {
Set<Long> userIds = pools.stream().map(EvalUserPool::getUserId).collect(Collectors.toSet());
YearMonth lastMonth = YearMonth.from(localDate).minusMonths(1);
|
e1778851
姜超
feature(*): 计算考评调整
|
1054
|
List<EvalIndicatorValue> indicatorUserValues = evalIndicatorValueService.getStaffReportData(indicatorCode, lastMonth, userIds);
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
|
Map<Long, EvalIndicatorValue> indicatorUserValueMap = indicatorUserValues.stream()
.collect(Collectors.toMap(EvalIndicatorValue::getUserId, Function.identity(), (v1, v2) -> v1));
List<KpiIndicatorRankStaffVO> staffRanks = Lists.newArrayListWithCapacity(indicatorUserValues.size());
for (EvalUserPool kpiPool : pools) {
KpiIndicatorRankStaffVO rankStaffVO = new KpiIndicatorRankStaffVO();
rankStaffVO.setUserId(kpiPool.getUserId());
rankStaffVO.setUserName(kpiPool.getUserName());
rankStaffVO.setPostId(kpiPool.getPostId());
rankStaffVO.setPostName(kpiPool.getPostName());
rankStaffVO.setShopId(kpiPool.getShopId());
rankStaffVO.setShopName(kpiPool.getShopName());
rankStaffVO.setInclusion(kpiPool.getInclusion());
if (indicatorUserValueMap.containsKey(kpiPool.getUserId())) {
EvalIndicatorValue indicatorUserValueVO = indicatorUserValueMap.get(kpiPool.getUserId());
rankStaffVO.setOriginValue(commonService.queryEvalIndicatorValueVO(indicatorCode, indicatorUserValueVO));
}
staffRanks.add(rankStaffVO);
}
Collections.sort(staffRanks);
calcRank(staffRanks);
return staffRanks;
}
|
e1778851
姜超
feature(*): 计算考评调整
|
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
|
/**
* 无目标指标排名
*
* @param indicatorCode
* @param localDate
* @param pools
* @return
*/
public List<EvalIndicatorRankShopVO> getShopNoTargetEvalIndicatorRanks(String indicatorCode, LocalDate localDate, List<EvalShopPool> pools) {
Set<Long> shopIds = pools.stream().map(EvalShopPool::getShopId).collect(Collectors.toSet());
YearMonth lastMonth = YearMonth.from(localDate).minusMonths(1);
List<EvalIndicatorValue> indicatorUserValues = evalIndicatorValueService.getShopReportData(indicatorCode, lastMonth, shopIds);
Map<Long, EvalIndicatorValue> indicatorUserValueMap = indicatorUserValues.stream()
|
74153fda
姜超
feature(*): 修改门店指标展示
|
1098
|
.collect(Collectors.toMap(EvalIndicatorValue::getShopId, Function.identity(), (v1, v2) -> v1));
|
e1778851
姜超
feature(*): 计算考评调整
|
1099
1100
1101
1102
1103
1104
|
List<EvalIndicatorRankShopVO> staffRanks = Lists.newArrayListWithCapacity(indicatorUserValues.size());
for (EvalShopPool pool : pools) {
EvalIndicatorRankShopVO shopVO = new EvalIndicatorRankShopVO();
shopVO.setShopId(pool.getShopId());
shopVO.setShopName(pool.getShopName());
|
74153fda
姜超
feature(*): 修改门店指标展示
|
1105
|
shopVO.setOriginValue(BigDecimal.ZERO);
|
e1778851
姜超
feature(*): 计算考评调整
|
1106
1107
1108
1109
1110
1111
1112
1113
1114
|
if (indicatorUserValueMap.containsKey(pool.getShopId())) {
EvalIndicatorValue indicatorUserValueVO = indicatorUserValueMap.get(pool.getShopId());
shopVO.setOriginValue(commonService.queryEvalIndicatorValueVO(indicatorCode, indicatorUserValueVO));
}
staffRanks.add(shopVO);
}
return staffRanks;
}
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
|
public KpiIndicatorRankVO queryTargetIndicatorRank(KpiIndicatorRankVO kpiIndicatorRankVO,
List<EvalUserPool> pools,
LocalDate dataDate,
Long referId,
IndicatorTypeEnum indicatorTypeEnum,
Boolean isEvalGroupIndicator) {
List<KpiIndicatorRankStaffVO> staffs = null;
if (isEvalGroupIndicator) {
staffs = getTargetIndicatorRanks(referId, dataDate, pools, indicatorTypeEnum, kpiIndicatorRankVO.getDataType());
} else {
staffs = getTargetRewardRanks(referId, dataDate, pools, indicatorTypeEnum, kpiIndicatorRankVO.getDataType());
}
Collections.sort(staffs);
calcRank(staffs);
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
|
kpiIndicatorRankVO.setStaffs(staffs);
return kpiIndicatorRankVO;
}
/**
* 有目标指标排名
*
* @param referId
* @param localDate
* @param pools
* @param indicatorTypeEnum
* @return
*/
public List<KpiIndicatorRankStaffVO> getTargetIndicatorRanks(Long referId,
LocalDate localDate,
List<EvalUserPool> pools,
IndicatorTypeEnum indicatorTypeEnum,
DataTypeEnum dataType) {
Set<Long> poolIds = pools.stream().map(EvalUserPool::getId).collect(Collectors.toSet());
List<EvalGroupIndicatorTargetHitLogVO> indicatorTargetHitLogs = evalGroupIndicatorTargetHitLogService.getIndicatorData(referId,
YearMonth.from(localDate), indicatorTypeEnum, poolIds, EvalScopeEnum.STAFF);
Map<Long, EvalGroupIndicatorTargetHitLogVO> indicatorTargetMap = indicatorTargetHitLogs.stream()
.collect(Collectors.toMap(EvalGroupIndicatorTargetHitLogVO::getPoolId, Function.identity(), (v1, v2) -> v1));
List<KpiIndicatorRankStaffVO> staffRanks = Lists.newArrayListWithCapacity(indicatorTargetMap.size());
for (EvalUserPool userPool : pools) {
KpiIndicatorRankStaffVO rankStaffVO = new KpiIndicatorRankStaffVO();
rankStaffVO.setUserId(userPool.getUserId());
rankStaffVO.setUserName(userPool.getUserName());
rankStaffVO.setPostId(userPool.getPostId());
rankStaffVO.setPostName(userPool.getPostName());
rankStaffVO.setShopId(userPool.getShopId());
rankStaffVO.setShopName(userPool.getShopName());
rankStaffVO.setInclusion(userPool.getInclusion());
if (indicatorTargetMap.containsKey(userPool.getId())) {
EvalGroupIndicatorTargetHitLogVO targetHitLogVO = indicatorTargetMap.get(userPool.getId());
rankStaffVO.setOriginValue(targetHitLogVO.getValue());
rankStaffVO.setReachValue(targetHitLogVO.getReachValue());
rankStaffVO.convertValueForTarget(dataType);
}
staffRanks.add(rankStaffVO);
}
Collections.sort(staffRanks);
calcRank(staffRanks);
return staffRanks;
}
/**
* 有目标指标排名
*
* @param referId
* @param localDate
* @param pools
* @param indicatorTypeEnum
* @return
*/
|
e1778851
姜超
feature(*): 计算考评调整
|
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
|
public List<EvalIndicatorRankShopVO> getShopTargetIndicatorRanks(Long referId,
LocalDate localDate,
List<EvalShopPool> pools,
IndicatorTypeEnum indicatorTypeEnum,
DataTypeEnum dataType) {
Set<Long> poolIds = pools.stream().map(EvalShopPool::getId).collect(Collectors.toSet());
List<EvalGroupIndicatorTargetHitLogVO> indicatorTargetHitLogs = evalGroupIndicatorTargetHitLogService.getIndicatorData(referId,
YearMonth.from(localDate), indicatorTypeEnum, poolIds, EvalScopeEnum.SHOP);
Map<Long, EvalGroupIndicatorTargetHitLogVO> indicatorTargetMap = indicatorTargetHitLogs.stream()
.collect(Collectors.toMap(EvalGroupIndicatorTargetHitLogVO::getPoolId, Function.identity(), (v1, v2) -> v1));
List<EvalIndicatorRankShopVO> shopRanks = Lists.newArrayListWithCapacity(indicatorTargetMap.size());
for (EvalShopPool shopPool : pools) {
EvalIndicatorRankShopVO shopVO = new EvalIndicatorRankShopVO();
shopVO.setShopId(shopPool.getShopId());
shopVO.setShopName(shopPool.getShopName());
if (indicatorTargetMap.containsKey(shopPool.getId())) {
EvalGroupIndicatorTargetHitLogVO targetHitLogVO = indicatorTargetMap.get(shopPool.getId());
shopVO.setOriginValue(targetHitLogVO.getValue());
shopVO.setReachValue(targetHitLogVO.getReachValue());
shopVO.convertValueForTarget(dataType);
}
shopRanks.add(shopVO);
}
return shopRanks;
}
/**
* 有目标指标排名
*
* @param referId
* @param localDate
* @param pools
* @param indicatorTypeEnum
* @return
*/
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
|
public List<KpiIndicatorRankStaffVO> getTargetRewardRanks(Long referId,
LocalDate localDate,
List<EvalUserPool> pools,
IndicatorTypeEnum indicatorTypeEnum,
DataTypeEnum dataType) {
Set<Long> poolIds = pools.stream().map(EvalUserPool::getId).collect(Collectors.toSet());
List<EvalGroupRewardTargetHitLogVO> indicatorTargetHitLogs = evalGroupRewardTargetHitLogService.getIndicatorData(referId,
YearMonth.from(localDate), indicatorTypeEnum, poolIds, EvalScopeEnum.STAFF);
Map<Long, EvalGroupRewardTargetHitLogVO> indicatorTargetMap = indicatorTargetHitLogs.stream()
.collect(Collectors.toMap(EvalGroupRewardTargetHitLogVO::getPoolId, Function.identity(), (v1, v2) -> v1));
List<KpiIndicatorRankStaffVO> staffRanks = Lists.newArrayListWithCapacity(indicatorTargetMap.size());
for (EvalUserPool userPool : pools) {
KpiIndicatorRankStaffVO rankStaffVO = new KpiIndicatorRankStaffVO();
rankStaffVO.setUserId(userPool.getUserId());
rankStaffVO.setUserName(userPool.getUserName());
rankStaffVO.setPostId(userPool.getPostId());
rankStaffVO.setPostName(userPool.getPostName());
rankStaffVO.setShopId(userPool.getShopId());
rankStaffVO.setShopName(userPool.getShopName());
rankStaffVO.setInclusion(userPool.getInclusion());
|
f8a8c4c5
姜超
feature(*): 渲染值修改
|
1251
1252
|
if (indicatorTargetMap.containsKey(userPool.getId())) {
EvalGroupRewardTargetHitLogVO targetHitLogVO = indicatorTargetMap.get(userPool.getId());
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
|
rankStaffVO.setOriginValue(targetHitLogVO.getValue());
rankStaffVO.setReachValue(targetHitLogVO.getReachValue());
rankStaffVO.convertValueForTarget(dataType);
}
staffRanks.add(rankStaffVO);
}
Collections.sort(staffRanks);
calcRank(staffRanks);
return staffRanks;
}
/**
* 设置排名序号
*
* @return
*/
public void calcRank(List<KpiIndicatorRankStaffVO> staffs) {
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
|
int rank = 1;
BigDecimal lastIndicatorValue = null;
for (KpiIndicatorRankStaffVO staff : staffs) {
if (! staff.getInclusion()) {
continue;
}
if (PublicUtil.isEmpty(lastIndicatorValue) || PublicUtil.isEmpty(staff.getOriginValue()) ) {
staff.setIndicatorRank(rank);
lastIndicatorValue = staff.getOriginValue();
continue;
}
if (lastIndicatorValue.compareTo(staff.getOriginValue()) != 0) {
rank++;
}
staff.setIndicatorRank(rank);
lastIndicatorValue = staff.getOriginValue();
}
|
bdcc7a51
姜超
feature(*): 查询指标排名
|
1288
1289
|
}
|
e1778851
姜超
feature(*): 计算考评调整
|
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
|
/**
* 设置排名序号
*
* @return
*/
public void calcShopRank(List<EvalIndicatorRankShopVO> shops) {
int rank = 1;
BigDecimal lastIndicatorValue = null;
for (EvalIndicatorRankShopVO shop : shops) {
if (PublicUtil.isEmpty(lastIndicatorValue) || PublicUtil.isEmpty(shop.getOriginValue()) ) {
shop.setIndicatorRank(rank);
lastIndicatorValue = shop.getOriginValue();
continue;
}
if (lastIndicatorValue.compareTo(shop.getOriginValue()) != 0) {
rank++;
}
shop.setIndicatorRank(rank);
lastIndicatorValue = shop.getOriginValue();
}
}
|
5ff2c525
姜超
feature(*): 并列排名计算
|
1312
1313
1314
|
public List<EvalGroupRewardRankLogVO> getRewardCondRankLogs(Long preconditionId, LocalDate dataDate) {
EvalGroupRewardPrecondition precondition = evalGroupRewardPreconditionService.getById(preconditionId);
BV.notNull(precondition, "奖惩条件不存在");
|
224ee28b
姜超
feature(*): 排名修改
|
1315
|
BV.isTrue(ConditionTypeEnum.RANK.equals(precondition.getCondType()), "满足排名率条件才能查询排名情况");
|
5ff2c525
姜超
feature(*): 并列排名计算
|
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
|
final DataTypeEnum dataType = precondition.getDataType();
final TargetTypeEnum targetType = precondition.getTargetType();
List<EvalGroupRewardRankLog> rankLogs = evalGroupRewardRankLogService.list(Wrappers.<EvalGroupRewardRankLog>lambdaQuery()
.eq(EvalGroupRewardRankLog::getDataDate, dataDate)
.eq(EvalGroupRewardRankLog::getReferId, preconditionId)
.eq(EvalGroupRewardRankLog::getTargetType, RankIndicatorTypeEnum.PRE)
.eq(EvalGroupRewardRankLog::getYn, Boolean.TRUE)
);
Collections.sort(rankLogs);
List<EvalGroupRewardRankLogVO> rankLogVOs = PublicUtil.copyList(rankLogs, EvalGroupRewardRankLogVO.class);
|
224ee28b
姜超
feature(*): 排名修改
|
1327
|
rankLogVOs.stream().forEach(rankLog -> rankLog.convertPercentForCond(dataType, targetType));
|
5ff2c525
姜超
feature(*): 并列排名计算
|
1328
1329
1330
|
return rankLogVOs;
}
|
220b9724
姜超
feature(*): 代码调整
|
1331
|
public List<EvalGroupRewardRankLogVO> queryRewardCommissionRank(Long evalGroupRewardId, LocalDate dataDate) {
|
224ee28b
姜超
feature(*): 排名修改
|
1332
1333
|
EvalGroupReward reward = evalGroupRewardService.getById(evalGroupRewardId);
BV.notNull(reward, "奖惩不存在");
|
5ff2c525
姜超
feature(*): 并列排名计算
|
1334
1335
|
List<EvalGroupRewardRankLog> rankLogs = evalGroupRewardRankLogService.list(Wrappers.<EvalGroupRewardRankLog>lambdaQuery()
.eq(EvalGroupRewardRankLog::getDataDate, dataDate)
|
220b9724
姜超
feature(*): 代码调整
|
1336
|
.eq(EvalGroupRewardRankLog::getReferId, evalGroupRewardId)
|
5ff2c525
姜超
feature(*): 并列排名计算
|
1337
1338
1339
1340
|
.eq(EvalGroupRewardRankLog::getTargetType, RankIndicatorTypeEnum.REWARD_COMMISSION)
.eq(EvalGroupRewardRankLog::getYn, Boolean.TRUE)
);
Collections.sort(rankLogs);
|
5ff2c525
姜超
feature(*): 并列排名计算
|
1341
|
List<EvalGroupRewardRankLogVO> rankLogVOs = PublicUtil.copyList(rankLogs, EvalGroupRewardRankLogVO.class);
|
5ff2c525
姜超
feature(*): 并列排名计算
|
1342
1343
|
return rankLogVOs;
}
|
c4a10f17
姜超
feature(*): 保存排名名次修改
|
1344
|
|
9161579f
姜超
feature(*): 排名返回名称
|
1345
|
public List<EvalGroupRewardHitLogVO> queryRewardProportion(EvalScopeEnum scopeType, Long evalGroupRewardId, LocalDate dataDate) {
|
0caae0d1
姜超
feature(*): 修改排名展示
|
1346
1347
|
EvalGroupReward reward = evalGroupRewardService.getById(evalGroupRewardId);
BV.notNull(reward, "奖惩不存在");
|
9161579f
姜超
feature(*): 排名返回名称
|
1348
1349
1350
1351
1352
1353
|
List<EvalGroupRewardHitLogVO> hitLogVOS = null;
if (EvalScopeEnum.STAFF.equals(scopeType)) {
hitLogVOS = evalGroupRewardHitLogService.getUserHitLogs(evalGroupRewardId, dataDate);
} else {
hitLogVOS = evalGroupRewardHitLogService.getShopHitLogs(evalGroupRewardId, dataDate);
}
|
0caae0d1
姜超
feature(*): 修改排名展示
|
1354
|
hitLogVOS.stream().forEach(hitLog -> hitLog.convertValueToPercent(reward.getLaddersType()));
|
c4a10f17
姜超
feature(*): 保存排名名次修改
|
1355
1356
|
return hitLogVOS;
}
|
ea6b2fd6
姜超
feature(*): 门店奖惩分配
|
1357
|
}
|