KPI / fw-morax

Commit 5a834c50fcf7112ee2eadd27b8021a8bcafcc77c

Authored by 姜超
1 parent 554c0be5

feature(*): 考评模板导出 

考评模板导出
Inline Side-by-side
Showing 4 changed files with 51 additions and 13 deletions
fw-morax-dao/src/main/resources/mapper/eval/EvalIndicatorValueMapper.xml
  View file @5a834c5
... ... @@ -13,7 +13,7 @@
13 13 <result column="indicator_code" property="indicatorCode"/>
14 14 <result column="indicator_name" property="indicatorName"/>
15 15 <result column="indicator_value" property="indicatorValue"/>
16   - <result column="value_type" property="valueType"/>
  16 + <result column="data_type" property="dataType"/>
17 17 <result column="data_date" property="dataDate"/>
18 18 <result column="group_id" property="groupId"/>
19 19 <result column="yn" property="yn"/>
... ... @@ -31,7 +31,7 @@
31 31 t2.`shop_id`,
32 32 t2.`shop_name`,
33 33 t2.`indicator_value`,
34   - t2.`value_type`,
  34 + t2.`data_type`,
35 35 t2.`data_date`,
36 36 t2.`group_id`
37 37 from eval_indicator_value t2
... ... @@ -53,7 +53,7 @@
53 53 t1.user_id,
54 54 t1.indicator_code,
55 55 t1.indicator_value,
56   - t1.value_type,
  56 + t1.data_type,
57 57 t1.data_date,
58 58 t1.group_id
59 59 FROM
... ...
fw-morax-domain/src/main/java/cn/fw/morax/domain/vo/eval/StaffIndicatorValueVO.java
  View file @5a834c5
... ... @@ -4,6 +4,10 @@ import cn.fw.morax.common.annotation.ExcelField;
4 4 import lombok.Data;
5 5  
6 6 import java.math.BigDecimal;
  7 +import java.time.LocalDate;
  8 +import java.time.format.DateTimeFormatter;
  9 +import java.util.ArrayList;
  10 +import java.util.List;
7 11  
8 12 @Data
9 13 public class StaffIndicatorValueVO {
... ... @@ -37,4 +41,16 @@ public class StaffIndicatorValueVO {
37 41 */
38 42 @ExcelField(title = "考核周期", sort = 4, charSize = 16)
39 43 private String dataDate;
  44 +
  45 + public static List<StaffIndicatorValueVO> templateData() {
  46 + List<StaffIndicatorValueVO> templates = new ArrayList<>();
  47 + StaffIndicatorValueVO valueVO = new StaffIndicatorValueVO();
  48 + valueVO.setStaffName("张三");
  49 + valueVO.setShopName("宁夏瑞静B4-17店");
  50 + valueVO.setIndicatorName("活动成交任务达成率");
  51 + valueVO.setIndicatorValue("0.1");
  52 + valueVO.setDataDate(DateTimeFormatter.ofPattern("yyyy-MM-dd").format(LocalDate.now()));
  53 + templates.add(valueVO);
  54 + return templates;
  55 + }
40 56 }
... ...
fw-morax-server/src/main/java/cn/fw/morax/server/controller/erp/EvalTaskController.java
  View file @5a834c5
... ... @@ -72,6 +72,13 @@ public class EvalTaskController {
72 72 return success();
73 73 }
74 74  
  75 + @GetMapping("/dist-reward")
  76 + @ControllerMethod("分配奖惩")
  77 + public Message<Void> distributionEvalReward() {
  78 + evalCalcTask.distributionEvalReward();
  79 + return success();
  80 + }
  81 +
75 82 @GetMapping("/cache-report")
76 83 @ControllerMethod("缓存需要上报的考评指标")
77 84 public Message<Void> cacheReportEvalIndicator() {
... ...
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalIndicatorReportService.java
  View file @5a834c5
... ... @@ -16,6 +16,7 @@ import cn.fw.morax.domain.enums.ImportErrorReasonEnum;
16 16 import cn.fw.morax.domain.enums.IndicatorValueTypeEnum;
17 17 import cn.fw.morax.domain.enums.SettingStatusEnum;
18 18 import cn.fw.morax.domain.vo.eval.*;
  19 +import cn.fw.morax.domain.vo.salary.StaffSalaryDetailVO;
19 20 import cn.fw.morax.service.biz.CommonService;
20 21 import cn.fw.morax.service.data.eval.*;
21 22 import cn.fw.morax.service.data.kpi.IndicatorsService;
... ... @@ -68,13 +69,13 @@ public class EvalIndicatorReportService {
68 69 public void staffTemplateFile(HttpServletRequest request, HttpServletResponse response) {
69 70 String fileName = "人员导入标准模板.xlsx";
70 71 String encodeFileName = CommonService.getEncodeName(request, fileName);
71   - CommonService.downloadTemplateExcel(response, encodeFileName, StaffIndicatorValueVO.class);
  72 + CommonService.downloadExcel(response, staffTemplateData(), encodeFileName, StaffIndicatorValueVO.class);
72 73 }
73 74  
74 75 public void shopTemplateFile(HttpServletRequest request, HttpServletResponse response) {
75 76 String fileName = "门店导入标准模板.xlsx";
76 77 String encodeFileName = CommonService.getEncodeName(request, fileName);
77   - CommonService.downloadTemplateExcel(response, encodeFileName, ShopIndicatorValueVO.class);
  78 + CommonService.downloadExcel(response, shopTemplateData(), encodeFileName, ShopIndicatorValueVO.class);
78 79 }
79 80  
80 81 /**
... ... @@ -218,7 +219,6 @@ public class EvalIndicatorReportService {
218 219 } catch (IOException e) {
219 220 e.printStackTrace();
220 221 }
221   -
222 222 Map<String, String> headerAlias = ExcelDataUtil.getTitleMappingField(ShopIndicatorValueVO.class);
223 223 reader.setHeaderAlias(headerAlias);
224 224 indicatorValues = reader.readAll(ShopIndicatorValueVO.class);
... ... @@ -276,13 +276,6 @@ public class EvalIndicatorReportService {
276 276 }
277 277  
278 278 public MultiKeyMap<String, EvalUserPool> getShopUserPoolMap(LoginAuthBean user) {
279   -// List<Long> evalGroupIds = this.getEffectEvalGroupIds(user.getGroupId());
280   -// BV.isNotEmpty(evalGroupIds, "生效中");
281   -// List<EvalUserPool> pools = evalUserPoolService.list(Wrappers.<EvalUserPool>lambdaQuery()
282   -// .in(EvalUserPool::getEvalGroupId, evalGroupIds)
283   -// .eq(EvalUserPool::getGroupId, user.getGroupId())
284   -// .eq(EvalUserPool::getYn, Boolean.TRUE)
285   -// );
286 279 YearMonth month = YearMonth.now().minusMonths(12);
287 280 List<EvalUserPool> pools = evalUserPoolService.getLastPool(month, user.getGroupId());
288 281  
... ... @@ -362,4 +355,26 @@ public class EvalIndicatorReportService {
362 355 // EvalIndicatorImport indicatorImport =
363 356 // }
364 357  
  358 + public static List<StaffIndicatorValueVO> staffTemplateData() {
  359 + List<StaffIndicatorValueVO> templates = new ArrayList<>();
  360 + StaffIndicatorValueVO valueVO = new StaffIndicatorValueVO();
  361 + valueVO.setStaffName("张三");
  362 + valueVO.setShopName("宁夏瑞静B4-17店");
  363 + valueVO.setIndicatorName("活动成交任务达成率");
  364 + valueVO.setIndicatorValue("0.1");
  365 + valueVO.setDataDate(DateTimeFormatter.ofPattern("yyyy-MM-dd").format(LocalDate.now()));
  366 + templates.add(valueVO);
  367 + return templates;
  368 + }
  369 + public static List<ShopIndicatorValueVO> shopTemplateData() {
  370 + List<ShopIndicatorValueVO> templates = new ArrayList<>();
  371 + ShopIndicatorValueVO valueVO = new ShopIndicatorValueVO();
  372 + valueVO.setShopName("宁夏瑞静B4-17店");
  373 + valueVO.setIndicatorName("活动成交任务达成率");
  374 + valueVO.setIndicatorValue("0.1");
  375 + valueVO.setDataDate(DateTimeFormatter.ofPattern("yyyy-MM-dd").format(LocalDate.now()));
  376 + templates.add(valueVO);
  377 + return templates;
  378 + }
  379 +
365 380 }
... ...