Commit 2b241dae6a022cbc78afa10c9847d2ade6cd615c
1 parent
d8325100
feature(*): 奖惩分配状态设置
奖惩分配状态设置
Showing
4 changed files
with
86 additions
and
2 deletions
fw-morax-domain/src/main/java/cn/fw/morax/domain/db/eval/EvalRewardDistDetail.java
1 | 1 | package cn.fw.morax.domain.db.eval; |
2 | 2 | |
3 | 3 | import cn.fw.common.data.entity.BaseAuditableTimeEntity; |
4 | +import cn.fw.morax.domain.enums.EvalRewardPushStatusEnum; | |
4 | 5 | import com.baomidou.mybatisplus.annotation.TableLogic; |
5 | 6 | import com.baomidou.mybatisplus.annotation.TableName; |
6 | 7 | import lombok.Data; |
... | ... | @@ -70,7 +71,7 @@ public class EvalRewardDistDetail extends BaseAuditableTimeEntity<EvalRewardDist |
70 | 71 | /** |
71 | 72 | * 状态 |
72 | 73 | */ |
73 | - private Integer status; | |
74 | + private EvalRewardPushStatusEnum status; | |
74 | 75 | |
75 | 76 | /** |
76 | 77 | * 集团id | ... | ... |
fw-morax-domain/src/main/java/cn/fw/morax/domain/dto/eval/EvalRewardDistDetailDTO.java
1 | 1 | package cn.fw.morax.domain.dto.eval; |
2 | 2 | |
3 | 3 | import cn.fw.morax.domain.db.eval.EvalRewardDistDetail; |
4 | +import cn.fw.morax.domain.enums.EvalRewardPushStatusEnum; | |
4 | 5 | import lombok.Data; |
5 | 6 | import lombok.EqualsAndHashCode; |
6 | 7 | import lombok.experimental.Accessors; |
... | ... | @@ -86,7 +87,7 @@ public class EvalRewardDistDetailDTO { |
86 | 87 | evalRewardDistDetail.setShopId(this.getShopId()); |
87 | 88 | evalRewardDistDetail.setShopName(this.getShopName()); |
88 | 89 | evalRewardDistDetail.setReward(this.getReward()); |
89 | - evalRewardDistDetail.setStatus(this.getStatus()); | |
90 | + evalRewardDistDetail.setStatus(EvalRewardPushStatusEnum.APPROVAL); | |
90 | 91 | evalRewardDistDetail.setGroupId(this.getGroupId()); |
91 | 92 | evalRewardDistDetail.setYn(Boolean.TRUE); |
92 | 93 | return evalRewardDistDetail; | ... | ... |
fw-morax-domain/src/main/java/cn/fw/morax/domain/enums/EvalRewardPushStatusEnum.java
0 → 100644
1 | +package cn.fw.morax.domain.enums; | |
2 | + | |
3 | +import com.baomidou.mybatisplus.core.enums.IEnum; | |
4 | +import com.fasterxml.jackson.annotation.JsonCreator; | |
5 | +import com.fasterxml.jackson.annotation.JsonValue; | |
6 | +import lombok.Getter; | |
7 | + | |
8 | +/** | |
9 | + * 考评奖惩推送 | |
10 | + * | |
11 | + * @author kurisu | |
12 | + */ | |
13 | +public enum EvalRewardPushStatusEnum implements IEnum<Integer> { | |
14 | + /** | |
15 | + * 考评奖惩推送; 1:审批中 2:等待推送 3:推送成功 4:推送失败 | |
16 | + */ | |
17 | + APPROVAL(1, "审批中"), | |
18 | + WAIT_PUSH(2, "等待推送"), | |
19 | + PUSH_SUCCESS(3, "推送成功"), | |
20 | + PUSH_FAIL(4, "推送失败"), | |
21 | + ; | |
22 | + | |
23 | + /** | |
24 | + * 值 | |
25 | + */ | |
26 | + private final Integer value; | |
27 | + /** | |
28 | + * 名称 | |
29 | + */ | |
30 | + @Getter | |
31 | + private final String name; | |
32 | + | |
33 | + EvalRewardPushStatusEnum(final Integer value, final String name) { | |
34 | + this.value = value; | |
35 | + this.name = name; | |
36 | + } | |
37 | + | |
38 | + /** | |
39 | + * 根据枚举值获取枚举对象 | |
40 | + */ | |
41 | + @JsonCreator | |
42 | + public static EvalRewardPushStatusEnum ofValue(final Integer value) { | |
43 | + for (final EvalRewardPushStatusEnum _enum : EvalRewardPushStatusEnum.values()) { | |
44 | + if (_enum.value.equals(value)) { | |
45 | + return _enum; | |
46 | + } | |
47 | + } | |
48 | + return null; | |
49 | + } | |
50 | + | |
51 | + /** | |
52 | + * 获取值 | |
53 | + * | |
54 | + * @return 值 | |
55 | + */ | |
56 | + @JsonValue | |
57 | + @Override | |
58 | + public Integer getValue() { | |
59 | + return value; | |
60 | + } | |
61 | + | |
62 | + /** | |
63 | + * 获取描述 | |
64 | + * | |
65 | + * @return 值 | |
66 | + */ | |
67 | + @JsonCreator | |
68 | + public static String getNameByVale(final Integer value) { | |
69 | + for (final EvalRewardPushStatusEnum _enum : EvalRewardPushStatusEnum.values()) { | |
70 | + if (_enum.value.equals(value)) { | |
71 | + return _enum.getName(); | |
72 | + } | |
73 | + } | |
74 | + return ""; | |
75 | + } | |
76 | +} | ... | ... |
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalRewardService.java
... | ... | @@ -355,6 +355,12 @@ public class EvalRewardService { |
355 | 355 | throw new BusinessException("奖惩分配失败,请重试"); |
356 | 356 | } |
357 | 357 | rewardDist.setStatus(EvalRewardDistStatusEnum.APPROVAL_AGREE); |
358 | + evalRewardDistDetailService.update(Wrappers.<EvalRewardDistDetail>lambdaUpdate() | |
359 | + .eq(EvalRewardDistDetail::getDistId, rewardDistId) | |
360 | + .eq(EvalRewardDistDetail::getYn, Boolean.TRUE) | |
361 | + .set(EvalRewardDistDetail::getStatus, EvalRewardPushStatusEnum.WAIT_PUSH) | |
362 | + .set(EvalRewardDistDetail::getUpdateTime, new Date()) | |
363 | + ); | |
358 | 364 | } |
359 | 365 | evalRewardDistService.saveOrUpdate(rewardDist); |
360 | 366 | } | ... | ... |