KPI / fw-morax

Commit 15e650cab83a2982bdcb84a9fc3beb9ff000d131

Authored by 姜超
1 parent 856c45ad

feature(*): 查询修改 

查询修改
Inline Side-by-side
Showing 4 changed files with 89 additions and 5 deletions
fw-morax-rpc/src/main/java/cn/fw/morax/rpc/erp/dto/HRoleAuthRangeDayVO.java 0 → 100644
  View file @15e650c
  1 +package cn.fw.morax.rpc.erp.dto;
  2 +
  3 +import lombok.Data;
  4 +
  5 +import java.time.LocalDate;
  6 +import java.util.Date;
  7 +
  8 +/**
  9 + * @author jiangchao
  10 + * @des: 历史角色授权范围
  11 + * @date 2024/3/19 15:32
  12 + */
  13 +@Data
  14 +public class HRoleAuthRangeDayVO {
  15 +
  16 + /**
  17 + * 集团
  18 + */
  19 + private Long groupId;
  20 +
  21 + /**
  22 + * 用户id
  23 + */
  24 + private Long userId;
  25 +
  26 + /**
  27 + * 用户名称
  28 + */
  29 + private String userName;
  30 +
  31 + /**
  32 + * 角色id
  33 + */
  34 + private Long roleId;
  35 +
  36 + /**
  37 + * 角色码
  38 + */
  39 + private String roleCode;
  40 +
  41 + /**
  42 + * 数据范围值
  43 + */
  44 + private Long rangeValue;
  45 +
  46 + /**
  47 + * 数据范围名称
  48 + */
  49 + private String rangeName;
  50 +
  51 + /**
  52 + * 时间线开始时间
  53 + */
  54 + private LocalDate startTime;
  55 +
  56 + /**
  57 + * 时间线结束时间
  58 + */
  59 + private LocalDate endTime;
  60 +
  61 + /**
  62 + * 授权天数
  63 + */
  64 + private Long days;
  65 +}
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/biz/RpcCommonService.java
  View file @15e650c
... ... @@ -7,6 +7,8 @@ import cn.fw.morax.common.utils.PublicUtil;
7 7 import cn.fw.morax.rpc.ehr.EhrRpcService;
8 8 import cn.fw.morax.rpc.ehr.dto.PostInfoDTO;
9 9 import cn.fw.morax.rpc.erp.ErpRpcService;
  10 +import cn.fw.morax.rpc.erp.dto.HRoleAuthRangeDayVO;
  11 +import cn.fw.morax.rpc.erp.dto.HRoleAuthRangeVO;
10 12 import cn.fw.morax.rpc.file.FileRpcService;
11 13 import cn.fw.morax.rpc.oop.OopRpcService;
12 14 import cn.fw.morax.service.biz.kpi.KpiDictBizService;
... ... @@ -21,8 +23,11 @@ import lombok.extern.slf4j.Slf4j;
21 23 import org.springframework.data.redis.core.StringRedisTemplate;
22 24 import org.springframework.stereotype.Service;
23 25  
  26 +import java.time.LocalDate;
  27 +import java.time.temporal.TemporalAdjusters;
24 28 import java.util.ArrayList;
25 29 import java.util.List;
  30 +import java.util.Set;
26 31 import java.util.stream.Collectors;
27 32  
28 33 /**
... ... @@ -90,4 +95,16 @@ public class RpcCommonService {
90 95 return matchPostInfos.get(0);
91 96 }
92 97  
  98 + public void get(final Long groupId, final LocalDate calcDate, final String roleCode, final List<Long> shopIds) {
  99 + final LocalDate monthlyFirstDate = calcDate.with(TemporalAdjusters.firstDayOfMonth());
  100 + List<HRoleAuthRangeDayVO> rangeDayVos = new ArrayList<>();
  101 + List<HRoleAuthRangeVO> hRoleAuthRangeVos = erpRpcService.queryRoleHistoryAuthRange(groupId, shopIds, roleCode, calcDate);
  102 + for (HRoleAuthRangeVO hRoleAuthRangeVO : hRoleAuthRangeVos) {
  103 + HRoleAuthRangeDayVO rangeDayVo = PublicUtil.copy(hRoleAuthRangeVO, HRoleAuthRangeDayVO.class);
  104 +// rangeDayVo.setStartTime()
  105 +
  106 + }
  107 +
  108 + }
  109 +
93 110 }
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalIndicatorImportBizService.java
  View file @15e650c
... ... @@ -108,8 +108,8 @@ public class EvalIndicatorImportBizService {
108 108 Wrappers.<EvalIndicatorImportRecord>lambdaQuery()
109 109 .eq(PublicUtil.isNotEmpty(dto.getUserId()), EvalIndicatorImportRecord::getImportUserId, dto.getUserId())
110 110 .eq(PublicUtil.isNotEmpty(dto.getIndicatorCode()), EvalIndicatorImportRecord::getIndicatorCode, dto.getIndicatorCode())
111   - .ge(PublicUtil.isNotEmpty(startTime), EvalIndicatorImportRecord::getCreateTime, startTime)
112   - .le(PublicUtil.isNotEmpty(endTime), EvalIndicatorImportRecord::getCreateTime, endTime)
  111 + .ge(PublicUtil.isNotEmpty(startTime), EvalIndicatorImportRecord::getDataDate, startTime)
  112 + .le(PublicUtil.isNotEmpty(endTime), EvalIndicatorImportRecord::getDataDate, endTime)
113 113 .eq(EvalIndicatorImportRecord::getImportType, EvalIndicatorImportTypeEnum.SCORE_ORIGIN_VALUE)
114 114 .eq(EvalIndicatorImportRecord::getYn, Boolean.TRUE)
115 115 .eq(EvalIndicatorImportRecord::getGroupId, dto.getGroupId())
... ... @@ -170,8 +170,8 @@ public class EvalIndicatorImportBizService {
170 170 PageData<EvalIndicatorImportDetailScore> pageData = evalIndicatorImportDetailScoreService.page(new PageData<>(dto.getCurrent(), dto.getPageSize()),
171 171 Wrappers.<EvalIndicatorImportDetailScore>lambdaQuery()
172 172 .eq(PublicUtil.isNotEmpty(dto.getIndicatorCode()), EvalIndicatorImportDetailScore::getIndicatorCode, dto.getIndicatorCode())
173   - .ge(PublicUtil.isNotEmpty(startTime), EvalIndicatorImportDetailScore::getCreateTime, startTime)
174   - .le(PublicUtil.isNotEmpty(endTime), EvalIndicatorImportDetailScore::getCreateTime, endTime)
  173 + .ge(PublicUtil.isNotEmpty(startTime), EvalIndicatorImportDetailScore::getDataDate, startTime)
  174 + .le(PublicUtil.isNotEmpty(endTime), EvalIndicatorImportDetailScore::getDataDate, endTime)
175 175 .isNull(EvalIndicatorImportDetailScore::getErrorType)
176 176 .eq(EvalIndicatorImportDetailScore::getValid, Boolean.TRUE)
177 177 .eq(EvalIndicatorImportDetailScore::getYn, Boolean.TRUE)
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/component/EvalIndicatorOriginValueSaveObserver.java
  View file @15e650c
... ... @@ -4,6 +4,7 @@ import cn.fw.morax.common.config.EvalIndicatorCodeVal;
4 4 import cn.fw.morax.common.config.EvalIndicatorVal;
5 5 import cn.fw.morax.common.config.TodoVal;
6 6 import cn.fw.morax.common.pojo.event.ImportEvalIndicatorEvent;
  7 +import cn.fw.morax.common.pojo.event.ImportEvalIndicatorOriginValueEvent;
7 8 import cn.fw.morax.common.utils.DateUtil;
8 9 import cn.fw.morax.common.utils.PublicUtil;
9 10 import cn.fw.morax.domain.bo.eval.EvalIndicatorScoreBO;
... ... @@ -62,7 +63,7 @@ public class EvalIndicatorOriginValueSaveObserver {
62 63 */
63 64 @Subscribe
64 65 @Transactional(rollbackFor = Exception.class)
65   - public void saveEvalIndicator(ImportEvalIndicatorEvent event) {
  66 + public void saveEvalIndicator(ImportEvalIndicatorOriginValueEvent event) {
66 67 //睡10秒保证数据落库
67 68 try {
68 69 Thread.sleep(10 * 1000);
... ... @@ -195,6 +196,7 @@ public class EvalIndicatorOriginValueSaveObserver {
195 196  
196 197  
197 198  
  199 + Map<Long, Set<Long>> userAuthShopIds = new HashMap<>();
198 200 for (String roleCode : roleCodes) {
199 201 List<HRoleAuthRangeVO> hRoleAuthRangeVos = erpRpcService.queryRoleHistoryAuthRange(groupId, new ArrayList<>(shopIds), roleCode, startTime);
200 202  
... ...