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