KPI / fw-morax

Commit e7121b9d28332787179c94fd392759ca82327ee0

Authored by 姜超
1 parent 488ba9c3

feature(*): 查询修改 

查询修改
Inline Side-by-side
Showing 5 changed files with 26 additions and 9 deletions
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalGroupPoolService.java
  View file @e7121b9
... ... @@ -200,7 +200,7 @@ public class EvalGroupPoolService {
200 200 Long poolId = pool.getId();
201 201 DecimalFormat decimalFormat = new DecimalFormat("##########.##");
202 202  
203   - List<EvalPoolIndicatorDetailVO> indicatorDetails = evalPoolIndicatorDetailService.getStaffIndicatorValues(poolId, evalGroupId, localDate);
  203 + List<EvalPoolIndicatorDetailVO> indicatorDetails = evalPoolIndicatorDetailService.getShopIndicatorValues(poolId, evalGroupId, localDate);
204 204  
205 205 BigDecimal totalScore = BigDecimal.ZERO;
206 206 BigDecimal staffScore = BigDecimal.ZERO;
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalPoolService.java
  View file @e7121b9
... ... @@ -21,10 +21,7 @@ import lombok.extern.slf4j.Slf4j;
21 21 import org.springframework.stereotype.Service;
22 22  
23 23 import java.time.YearMonth;
24   -import java.util.Arrays;
25   -import java.util.List;
26   -import java.util.Map;
27   -import java.util.Objects;
  24 +import java.util.*;
28 25 import java.util.stream.Collectors;
29 26  
30 27 /**
... ... @@ -95,6 +92,13 @@ public class EvalPoolService {
95 92 } else {
96 93 dto.setManagerShopIds(erpRpcService.manageShopIds(dto.getCurrentUserId()));
97 94 }
  95 + if (PublicUtil.isNotEmpty(dto.getShopId())) {
  96 + if (dto.getManagerShopIds().contains(dto.getShopId())) {
  97 + dto.setManagerShopIds(new ArrayList<Long>(){{add(dto.getShopId());}});
  98 + } else {
  99 + dto.setManagerShopIds(new ArrayList<Long>());
  100 + }
  101 + }
98 102 if (PublicUtil.isEmpty(dto.getManagerShopIds())) {
99 103 return AppPage.empty(dto);
100 104 }
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/component/EvalIndicatorSaveObserver.java
  View file @e7121b9
... ... @@ -132,13 +132,9 @@ public class EvalIndicatorSaveObserver {
132 132 indicatorValueWrappers.in(EvalIndicatorValue::getShopId, referIds)
133 133 .eq(EvalIndicatorValue::getDimensionType, DimensionTypeEnum.SHOP);
134 134 }
135   -
136   -
137   -
138 135 if (PublicUtil.isEmpty(evalIndicatorValues)) {
139 136 return;
140 137 }
141   -
142 138 evalIndicatorValueService.remove(indicatorValueWrappers
143 139 .eq(EvalIndicatorValue::getIndicatorCode, code)
144 140 .eq(EvalIndicatorValue::getDataDate, dataDate)
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/data/eval/EvalPoolIndicatorDetailService.java
  View file @e7121b9
... ... @@ -33,6 +33,18 @@ public interface EvalPoolIndicatorDetailService extends IService&lt;EvalPoolIndicat
33 33 LocalDate localDate);
34 34  
35 35 /**
  36 + * 获取员工某月指标记录
  37 + *
  38 + * @param evalPoolId
  39 + * @param evalGroupId
  40 + * @param localDate
  41 + * @return
  42 + */
  43 + List<EvalPoolIndicatorDetailVO> getShopIndicatorValues(Long evalPoolId,
  44 + Long evalGroupId,
  45 + LocalDate localDate);
  46 +
  47 + /**
36 48 * 获取员工某月指标详情记录
37 49 *
38 50 * @param evalPoolId
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/data/eval/impl/EvalPoolIndicatorDetailServiceImpl.java
  View file @e7121b9
... ... @@ -30,6 +30,11 @@ public class EvalPoolIndicatorDetailServiceImpl extends ServiceImpl&lt;EvalPoolIndi
30 30 }
31 31  
32 32 @Override
  33 + public List<EvalPoolIndicatorDetailVO> getShopIndicatorValues(Long evalPoolId, Long evalGroupId, LocalDate localDate) {
  34 + return this.baseMapper.getStaffIndicatorValues(evalPoolId, EvalScopeEnum.SHOP.getValue(), evalGroupId, localDate);
  35 + }
  36 +
  37 + @Override
33 38 public EvalPoolIndicatorDetailVO getStaffIndicatorValue(Long evalPoolId, EvalScopeEnum scopeType,Long evalGroupIndicatorId, LocalDate localDate) {
34 39 return this.baseMapper.getStaffIndicatorValue(evalPoolId, scopeType.getValue(), evalGroupIndicatorId, localDate);
35 40 }
... ...