KPI / fw-morax

Commit 8f549dd85c11e6ad2ed2f50919b27a0a58468c05

Authored by 姜超
1 parent af34d179

feature(*): 模板文件上传 

模板文件上传
Inline Side-by-side
Showing 3 changed files with 8 additions and 17 deletions
fw-morax-server/src/main/java/cn/fw/morax/server/controller/erp/EvalIndicatorImportController.java
  View file @8f549dd
... ... @@ -61,15 +61,15 @@ public class EvalIndicatorImportController {
61 61 }
62 62  
63 63 /**
64   - * 数据导入指标列表
  64 + * 指标导入模板文件
65 65 *
66 66 * @return
67 67 */
68 68 @IgnoreAuth
69 69 @GetMapping("/template-file")
70   - @ControllerMethod("数据导入指标列表")
  70 + @ControllerMethod("指标导入模板文件")
71 71 public Message<String> evalIndicatorTemplateFile(@CurrentUser LoginAuthBean user,
72   - @NotNull(message = "指标编码不能为空") @RequestParam("indicatorCode") String indicatorCode) {
  72 + @NotNull(message = "指标编码不能为空") @RequestParam("indicatorCode") String indicatorCode) {
73 73 return success(evalIndicatorImportBizService.evalIndicatorTemplateFile(user, indicatorCode));
74 74 }
75 75  
... ... @@ -140,20 +140,6 @@ public class EvalIndicatorImportController {
140 140 return success(evalIndicatorImportBizService.uploadShowroomMonthlyData(fid, null, indicatorCode, user));
141 141 }
142 142  
143   -// /**
144   -// * 上传门店指标
145   -// *
146   -// * @return
147   -// */
148   -// @IgnoreAuth
149   -// @PostMapping("/analysis-shop")
150   -// @ControllerMethod("上传门店指标")
151   -// public Message<EvalIndicatorImportRecordVO> uploadShopIndicator(@RequestParam("file") MultipartFile file, @CurrentUser LoginAuthBean user) {
152   -// if (file.isEmpty()) {
153   -// throw new BusinessException("请上传文件");
154   -// }
155   -// return success(evalIndicatorReportService.uploadShopIndicator(file, user));
156   -// }
157 143  
158 144 /**
159 145 * 保存展厅美化数据
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalIndicatorImportBizService.java
  View file @8f549dd
... ... @@ -65,6 +65,9 @@ public class EvalIndicatorImportBizService {
65 65 .eq(EvalIndicatorImportMenu::getGroupId, groupId)
66 66 .eq(EvalIndicatorImportMenu::getYn, Boolean.TRUE)
67 67 );
  68 + if (PublicUtil.isEmpty(evalIndicatorMenus)) {
  69 + return new ArrayList<>();
  70 + }
68 71 List<String> evalIndicatorCodes = evalIndicatorMenus.stream().map(EvalIndicatorImportMenu::getIndicatorCode).collect(Collectors.toList());
69 72 List<EvalIndicator> evalIndicators = evalIndicatorService.list(Wrappers.<EvalIndicator>lambdaQuery()
70 73 .in(EvalIndicator::getCode, evalIndicatorCodes)
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/component/EvalIndicatorScoreSaveObserver.java
  View file @8f549dd
... ... @@ -140,6 +140,7 @@ public class EvalIndicatorScoreSaveObserver {
140 140 indicatorValue.setShopName(scoreBO.getShopName());
141 141 indicatorValue.setIndicatorValue(BigDecimal.ZERO);
142 142 indicatorValue.setIndicatorCode(evalIndicator.getCode());
  143 + indicatorValue.setIndicatorName(evalIndicator.getName());
143 144 indicatorValue.setDimensionType(DimensionTypeEnum.SHOP);
144 145 if (PublicUtil.isNotEmpty(score) && PublicUtil.isNotEmpty(totalScore) && (totalScore.compareTo(BigDecimal.ZERO) > 0)) {
145 146 indicatorValue.setIndicatorValue(score.divide(totalScore, 4, RoundingMode.HALF_UP));
... ... @@ -202,6 +203,7 @@ public class EvalIndicatorScoreSaveObserver {
202 203 value.setShopName("");
203 204 value.setIndicatorValue(BigDecimal.ZERO);
204 205 value.setIndicatorCode(evalIndicator.getCode());
  206 + value.setIndicatorName(evalIndicator.getName());
205 207 value.setDimensionType(DimensionTypeEnum.STAFF);
206 208 if (PublicUtil.isNotEmpty(score) && PublicUtil.isNotEmpty(totalScore) && (totalScore.compareTo(BigDecimal.ZERO) > 0)) {
207 209 value.setIndicatorValue(score.divide(totalScore, 4, RoundingMode.HALF_UP));
... ...