KPI / fw-morax

Commit 0d9a4b87c142a04724649b42b65d656b46b5f744

Authored by 姜超
2 parents 16b8bf50 b5004c89

Merge branch 'bug-fix' into 'main' 

feature(*): 人员处理

人员处理

See merge request !598
Inline Side-by-side
Showing 3 changed files with 36 additions and 2 deletions
fw-morax-rpc/src/main/java/cn/fw/morax/rpc/ehr/dto/PostChangeDTO.java 0 → 100644
  View file @0d9a4b8
  1 +package cn.fw.morax.rpc.ehr.dto;
  2 +
  3 +import cn.fw.ehr.sdk.api.mq.StaffPostChangeEvent;
  4 +import lombok.Data;
  5 +
  6 +import java.util.List;
  7 +
  8 +/**
  9 + * 员工门店列表
  10 + */
  11 +@Data
  12 +public class PostChangeDTO {
  13 + /**
  14 + * 人员id
  15 + */
  16 + private List<StaffPostChangeEvent> events;
  17 +
  18 +}
... ...
fw-morax-server/src/main/java/cn/fw/morax/server/controller/erp/SalaryDebugController.java
  View file @0d9a4b8
... ... @@ -30,6 +30,7 @@ import cn.fw.morax.rpc.approval.FlowApproveRpc;
30 30 import cn.fw.morax.rpc.backlog.TodoRpcService;
31 31 import cn.fw.morax.rpc.backlog.dto.BackLogItemDTO;
32 32 import cn.fw.morax.rpc.ehr.EhrRpcService;
  33 +import cn.fw.morax.rpc.ehr.dto.PostChangeDTO;
33 34 import cn.fw.morax.rpc.ehr.dto.StaffBaseInfoDTO;
34 35 import cn.fw.morax.rpc.ehr.dto.StaffInfoDTO;
35 36 import cn.fw.morax.rpc.ehr.dto.StaffShopInfoDTO;
... ... @@ -282,6 +283,21 @@ public class SalaryDebugController {
282 283 }
283 284  
284 285 /**
  286 + * 人事系统人员调岗MQ消息
  287 + *
  288 + * @return
  289 + */
  290 + @PostMapping("/alter/posts")
  291 + @IgnoreUserToken
  292 + @ControllerMethod("人事系统人员调岗MQ消息")
  293 + public Message<List<SalaryGroupVO>> postChange(@RequestBody PostChangeDTO event) {
  294 + for (StaffPostChangeEvent event1 : event.getEvents()) {
  295 + ehrStaffPostConsumer.onMessage(event1);
  296 + }
  297 + return success();
  298 + }
  299 +
  300 + /**
285 301 * 门店名称变更
286 302 *
287 303 * @return
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/biz/CommonService.java
  View file @0d9a4b8
... ... @@ -126,10 +126,10 @@ public class CommonService {
126 126 @Value("${spring.cache.custom.global-prefix}:kpi:transpost_after:anticipated_date:")
127 127 private String transPostDate;
128 128 //员工旧岗位变动日期
129   - @Value("${spring.cache.custom.global-prefix}:kpi:staff_old_post:change:date:")
  129 + @Value("${spring.cache.custom.global-prefix}:kpi:staff:old_post_change_date:")
130 130 private String staffOldPostChangeDate;
131 131 //员工新岗位变动日期
132   - @Value("${spring.cache.custom.global-prefix}:kpi:staff_new_post:change_date:")
  132 + @Value("${spring.cache.custom.global-prefix}:kpi:staff:new_post_change_date:")
133 133 private String staffNewPostChangeDate;
134 134 //员工新岗位变动日期
135 135 @Value("${spring.cache.custom.global-prefix}:kpi:staff_non_demotion_new_post:change_date:")
... ...