KPI / fw-morax

Commit 2ba56bfe5f4b610aa0bb6e9df80336d2514e5bd4

Authored by 姜超
1 parent 0e289359

feature(*): 奖惩审批修改 

奖惩审批修改
Inline Side-by-side
Showing 1 changed file with 9 additions and 4 deletions
fw-morax-service/src/main/java/cn/fw/morax/service/biz/ApprovalBizService.java
  View file @2ba56bf
... ... @@ -406,8 +406,8 @@ public class ApprovalBizService {
406 406 InitiateApprovalParam.Condition shopCondition = new InitiateApprovalParam.Condition();
407 407 shopCondition.setParamName("shopId");
408 408 shopCondition.setValue(staffInfo.getShopId().toString());
409   -
410 409 conditions.add(shopCondition);
  410 +
411 411 Map extDataMap = new HashMap<String, Object>() {{
412 412 put("id", settingDraft.getId().toString());
413 413 }};
... ... @@ -449,13 +449,18 @@ public class ApprovalBizService {
449 449 @Transactional(rollbackFor = Exception.class)
450 450 public void applyApproveDistReward(EvalRewardDist rewardDist, LoginAuthBean user) {
451 451 Date expTime = DateUtil.localDateTime2Date(LocalDate.now().atTime(23, 59, 59).plusDays(3));
  452 + //员工基础信息
  453 + StaffBaseInfoDTO staffInfo = ehrRpcService.queryStaffBaseInfo(user.getUserId());
  454 + BV.notNull(staffInfo, "人员信息查询失败，请重试");
452 455 //提交审批
453 456 List<InitiateApprovalParam.Condition> conditions = Lists.newArrayList();
  457 + InitiateApprovalParam.Condition postCondition = new InitiateApprovalParam.Condition();
  458 + postCondition.setParamName("postId");
  459 + postCondition.setValue(staffInfo.getPostId().toString());
  460 + conditions.add(postCondition);
454 461 InitiateApprovalParam.Condition shopCondition = new InitiateApprovalParam.Condition();
455 462 shopCondition.setParamName("shopId");
456   - List<String> shopIdsStr = rewardDist.getShopIds().stream().map(s -> s.toString()).collect(Collectors.toList());
457   - shopCondition.setValue(String.join(",", shopIdsStr));
458   - conditions.add(shopCondition);
  463 + shopCondition.setValue(staffInfo.getShopId().toString());
459 464 Map extDataMap = new HashMap<String, Object>() {{
460 465 put("id", rewardDist.getId().toString());
461 466 }};
... ...