KPI / fw-morax

Commit b5babc65c0ccda28cb9653aed2ac08c56037c04a

Authored by 姜超
1 parent 5a834c50

feature(*): 参数修改 

参数修改
Inline Side-by-side
Showing 12 changed files with 82 additions and 84 deletions
fw-morax-dao/src/main/java/cn/fw/morax/dao/eval/EvalUserPoolDao.java
  View file @b5babc6
... ... @@ -40,5 +40,5 @@ public interface EvalUserPoolDao extends BaseMapper<EvalUserPool> {
40 40 * @param dto
41 41 * @return
42 42 */
43   - long queryPagePoolTotal(@Param("condition") EvalPoolQueryDTO dto);
  43 + long queryPagePoolTotal(EvalPoolQueryDTO dto);
44 44 }
... ...
fw-morax-dao/src/main/resources/mapper/eval/EvalUserPoolDao.xml
  View file @b5babc6
... ... @@ -71,9 +71,6 @@
71 71 <if test="condition.userName !=null and condition.userName != ''">
72 72 and user_name like concat('%', #{condition.userName}, '%')
73 73 </if>
74   - <if test="condition.startLevel !=null">
75   - and star_level = #{condition.startLevel}
76   - </if>
77 74 <if test="condition.monthly !=null">
78 75 and monthly = #{condition.monthly}
79 76 </if>
... ... @@ -114,9 +111,6 @@
114 111 <if test="userName !=null and userName != ''">
115 112 and user_name like concat('%', #{userName}, '%')
116 113 </if>
117   - <if test="startLevel !=null">
118   - and star_level = #{startLevel}
119   - </if>
120 114 <if test="monthly !=null">
121 115 and monthly = #{monthly}
122 116 </if>
... ... @@ -132,9 +126,9 @@
132 126 <if test="shopName !=null and shopName != ''">
133 127 and shop_name like concat('%', #{shopName}, '%')
134 128 </if>
135   - <if test="managerStaffList !=null and managerStaffList.size() > 0">
  129 + <if test="managerStaffIds !=null and managerStaffIds.size() > 0">
136 130 and user_id in
137   - <foreach collection="managerStaffList" item="id" index="index" open="(" close=")" separator=",">
  131 + <foreach collection="managerStaffIds" item="id" index="index" open="(" close=")" separator=",">
138 132 #{id}
139 133 </foreach>
140 134 </if>
... ...
fw-morax-domain/src/main/java/cn/fw/morax/domain/dto/query/EvalPoolQueryDTO.java
  View file @b5babc6
... ... @@ -6,6 +6,7 @@ import lombok.Data;
6 6 import lombok.EqualsAndHashCode;
7 7 import lombok.ToString;
8 8  
  9 +import javax.validation.constraints.NotNull;
9 10 import java.time.YearMonth;
10 11 import java.util.List;
11 12  
... ...
fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/eval/EvalShopPoolVO.java
  View file @b5babc6
1 1 package cn.fw.morax.domain.vo.eval;
2 2  
3 3 import cn.fw.common.data.entity.BaseAuditableTimeEntity;
  4 +import cn.fw.morax.common.constant.Constant;
  5 +import cn.fw.morax.common.utils.PublicUtil;
4 6 import cn.fw.morax.domain.enums.EvalShopPoolStatusEnum;
5 7 import cn.fw.morax.domain.enums.EvalTypeEnum;
6 8 import com.baomidou.mybatisplus.annotation.TableLogic;
... ... @@ -152,4 +154,10 @@ public class EvalShopPoolVO {
152 154 */
153 155 private List<EvalPoolRewardDetailVO> rewards;
154 156  
  157 + public void convertScoreRatio() {
  158 + if (PublicUtil.isNotEmpty(this.getScoreRatio())) {
  159 + this.setScoreRatio(this.getScoreRatio().multiply(Constant.ONE_HUNDRED));
  160 + }
  161 + }
  162 +
155 163 }
... ...
fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/eval/EvalUserPoolVO.java
  View file @b5babc6
1 1 package cn.fw.morax.domain.vo.eval;
2 2  
3 3 import cn.fw.common.data.entity.BaseAuditableTimeEntity;
  4 +import cn.fw.morax.common.constant.Constant;
  5 +import cn.fw.morax.common.utils.PublicUtil;
4 6 import cn.fw.morax.domain.enums.EvalTypeEnum;
5 7 import cn.fw.morax.domain.enums.KpiIgnoreCauseEnum;
6 8 import com.baomidou.mybatisplus.annotation.TableLogic;
... ... @@ -166,4 +168,10 @@ public class EvalUserPoolVO {
166 168 * 奖励
167 169 */
168 170 private List<EvalPoolRewardDetailVO> rewards;
  171 +
  172 + public void convertScoreRatio() {
  173 + if (PublicUtil.isNotEmpty(this.getScoreRatio())) {
  174 + this.setScoreRatio(this.getScoreRatio().multiply(Constant.ONE_HUNDRED));
  175 + }
  176 + }
169 177 }
... ...
fw-morax-server/src/main/java/cn/fw/morax/server/controller/app/EvalPoolController.java
  View file @b5babc6
... ... @@ -77,39 +77,39 @@ public class EvalPoolController {
77 77 *
78 78 * @param user 用户id
79 79 * @param userId 用户id [管理层查看人员薪酬详情时需传值]
80   - * @param yearMonth 月度 [员工人查看自己的酬详情时需传值]
  80 + * @param monthly 月度 [员工人查看自己的酬详情时需传值]
81 81 * @return 薪酬池选项
82 82 * @ignoreParams user
83 83 */
84 84 @GetMapping("/staff-selector")
85 85 @IgnoreUserToken
86 86 @ControllerMethod("本月可查看的其他考评池选项")
87   - public Message<Set<SelectorVO>> evalPoolSelector(@CurrentUser LoginAuthBean user, Long userId, @RequestParam(required = false) YearMonth yearMonth) {
88   - if (Objects.isNull(yearMonth)) {
89   - yearMonth = YearMonth.now();
  87 + public Message<Set<SelectorVO>> evalPoolSelector(@CurrentUser LoginAuthBean user, Long userId, @RequestParam(required = false) YearMonth monthly) {
  88 + if (Objects.isNull(monthly)) {
  89 + monthly = YearMonth.now();
90 90 }
91 91 if (Objects.isNull(userId)) {
92 92 userId = user.getUserId();
93 93 }
94   - return success(evalGroupPoolService.evalPoolSelector(userId, yearMonth));
  94 + return success(evalGroupPoolService.evalPoolSelector(userId, monthly));
95 95 }
96 96  
97 97 /**
98 98 * 考评详情查询 (查看自己考评详情)
99 99 *
100 100 * @param userId 用户id
101   - * @param yearMonth 月度
  101 + * @param monthly 月度
102 102 * @return 绩效池详情
103 103 * @ignoreParams userId
104 104 */
105 105 @GetMapping("/own-detail")
106 106 @ControllerMethod("考评详情查询")
107 107 public Message<EvalUserPoolVO> evalPoolOwnDetail(@CurrentUser Long userId,
108   - @RequestParam(required = false) YearMonth yearMonth) {
109   - if (Objects.isNull(yearMonth)) {
110   - yearMonth = YearMonth.now();
  108 + @RequestParam(required = false) YearMonth monthly) {
  109 + if (Objects.isNull(monthly)) {
  110 + monthly = YearMonth.now();
111 111 }
112   - return success(evalGroupPoolService.queryUserPoolDetail(userId, yearMonth));
  112 + return success(evalGroupPoolService.queryUserPoolDetail(userId, monthly));
113 113 }
114 114  
115 115 /**
... ...
fw-morax-server/src/main/java/cn/fw/morax/server/controller/erp/EvalConfigController.java
  View file @b5babc6
... ... @@ -48,7 +48,6 @@ import static cn.fw.common.web.util.ResultBuilder.success;
48 48 public class EvalConfigController {
49 49  
50 50 private final EvalGroupBizService evalGroupBizService;
51   - private final EvalGroupDataService evalGroupDataService;
52 51 private final EvalIndicatorBizService evalIndicatorBizService;
53 52  
54 53 /**
... ...
fw-morax-server/src/main/java/cn/fw/morax/server/controller/erp/EvalIndicatorController.java
  View file @b5babc6
... ... @@ -103,11 +103,12 @@ public class EvalIndicatorController {
103 103 @IgnoreAuth
104 104 @PostMapping("/staff-indicator")
105 105 @ControllerMethod("上传人员指标")
106   - public Message<List<StaffIndicatorValueVO>> uploadStaffIndicator(@RequestParam("file") MultipartFile file, @CurrentUser LoginAuthBean user) {
  106 + public Message<Void> uploadStaffIndicator(@RequestParam("file") MultipartFile file, @CurrentUser LoginAuthBean user) {
107 107 if (file.isEmpty()) {
108 108 throw new BusinessException("请上传文件");
109 109 }
110   - return success(evalIndicatorReportService.uploadStaffIndicator(file, user));
  110 + evalIndicatorReportService.uploadStaffIndicator(file, user);
  111 + return success();
111 112 }
112 113  
113 114 /**
... ... @@ -118,11 +119,12 @@ public class EvalIndicatorController {
118 119 @IgnoreAuth
119 120 @PostMapping("/shop-indicator")
120 121 @ControllerMethod("上传门店指标")
121   - public Message<List<ShopIndicatorValueVO>> uploadShopIndicator(@RequestParam("file") MultipartFile file, @CurrentUser LoginAuthBean user) {
  122 + public Message<Void> uploadShopIndicator(@RequestParam("file") MultipartFile file, @CurrentUser LoginAuthBean user) {
122 123 if (file.isEmpty()) {
123 124 throw new BusinessException("请上传文件");
124 125 }
125   - return success(evalIndicatorReportService.uploadShopIndicator(file, user));
  126 + evalIndicatorReportService.uploadShopIndicator(file, user);
  127 + return success();
126 128 }
127 129  
128 130 }
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalCalculateService.java
  View file @b5babc6
... ... @@ -143,6 +143,7 @@ public class EvalCalculateService {
143 143  
144 144 @Transactional(rollbackFor = Exception.class)
145 145 public void calculateEvalGroup(EvalGroupCalculableBO bo) {
  146 + log.info("考评组计算：{}", JSON.toJSONString(bo));
146 147 final Long evalGroupId = bo.getEvalGroupId();
147 148 final LocalDate localDate = bo.getLocalDate();
148 149  
... ... @@ -167,7 +168,6 @@ public class EvalCalculateService {
167 168 );
168 169  
169 170 List<EvalPoolRewardDetail> rewardDetails = new ArrayList<>();
170   -
171 171 BigDecimal totalScore = indicators.stream()
172 172 .map(indicator -> BigDecimal.valueOf(indicator.getBaseScore()))
173 173 .reduce(BigDecimal.ZERO, BigDecimal::add);
... ... @@ -176,11 +176,9 @@ public class EvalCalculateService {
176 176 calcTotalPushMoney(rewards, userShops, rewardDetails);
177 177 for (EvalGroupUserShop userShop : userShops) {
178 178 userShop.setIndicatorTotalScore(totalScore);
179   -
180 179 calcRewardMoney(rewards, userShop, rewardDetails);
181 180 calcEvalKpi(userShop, indicators);
182 181 }
183   -
184 182 updatePool(evalGroup, localDate, rewardDetails, userShops);
185 183 }
186 184  
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalIndicatorReportService.java
  View file @b5babc6
... ... @@ -5,7 +5,6 @@ import cn.fw.common.exception.BusinessException;
5 5 import cn.fw.common.page.AppPage;
6 6 import cn.fw.common.web.auth.LoginAuthBean;
7 7 import cn.fw.morax.common.pojo.event.ImportEvalIndicatorEvent;
8   -import cn.fw.morax.common.pojo.event.KpiGroupChangeEvent;
9 8 import cn.fw.morax.common.utils.EventBusUtil;
10 9 import cn.fw.morax.common.utils.ExcelDataUtil;
11 10 import cn.fw.morax.common.utils.PublicUtil;
... ... @@ -13,13 +12,10 @@ import cn.fw.morax.domain.db.eval.*;
13 12 import cn.fw.morax.domain.dto.query.EvalIndicatorImportQueryDTO;
14 13 import cn.fw.morax.domain.enums.DimensionTypeEnum;
15 14 import cn.fw.morax.domain.enums.ImportErrorReasonEnum;
16   -import cn.fw.morax.domain.enums.IndicatorValueTypeEnum;
17 15 import cn.fw.morax.domain.enums.SettingStatusEnum;
18 16 import cn.fw.morax.domain.vo.eval.*;
19   -import cn.fw.morax.domain.vo.salary.StaffSalaryDetailVO;
20 17 import cn.fw.morax.service.biz.CommonService;
21 18 import cn.fw.morax.service.data.eval.*;
22   -import cn.fw.morax.service.data.kpi.IndicatorsService;
23 19 import cn.hutool.poi.excel.ExcelReader;
24 20 import cn.hutool.poi.excel.ExcelUtil;
25 21 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
... ... @@ -28,6 +24,7 @@ import com.google.common.collect.Lists;
28 24 import lombok.RequiredArgsConstructor;
29 25 import lombok.extern.slf4j.Slf4j;
30 26 import org.apache.commons.collections4.map.MultiKeyMap;
  27 +import org.apache.poi.ss.formula.functions.T;
31 28 import org.springframework.stereotype.Service;
32 29 import org.springframework.transaction.annotation.Transactional;
33 30 import org.springframework.web.multipart.MultipartFile;
... ... @@ -58,13 +55,11 @@ public class EvalIndicatorReportService {
58 55  
59 56 private final EvalIndicatorImportRecordService evalIndicatorImportRecordService;
60 57 private final EvalIndicatorImportDetailService evalIndicatorImportDetailService;
61   - private final EvalGroupUserService evalGroupUserService;
  58 + private final EvalIndicatorService evalIndicatorService;
62 59 private final EvalUserPoolService evalUserPoolService;
63 60 private final EvalShopPoolService evalShopPoolService;
64 61 private final EvalGroupService evalGroupService;
65 62 private final EvalService evalService;
66   - private final IndicatorsService indicatorsService;
67   - private final EvalIndicatorService evalIndicatorService;
68 63  
69 64 public void staffTemplateFile(HttpServletRequest request, HttpServletResponse response) {
70 65 String fileName = "人员导入标准模板.xlsx";
... ... @@ -126,36 +121,18 @@ public class EvalIndicatorReportService {
126 121 }
127 122  
128 123 @Transactional(rollbackFor = Exception.class)
129   - public List<StaffIndicatorValueVO> uploadStaffIndicator(MultipartFile file, LoginAuthBean user) {
  124 + public void uploadStaffIndicator(MultipartFile file, LoginAuthBean user) {
130 125 MultiKeyMap<String, EvalUserPool> staffPostMap = getShopUserPoolMap(user);
131 126 Map<String, EvalIndicator> evalIndicatorMap = getNameIndicatorMap();
132 127 EvalIndicatorImportRecord importRecord = createRecord(user);
133 128 evalIndicatorImportRecordService.save(importRecord);
134   -
135 129 List<EvalIndicatorImportDetail> details = new ArrayList<>();
136   - List<StaffIndicatorValueVO> indicatorValues = null;
  130 + List<StaffIndicatorValueVO> indicatorValues = this.analysisExcel(file, StaffIndicatorValueVO.class);
137 131 Long importRecordId = importRecord.getId();
138 132 Integer errorNum = 0;
139   - ExcelReader reader = null;
140   - try {
141   - reader = ExcelUtil.getReader(file.getInputStream());
142   - } catch (IOException e) {
143   - e.printStackTrace();
144   - }
145   -
146   - Map<String, String> headerAlias = ExcelDataUtil.getTitleMappingField(StaffIndicatorValueVO.class);
147   - reader.setHeaderAlias(headerAlias);
148   - indicatorValues = reader.readAll(StaffIndicatorValueVO.class);
149   - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd");
150 133 for (StaffIndicatorValueVO staff : indicatorValues) {
151   -
152 134 EvalIndicatorImportDetail importDetail = new EvalIndicatorImportDetail();
153   - try {
154   - importDetail.setDataDate(LocalDate.parse(staff.getDataDate(), formatter));
155   - } catch (Exception e) {
156   - log.error("考评数据导入，日期转换失败，{}，{}", staff.getDataDate(), e);
157   - importDetail.setDataDate(LocalDate.now());
158   - }
  135 + importDetail.setDataDate(transferDate(staff.getDataDate()));
159 136 if (staffPostMap.containsKey(staff.getShopName(), staff.getStaffName())) {
160 137 EvalUserPool userPool = staffPostMap.get(staff.getShopName(), staff.getStaffName());
161 138 importDetail.setUserId(userPool.getUserId());
... ... @@ -166,7 +143,6 @@ public class EvalIndicatorReportService {
166 143 importDetail.setErrorType(ImportErrorReasonEnum.NO_MATCH_STAFF);
167 144 errorNum += 1;
168 145 }
169   -
170 146 if (evalIndicatorMap.containsKey(staff.getIndicatorName())) {
171 147 EvalIndicator evalIndicator = evalIndicatorMap.get(staff.getIndicatorName());
172 148 importDetail.setIndicatorCode(evalIndicator.getCode());
... ... @@ -182,7 +158,6 @@ public class EvalIndicatorReportService {
182 158 details.add(importDetail);
183 159  
184 160 }
185   -
186 161 Optional<EvalIndicatorImportDetail> detailOptional = details.stream().findFirst();
187 162 importRecord.setIndicatorCode(detailOptional.map(EvalIndicatorImportDetail::getIndicatorCode).orElse(""));
188 163 importRecord.setIndicatorName(detailOptional.map(EvalIndicatorImportDetail::getIndicatorName).orElse(""));
... ... @@ -190,41 +165,61 @@ public class EvalIndicatorReportService {
190 165 importRecord.setNum(indicatorValues.size());
191 166 importRecord.setSuccessNum(indicatorValues.size() - errorNum);
192 167 evalIndicatorImportRecordService.updateById(importRecord);
193   -
194 168 evalIndicatorImportDetailService.saveBatch(details);
195 169  
196 170 ImportEvalIndicatorEvent importEvalIndicatorEvent = new ImportEvalIndicatorEvent(importRecord.getIndicatorCode(),
197 171 importRecord.getId(), importRecord.getGroupId(), importRecord.getUploadTime());
198 172 EventBusUtil.asyncPost(importEvalIndicatorEvent);
  173 + }
199 174  
200   - return null;
  175 + public <T> List<T> analysisExcel(MultipartFile file, Class<T> tClass) {
  176 + List<T> indicatorValues = null;
  177 + ExcelReader reader = null;
  178 + try {
  179 + reader = ExcelUtil.getReader(file.getInputStream());
  180 + } catch (IOException e) {
  181 + e.printStackTrace();
  182 + }
  183 + Map<String, String> headerAlias = ExcelDataUtil.getTitleMappingField(tClass);
  184 + reader.setHeaderAlias(headerAlias);
  185 + indicatorValues = reader.readAll(tClass);
  186 + return indicatorValues;
  187 + }
  188 +
  189 + public LocalDate transferDate(String dataDateStr) {
  190 + if (PublicUtil.isEmpty(dataDateStr)) {
  191 + return LocalDate.now();
  192 + }
  193 + LocalDate dataDate = LocalDate.now();
  194 + DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
  195 + DateTimeFormatter formatter2 = DateTimeFormatter.ofPattern("yyyy/MM/dd");
  196 + try {
  197 + dataDate = LocalDate.parse(dataDateStr, formatter1);
  198 + } catch (Exception e) {
  199 + log.error("考评数据导入，日期转换失败，{}，{}", dataDateStr, e);
  200 +
  201 + try {
  202 + dataDate = LocalDate.parse(dataDateStr, formatter2);
  203 + }catch (Exception e2) {
  204 + log.error("考评数据导入，日期转换失败，{}，{}", dataDateStr, e2);
  205 + }
  206 + }
  207 + return dataDate;
201 208 }
202 209  
203 210 @Transactional(rollbackFor = Exception.class)
204 211 public List<ShopIndicatorValueVO> uploadShopIndicator(MultipartFile file, LoginAuthBean user) {
205 212 Map<String, EvalShopPool> shopPoolMap = this.getShopPoolMap(user);
206   -
207 213 Map<String, EvalIndicator> evalIndicatorMap = getNameIndicatorMap();
208   -
209 214 EvalIndicatorImportRecord importRecord = createRecord(user);
210 215 evalIndicatorImportRecordService.save(importRecord);
211   -
212   - List<EvalIndicatorImportDetail> details = new ArrayList<>();
213   - List<ShopIndicatorValueVO> indicatorValues = null;
214 216 Long importRecordId = importRecord.getId();
  217 + List<EvalIndicatorImportDetail> details = new ArrayList<>();
  218 + List<ShopIndicatorValueVO> indicatorValues = this.analysisExcel(file, ShopIndicatorValueVO.class);
215 219 Integer errorNum = 0;
216   - ExcelReader reader = null;
217   - try {
218   - reader = ExcelUtil.getReader(file.getInputStream());
219   - } catch (IOException e) {
220   - e.printStackTrace();
221   - }
222   - Map<String, String> headerAlias = ExcelDataUtil.getTitleMappingField(ShopIndicatorValueVO.class);
223   - reader.setHeaderAlias(headerAlias);
224   - indicatorValues = reader.readAll(ShopIndicatorValueVO.class);
225 220 for (ShopIndicatorValueVO shop : indicatorValues) {
226 221 EvalIndicatorImportDetail importDetail = new EvalIndicatorImportDetail();
227   - importDetail.setDataDate(LocalDate.parse(shop.getDataDate()));
  222 + importDetail.setDataDate(transferDate(shop.getDataDate()));
228 223 if (shopPoolMap.containsKey(shop.getShopName())) {
229 224 EvalShopPool shopPool = shopPoolMap.get(shop.getShopName());
230 225 importDetail.setShopId(shopPool.getShopId());
... ... @@ -233,7 +228,6 @@ public class EvalIndicatorReportService {
233 228 importDetail.setErrorType(ImportErrorReasonEnum.NO_MATCH_SHOP);
234 229 errorNum += 1;
235 230 }
236   -
237 231 if (evalIndicatorMap.containsKey(shop.getIndicatorName())) {
238 232 EvalIndicator evalIndicator = evalIndicatorMap.get(shop.getIndicatorName());
239 233 importDetail.setIndicatorCode(evalIndicator.getCode());
... ... @@ -244,19 +238,14 @@ public class EvalIndicatorReportService {
244 238 importDetail.setErrorType(ImportErrorReasonEnum.NO_MATCH_INDICATOR);
245 239 errorNum += 1;
246 240 }
247   -
248 241 importDetail.setRecordId(importRecordId);
249 242 details.add(importDetail);
250   -
251 243 }
252   -
253 244 importRecord.setErrorNum(errorNum);
254 245 importRecord.setNum(indicatorValues.size());
255 246 importRecord.setSuccessNum(indicatorValues.size() - errorNum);
256 247 evalIndicatorImportRecordService.updateById(importRecord);
257   -
258 248 evalIndicatorImportDetailService.saveBatch(details);
259   -
260 249 ImportEvalIndicatorEvent importEvalIndicatorEvent = new ImportEvalIndicatorEvent(importRecord.getIndicatorCode(),
261 250 importRecord.getId(), importRecord.getGroupId(), importRecord.getUploadTime());
262 251 EventBusUtil.asyncPost(importEvalIndicatorEvent);
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalPoolService.java
  View file @b5babc6
1 1 package cn.fw.morax.service.biz.eval;
2 2  
3 3 import cn.fw.common.page.AppPage;
4   -import cn.fw.morax.common.constant.Constant;
5 4 import cn.fw.morax.common.utils.PublicUtil;
6 5 import cn.fw.morax.common.utils.StringUtils;
7 6 import cn.fw.morax.domain.db.eval.EvalGroup;
... ... @@ -21,8 +20,6 @@ import lombok.RequiredArgsConstructor;
21 20 import lombok.extern.slf4j.Slf4j;
22 21 import org.springframework.stereotype.Service;
23 22  
24   -import java.math.BigDecimal;
25   -import java.math.RoundingMode;
26 23 import java.time.YearMonth;
27 24 import java.util.Arrays;
28 25 import java.util.List;
... ... @@ -79,6 +76,7 @@ public class EvalPoolService {
79 76 Map<Long, String> evalGroupNameMap = evalGroups.stream().collect(Collectors.toMap(EvalGroup::getId, EvalGroup::getName));
80 77 for (EvalUserPoolVO userPool : userPools) {
81 78 userPool.setEvalGroupName(evalGroupNameMap.getOrDefault(userPool.getEvalGroupId(), ""));
  79 + userPool.convertScoreRatio();
82 80 }
83 81 page.setData(userPools);
84 82 }
... ... @@ -115,6 +113,7 @@ public class EvalPoolService {
115 113 Map<Long, String> evalGroupNameMap = evalGroups.stream().collect(Collectors.toMap(EvalGroup::getId, EvalGroup::getName));
116 114 for (EvalShopPoolVO shopPool : shopPools) {
117 115 shopPool.setEvalGroupName(evalGroupNameMap.getOrDefault(shopPool.getEvalGroupId(), ""));
  116 + shopPool.convertScoreRatio();
118 117 }
119 118 page.setData(shopPools);
120 119 }
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalRewardService.java
  View file @b5babc6
... ... @@ -230,7 +230,7 @@ public class EvalRewardService {
230 230 Map<String, String> dynamicMap = new HashMap<>(8);
231 231 dynamicMap.put("evalGroupName", evalGroupName);
232 232 dynamicMap.put("evalName", evalName);
233   - dynamicMap.put("evalType", evalType.getValue().toString());
  233 + dynamicMap.put("evalType", evalType.getName());
234 234 dynamicMap.put("amount", decimalFormat.format(rewardDist.getReward()));
235 235 planItemReq.setDynamicMap(dynamicMap);
236 236  
... ...