From 1cd80b0193db031638fcda535573e2d8bc40e499 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 02 Mar 2022 17:46:24 +0800
Subject: [PATCH] 考勤打卡查询修改，导出修改
---
src/main/java/org/springblade/modules/attendance/controller/AttendanceController.java | 35 +++++++++--------------------------
1 files changed, 9 insertions(+), 26 deletions(-)
diff --git a/src/main/java/org/springblade/modules/attendance/controller/AttendanceController.java b/src/main/java/org/springblade/modules/attendance/controller/AttendanceController.java
index 24ccdf4..20e0cad 100644
--- a/src/main/java/org/springblade/modules/attendance/controller/AttendanceController.java
+++ b/src/main/java/org/springblade/modules/attendance/controller/AttendanceController.java
@@ -79,9 +79,9 @@
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入attendance")
- public R<IPage<AttendanceVO>> page(AttendanceVO attendance, Query query, Long department) {
- IPage<Attendance> pages = attendanceService.selectAttendancePage(Condition.getPage(query), department, attendance);
- return R.data(AttendanceWrapper.build().pageVO(pages));
+ public R<IPage<AttendanceVO>> page(AttendanceVO attendance, Query query) {
+ IPage<AttendanceVO> pages = attendanceService.selectAttendancePage(Condition.getPage(query), attendance);
+ return R.data(pages);
}
// /**
@@ -303,31 +303,14 @@
}
/**
- * 导出用户
+ * 导出考勤数据
+ * @param response
+ * @param attendance
*/
@GetMapping("/export-Attendance")
- public void exportAttendane(String name, String beginTime, String endTime, String attendancetype, HttpServletResponse response) {
- String beginTimes = null;
- String endTimes = null;
- String attendancetypes = null;
- if (beginTime.equals("undefined ") && endTime.equals("undefined")) {
- beginTimes=null;
- endTimes=null;
- attendancetypes=attendancetype;
- }
- else if (attendancetype.equals("undefined")){
- attendancetypes=null;
- }
- else {
- beginTimes=beginTime;
- endTimes=endTime;
- attendancetypes=attendancetype;
- }
-
- List<AttendanceExcel> list = attendanceService.exportAttendane(name, beginTimes, endTimes, attendancetypes);
+ public void exportAttendane(AttendanceVO attendance, HttpServletResponse response) {
+ List<AttendanceExcel> list = attendanceService.exportAttendane(attendance);
ExcelUtil.export(response, "考勤数据" + DateUtil.time(), "考勤数据表", list, AttendanceExcel.class);
-
-
-}
+ }
}
--
Gitblit v1.9.3