KPI / fw-morax

Commit 5e2b19c95e25e565b52e5a471e87b336da10bd5f

Authored by 姜超
1 parent 3b7cda2c

feature(*): 审批修改 

审批修改
Inline Side-by-side
Showing 1 changed file with 11 additions and 15 deletions
fw-morax-service/src/main/java/cn/fw/morax/service/biz/ApprovalBizService.java
  View file @5e2b19c
... ... @@ -38,6 +38,8 @@ import java.time.format.DateTimeFormatter;
38 38 import java.util.*;
39 39 import java.util.stream.Collectors;
40 40  
  41 +import static cn.fw.common.businessvalidator.Validator.BV;
  42 +
41 43 @Slf4j
42 44 @RequiredArgsConstructor
43 45 @Service
... ... @@ -392,24 +394,18 @@ public class ApprovalBizService {
392 394 public void applyApproveEvalDraft(EvalDTO eval, List<EvalGroupDTO> evalGroups, SettingDraft settingDraft, LoginAuthBean user) {
393 395 Date expTime = PublicUtil.getExpTimeOfMonth(LocalDate.now());
394 396  
395   - Set<Long> postIds = new HashSet<>();
396   - Set<Long> shopIds = new HashSet<>();
397   - for (EvalGroupDTO evalGroupDTO : evalGroups) {
398   - postIds.add(evalGroupDTO.getPostId());
399   - shopIds.addAll(evalGroupDTO.getShopIds());
400   - }
401   -
  397 + //员工基础信息
  398 + StaffBaseInfoDTO staffInfo = ehrRpcService.queryStaffBaseInfo(user.getUserId());
  399 + BV.notNull(staffInfo, "人员信息查询失败，请重试");
402 400 //提交审批
403 401 List<InitiateApprovalParam.Condition> conditions = Lists.newArrayList();
404   -
405   -// InitiateApprovalParam.Condition postCondition = new InitiateApprovalParam.Condition();
406   -// postCondition.setParamName("postId");
407   -// postCondition.setValue(StringUtils.join(",", postIds));
408   -// conditions.add(postCondition);
409   -
  402 + InitiateApprovalParam.Condition postCondition = new InitiateApprovalParam.Condition();
  403 + postCondition.setParamName("postId");
  404 + postCondition.setValue(staffInfo.getPostId().toString());
  405 + conditions.add(postCondition);
410 406 InitiateApprovalParam.Condition shopCondition = new InitiateApprovalParam.Condition();
411 407 shopCondition.setParamName("shopId");
412   - shopCondition.setValue(String.join(",", shopIds.stream().map(String::valueOf).collect(Collectors.toList())));
  408 + shopCondition.setValue(staffInfo.getShopId().toString());
413 409  
414 410 conditions.add(shopCondition);
415 411 Map extDataMap = new HashMap<String, Object>() {{
... ... @@ -431,7 +427,7 @@ public class ApprovalBizService {
431 427 ))
432 428 .initiatorId(user.getUserId())
433 429 .expTime(expTime)
434   - .shopIds(new ArrayList<>(shopIds))
  430 + .shopIds(new ArrayList<Long>(){{add(staffInfo.getShopId());}})
435 431 .conditions(conditions)
436 432 .extData(extDataMap)
437 433 .build();
... ...