KPI / fw-morax

Commit 9ecc8f2da6e2bedf52484d3fc6e09a4d0fa71109

Authored by 姜超
1 parent 347b9a76

feature(*): 数据录入修改 

数据录入修改
Inline Side-by-side
Showing 5 changed files with 136 additions and 14 deletions
fw-morax-domain/src/main/java/cn/fw/morax/domain/dto/eval/EvalRewardDistDetailDTO.java
  View file @9ecc8f2
1 1 package cn.fw.morax.domain.dto.eval;
2 2  
  3 +import cn.fw.morax.domain.db.eval.EvalRewardDistDetail;
3 4 import lombok.Data;
4 5 import lombok.EqualsAndHashCode;
5 6 import lombok.experimental.Accessors;
... ... @@ -75,6 +76,20 @@ public class EvalRewardDistDetailDTO {
75 76 @NotNull(message = "集团不能为空")
76 77 private Long groupId;
77 78  
78   -
  79 + public EvalRewardDistDetail convertPo(Long rewardDistId) {
  80 + EvalRewardDistDetail evalRewardDistDetail = new EvalRewardDistDetail();
  81 + evalRewardDistDetail.setEvalShopDistId(rewardDistId);
  82 + evalRewardDistDetail.setUserId(this.getUserId());
  83 + evalRewardDistDetail.setUserName(this.getUserName());
  84 + evalRewardDistDetail.setPostId(this.getPostId());
  85 + evalRewardDistDetail.setPostName(this.getPostName());
  86 + evalRewardDistDetail.setShopId(this.getShopId());
  87 + evalRewardDistDetail.setShopName(this.getShopName());
  88 + evalRewardDistDetail.setReward(this.getReward());
  89 + evalRewardDistDetail.setStatus(this.getStatus());
  90 + evalRewardDistDetail.setGroupId(this.getGroupId());
  91 + evalRewardDistDetail.setYn(Boolean.TRUE);
  92 + return evalRewardDistDetail;
  93 + }
79 94  
80 95 }
... ...
fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/eval/EvalRewardDistDetailVO.java 0 → 100644
  View file @9ecc8f2
  1 +package cn.fw.morax.domain.vo.eval;
  2 +
  3 +import cn.fw.common.data.entity.BaseAuditableTimeEntity;
  4 +import com.baomidou.mybatisplus.annotation.TableLogic;
  5 +import com.baomidou.mybatisplus.annotation.TableName;
  6 +import lombok.Data;
  7 +import lombok.EqualsAndHashCode;
  8 +import lombok.experimental.Accessors;
  9 +
  10 +import java.math.BigDecimal;
  11 +
  12 +/**
  13 + * <p>
  14 + * 考评池
  15 + * </p>
  16 + *
  17 + * @author jiangchao
  18 + * @since 2023-02-23
  19 + */
  20 +@Data
  21 +@EqualsAndHashCode(callSuper = false)
  22 +@Accessors(chain = true)
  23 +public class EvalRewardDistDetailVO {
  24 +
  25 + private static final long serialVersionUID = 1L;
  26 +
  27 + /**
  28 + * id
  29 + */
  30 + private Long id;
  31 + /**
  32 + * 分配d
  33 + */
  34 + private Long evalShopDistId;
  35 +
  36 + /**
  37 + * 用户id
  38 + */
  39 + private Long userId;
  40 +
  41 + /**
  42 + * 用户名称
  43 + */
  44 + private String userName;
  45 +
  46 + /**
  47 + * 岗位id
  48 + */
  49 + private Long postId;
  50 +
  51 + /**
  52 + * 岗位名称
  53 + */
  54 + private String postName;
  55 +
  56 + /**
  57 + * 门店id
  58 + */
  59 + private Long shopId;
  60 +
  61 + /**
  62 + * 门店名称
  63 + */
  64 + private String shopName;
  65 +
  66 + /**
  67 + * 奖惩
  68 + */
  69 + private BigDecimal reward;
  70 +
  71 + /**
  72 + * 状态
  73 + */
  74 + private Integer status;
  75 +
  76 + /**
  77 + * 集团id
  78 + */
  79 + private Long groupId;
  80 +
  81 + /**
  82 + * 逻辑删除
  83 + */
  84 + @TableLogic
  85 + private Boolean yn;
  86 +
  87 +
  88 +}
... ...
fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/eval/EvalRewardDistVO.java
  View file @9ecc8f2
... ... @@ -2,6 +2,7 @@ package cn.fw.morax.domain.vo.eval;
2 2  
3 3 import cn.fw.common.data.entity.BaseAuditableTimeEntity;
4 4 import cn.fw.common.data.mybatis.handler.LongListTypeHandler;
  5 +import cn.fw.morax.domain.enums.EvalRewardDistStatusEnum;
5 6 import com.baomidou.mybatisplus.annotation.TableField;
6 7 import com.baomidou.mybatisplus.annotation.TableLogic;
7 8 import com.baomidou.mybatisplus.annotation.TableName;
... ... @@ -28,6 +29,10 @@ public class EvalRewardDistVO {
28 29 private static final long serialVersionUID = 1L;
29 30  
30 31 /**
  32 + * id
  33 + */
  34 + private Long id;
  35 + /**
31 36 * 用户id
32 37 */
33 38 private Long userId;
... ... @@ -62,7 +67,7 @@ public class EvalRewardDistVO {
62 67 /**
63 68 * 状态
64 69 */
65   - private Integer status;
  70 + private EvalRewardDistStatusEnum status;
66 71  
67 72 /**
68 73 * 集团id
... ... @@ -74,5 +79,10 @@ public class EvalRewardDistVO {
74 79 */
75 80 private List<EvalShopPoolVO> shopPools;
76 81  
  82 + /**
  83 + * 奖惩详情
  84 + */
  85 + private List<EvalRewardDistDetailVO> rewardDetails;
  86 +
77 87  
78 88 }
... ...
fw-morax-server/src/main/java/cn/fw/morax/server/controller/app/EvalController.java
  View file @9ecc8f2
... ... @@ -300,4 +300,6 @@ public class EvalController {
300 300 return success();
301 301 }
302 302  
  303 +
  304 +
303 305 }
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalRewardService.java
  View file @9ecc8f2
... ... @@ -15,6 +15,7 @@ import cn.fw.morax.domain.db.eval.*;
15 15 import cn.fw.morax.domain.dto.eval.EvalRewardDistDTO;
16 16 import cn.fw.morax.domain.dto.eval.EvalRewardDistDetailDTO;
17 17 import cn.fw.morax.domain.enums.*;
  18 +import cn.fw.morax.domain.vo.eval.EvalRewardDistDetailVO;
18 19 import cn.fw.morax.domain.vo.eval.EvalRewardDistVO;
19 20 import cn.fw.morax.domain.vo.eval.EvalShopPoolVO;
20 21 import cn.fw.morax.rpc.backlog.TodoRpcService;
... ... @@ -292,6 +293,16 @@ public class EvalRewardService {
292 293 BV.isNotEmpty(pools, "奖惩分配不存在，请重试");
293 294 List<EvalShopPoolVO> shopPools = PublicUtil.copyList(pools, EvalShopPoolVO.class);
294 295 rewardDistVO.setShopPools(shopPools);
  296 +
  297 + if (EvalRewardDistStatusEnum.APPROVAL.equals(rewardDist.getStatus())) {
  298 + List<EvalRewardDistDetail> details = evalRewardDistDetailService.list(Wrappers.<EvalRewardDistDetail>lambdaQuery()
  299 + .eq(EvalRewardDistDetail::getId, rewardDistVO.getId())
  300 + .eq(EvalRewardDistDetail::getYn, Boolean.TRUE)
  301 + );
  302 + List<EvalRewardDistDetailVO> detailVOS = PublicUtil.copyList(details, EvalRewardDistDetailVO.class);
  303 + rewardDistVO.setRewardDetails(detailVOS);
  304 + }
  305 +
295 306 return rewardDistVO;
296 307 }
297 308  
... ... @@ -309,20 +320,16 @@ public class EvalRewardService {
309 320 throw new BusinessException("分配金额不等于总金额，请重试");
310 321 }
311 322  
  323 + //删除之前的分配
  324 + evalRewardDistDetailService.update(Wrappers.<EvalRewardDistDetail>lambdaUpdate()
  325 + .eq(EvalRewardDistDetail::getEvalShopDistId, rewardDistId)
  326 + .set(EvalRewardDistDetail::getYn, Boolean.FALSE)
  327 + );
  328 +
312 329 List<EvalRewardDistDetail> distDetails = Lists.newArrayListWithCapacity(rewardDistDTO.getUsers().size());
313 330 for (EvalRewardDistDetailDTO distDetailDTO : rewardDistDTO.getUsers()) {
314   - EvalRewardDistDetail evalRewardDistDetail = new EvalRewardDistDetail();
315   - evalRewardDistDetail.setEvalShopDistId(rewardDistId);
316   - evalRewardDistDetail.setUserId(distDetailDTO.getUserId());
317   - evalRewardDistDetail.setUserName(distDetailDTO.getUserName());
318   - evalRewardDistDetail.setPostId(distDetailDTO.getPostId());
319   - evalRewardDistDetail.setPostName(distDetailDTO.getPostName());
320   - evalRewardDistDetail.setShopId(distDetailDTO.getShopId());
321   - evalRewardDistDetail.setShopName(distDetailDTO.getShopName());
322   - evalRewardDistDetail.setReward(distDetailDTO.getReward());
323   - evalRewardDistDetail.setStatus(distDetailDTO.getStatus());
324   - evalRewardDistDetail.setGroupId(distDetailDTO.getGroupId());
325   - evalRewardDistDetail.setYn(Boolean.TRUE);
  331 + EvalRewardDistDetail evalRewardDistDetail = distDetailDTO.convertPo(rewardDistId);
  332 + distDetails.add(evalRewardDistDetail);
326 333 }
327 334  
328 335 approvalBizService.applyApproveDistReward(rewardDist, currentUser);
... ...