diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/RepairCardApplyController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/RepairCardApplyController.java index 400b476..cc7b572 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/RepairCardApplyController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/RepairCardApplyController.java @@ -79,7 +79,6 @@ public class RepairCardApplyController extends BaseController { @PostMapping("export") @SysLog(title = "补卡申请导出", businessType = OperaType.QUERY, logType = 0, module = "考勤管理-补卡申请", details = "导出补卡申请列表") public void export(HttpServletResponse response, RepairCardApplyDto cardApply) { - List list = repairCardApplyMapper.list(cardApply); ExcelUtil util = new ExcelUtil(RepairCardApplyDto.class); util.exportExcel(response, list, "补卡申请数据"); @@ -173,6 +172,12 @@ public class RepairCardApplyController extends BaseController { return repairCardApplyMapper.audit(cardApplyDto); } + /** + * 补卡统计 + * + * @param + * @return + */ @GetMapping("/cardStatistics") @SysLog(title = "补卡统计列表", businessType = OperaType.QUERY, logType = 0, module = "考勤管理-补卡申请", details = "查询补卡统计列表") public TableDataInfo getCardStatistics(RepairCardApplyDto cardApply) { @@ -185,4 +190,17 @@ public class RepairCardApplyController extends BaseController { } return getDataTableError(new ArrayList<>()); } + + /** + * 补卡统计导出 + * + * @param + * @return + */ + @GetMapping("/exportCardStatistics") + public void exportCardStatistics(HttpServletResponse response, RepairCardApplyDto cardApply) { + List list = repairCardApplyMapper.getCardStatistics(cardApply); + ExcelUtil util = new ExcelUtil(CardStatisticsDto.class); + util.exportExcel(response, list, "补卡统计数据"); + } } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/dto/CardStatisticsDto.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/dto/CardStatisticsDto.java index 107cee1..85b4986 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/dto/CardStatisticsDto.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/dto/CardStatisticsDto.java @@ -1,5 +1,6 @@ package com.bonus.bmw.domain.dto; +import com.bonus.common.core.annotation.Excel; import lombok.Data; /** @@ -11,13 +12,18 @@ public class CardStatisticsDto { // 工程id private String proId; // 工程名称 + @Excel(name = "工程名称") private String proName; // 申请补卡次数 + @Excel(name = "申请补卡次数") private Integer num; //累计补卡人数 + @Excel(name = "累计补卡人数") private Integer personNum; // 累计补卡天数 + @Excel(name = "累计补卡天数") private Integer days; // 最新申请时间 + @Excel(name = "最新申请时间") private String createTime; }