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/service/impl/AttendanceServiceImpl.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/modules/attendance/service/impl/AttendanceServiceImpl.java b/src/main/java/org/springblade/modules/attendance/service/impl/AttendanceServiceImpl.java
index 00f45ef..12203ae 100644
--- a/src/main/java/org/springblade/modules/attendance/service/impl/AttendanceServiceImpl.java
+++ b/src/main/java/org/springblade/modules/attendance/service/impl/AttendanceServiceImpl.java
@@ -42,18 +42,18 @@
public class AttendanceServiceImpl extends ServiceImpl<AttendanceMapper, Attendance> implements IAttendanceService {
@Override
- public IPage<Attendance> selectAttendancePage(IPage<Attendance> page, Long department, AttendanceVO attendance) {
- return page.setRecords(baseMapper.selectAttendancePage(page,department, attendance));
+ public IPage<AttendanceVO> selectAttendancePage(IPage<AttendanceVO> page, AttendanceVO attendance) {
+ return page.setRecords(baseMapper.selectAttendancePage(page, attendance));
}
+ /**
+ * 导出考勤数据
+ * @param attendance
+ * @return
+ */
@Override
- public List<AttendanceExcel> exportAttendane(String name,String beginTimes,String endTimes,String attendancetypes) {
- List<AttendanceExcel> userList = baseMapper.exportAttendane(name, beginTimes, endTimes,attendancetypes);
- userList.forEach(user -> {
- user.setAttendanceType(DictBizCache.getValue(DictBizEnum.TEST,user.getAttendanceType()));
-// user.setClockType(DictBizCache.getValue(DictBizEnum.CLOCKTYPE,user.getClockType()));
- user.setDepartment(StringUtil.join(SysCache.getDeptNames(user.getDepartment())));
- });
+ public List<AttendanceExcel> exportAttendane(AttendanceVO attendance) {
+ List<AttendanceExcel> userList = baseMapper.exportAttendane(attendance);
return userList;
}
--
Gitblit v1.9.3