Commit c4080605 authored by 赵啸非's avatar 赵啸非

修改本月统计

parent c7e7bc63
package com.mortals.xhx.module.attendance.web; package com.mortals.xhx.module.attendance.web;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
...@@ -169,6 +170,15 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro ...@@ -169,6 +170,15 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro
super.doListBefore(query, model, context); super.doListBefore(query, model, context);
} }
@Override
public void doExportBefore(Context context, AttendanceRecordHikEntity query, List<String> properties) throws AppException {
if (ObjectUtils.isEmpty(query.getAttendanceDateStart())) {
query.setAttendanceDateStart(DateUtil.beginOfMonth(new Date()).toDateStr());
query.setAttendanceDateEnd(DateUtil.today());
}
}
@Override @Override
public void doExportFileAfter(byte[] data, AttendanceRecordHikEntity query, Context context) throws AppException { public void doExportFileAfter(byte[] data, AttendanceRecordHikEntity query, Context context) throws AppException {
InputStream inputStream = new ByteArrayInputStream(data); InputStream inputStream = new ByteArrayInputStream(data);
...@@ -179,26 +189,26 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro ...@@ -179,26 +189,26 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro
attendanceExportRecordEntity.setFilePath(filePath); attendanceExportRecordEntity.setFilePath(filePath);
if (query.getIdList() != null) { if (query.getIdList() != null) {
List<Long> idList = query.getIdList(); List<Long> idList = query.getIdList();
attendanceExportRecordEntity.setRecordIdList(idList.stream().map(i->i.toString()).collect(Collectors.joining(","))); attendanceExportRecordEntity.setRecordIdList(idList.stream().map(i -> i.toString()).collect(Collectors.joining(",")));
} }
if (query.getAttendanceDateStart() != null) { if (query.getAttendanceDateStart() != null) {
String attendanceDate = query.getAttendanceDateStart() + "~" + query.getAttendanceDateEnd(); String attendanceDate = query.getAttendanceDateStart() + "~" + query.getAttendanceDateEnd();
attendanceExportRecordEntity.setAttendanceDate(attendanceDate); attendanceExportRecordEntity.setAttendanceDate(attendanceDate);
} }
if(!ObjectUtils.isEmpty(query.getAttendanceGroupId())){ if (!ObjectUtils.isEmpty(query.getAttendanceGroupId())) {
AttendanceGroupEntity attendanceGroupEntity = groupService.get(query.getAttendanceGroupId()); AttendanceGroupEntity attendanceGroupEntity = groupService.get(query.getAttendanceGroupId());
attendanceExportRecordEntity.setGroupName(attendanceGroupEntity==null?"":attendanceGroupEntity.getGroupName()); attendanceExportRecordEntity.setGroupName(attendanceGroupEntity == null ? "" : attendanceGroupEntity.getGroupName());
} }
if(!ObjectUtils.isEmpty(query.getDeptId())){ if (!ObjectUtils.isEmpty(query.getDeptId())) {
DeptEntity deptEntity = deptService.get(query.getDeptId(), context); DeptEntity deptEntity = deptService.get(query.getDeptId(), context);
attendanceExportRecordEntity.setDeptName(deptEntity==null?"":deptEntity.getDeptName()); attendanceExportRecordEntity.setDeptName(deptEntity == null ? "" : deptEntity.getDeptName());
} }
if(!ObjectUtils.isEmpty(query.getShiftsId())){ if (!ObjectUtils.isEmpty(query.getShiftsId())) {
AttendanceClassEntity attendanceClassEntity = classService.get(query.getShiftsId(), context); AttendanceClassEntity attendanceClassEntity = classService.get(query.getShiftsId(), context);
attendanceExportRecordEntity.setClassName(attendanceClassEntity==null?"":attendanceClassEntity.getClassName()); attendanceExportRecordEntity.setClassName(attendanceClassEntity == null ? "" : attendanceClassEntity.getClassName());
} }
attendanceExportRecordEntity.setCreateUserId(context.getUser().getId()); attendanceExportRecordEntity.setCreateUserId(context.getUser().getId());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment