勤务模块

airport-admin/src/main/java/com/sundot/airport/web/controller/attendance/AttendanceTeamUserRecordController.java

@@ -55,6 +55,8 @@ public class AttendanceTeamUserRecordController extends BaseController {
     @PreAuthorize("@ss.hasPermi('attendance:record:list')")
     @GetMapping("/list")
     public TableDataInfo list(AttendanceTeamUserRecord attendanceTeamUserRecord) {
+        attendanceTeamUserRecord.setCreateBy(getUsername());
+        attendanceTeamUserRecord.setCheckInType("1");
         List<AttendanceTeamUserRecord> list = attendanceTeamUserRecordService.selectAttendanceTeamUserRecordList(attendanceTeamUserRecord);
         return getDataTable(list);
     }
@@ -66,6 +68,11 @@ public class AttendanceTeamUserRecordController extends BaseController {
     @Log(title = "考勤班组成员", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, AttendanceTeamUserRecord attendanceTeamUserRecord) {
+        if (attendanceTeamUserRecord == null) {
+            attendanceTeamUserRecord = new AttendanceTeamUserRecord();
+        }
+        attendanceTeamUserRecord.setCreateBy(getUsername());
+        attendanceTeamUserRecord.setCheckInType("1");
         List<AttendanceTeamUserRecord> list = attendanceTeamUserRecordService.selectAttendanceTeamUserRecordList(attendanceTeamUserRecord);
         ExcelUtil<AttendanceTeamUserRecord> util = new ExcelUtil<AttendanceTeamUserRecord>(AttendanceTeamUserRecord.class);
         util.exportExcel(response, list, "考勤班组成员数据");

airport-attendance/src/main/java/com/sundot/airport/attendance/service/impl/AttendanceTeamUserRecordServiceImpl.java

@@ -86,8 +86,6 @@ public class AttendanceTeamUserRecordServiceImpl implements IAttendanceTeamUserR
 //                throw new ServiceException("日期格式化错误");
 //            }
 //        }
-        attendanceTeamUserRecord.setCreateBy(getUsername());
-        attendanceTeamUserRecord.setCheckInType("1");
         Date maxDate = attendanceTeamUserRecordMapper.selectMaxDateBy(attendanceTeamUserRecord);
         if (maxDate != null) {
             attendanceTeamUserRecord.setAttendanceDate(maxDate);
@@ -214,6 +212,7 @@ public class AttendanceTeamUserRecordServiceImpl implements IAttendanceTeamUserR
     public List<Long> selectAttendanceTeamLeaderId() {
         AttendanceTeamUserRecord attendanceTeamUserRecord = new AttendanceTeamUserRecord();
         attendanceTeamUserRecord.setAttendanceDate(DateUtils.getNowDate());
+        attendanceTeamUserRecord.setCheckInType("1");
         List<AttendanceTeamUserRecord> attendanceTeamUserRecords = selectAttendanceTeamUserRecordList(attendanceTeamUserRecord);
         List<Long> collect = attendanceTeamUserRecords.stream().map(AttendanceTeamUserRecord::getAttendanceTeamId).collect(Collectors.toList());
         if (CollectionUtil.isEmpty(collect)) {