public R<Void> delUser(@PathVariable long id) { | public R<Void> delUser(@PathVariable long id) { | ||||
return toAjax(dkAttendanceGroupService.deleteConfig(id)); | return toAjax(dkAttendanceGroupService.deleteConfig(id)); | ||||
} | } | ||||
@GetMapping("/queryAttendanceGroup") | |||||
public R<List<DkAttendanceGroupDTO>> queryAttendanceGroup() { | |||||
return R.ok(dkAttendanceGroupService.queryAttendanceGroup()); | |||||
} | |||||
} | } |
import lombok.Data; | import lombok.Data; | ||||
import java.time.LocalDateTime; | import java.time.LocalDateTime; | ||||
import java.util.List; | |||||
@Data | @Data | ||||
@ExcelIgnoreUnannotated | @ExcelIgnoreUnannotated | ||||
private String modelType; | private String modelType; | ||||
// 考勤组id | // 考勤组id | ||||
private String attendanceGroupId; | |||||
private long attendanceGroupId; | |||||
// 考勤组名称 | // 考勤组名称 | ||||
private String attendanceGroupName; | private String attendanceGroupName; | ||||
// 考勤组ids | |||||
private List<Long> attendanceGroupIds; | |||||
} | } |
public AppDTO queryAttendanceGroupBYUserId(long useId); | public AppDTO queryAttendanceGroupBYUserId(long useId); | ||||
public int deleteConfig(long id); | public int deleteConfig(long id); | ||||
public List<DkAttendanceGroupDTO> queryAttendanceGroup(); | |||||
} | } |
return dkAttendanceGroupAndUserMapper.deleteById(id); | return dkAttendanceGroupAndUserMapper.deleteById(id); | ||||
} | } | ||||
@Override | |||||
public List<DkAttendanceGroupDTO> queryAttendanceGroup() { | |||||
LambdaQueryWrapper<DkAttendanceGroup> queryWrapper = Wrappers.lambdaQuery(); | |||||
return dkAttendanceGroupMapper.selectVoList(queryWrapper); | |||||
} | |||||
} | } |
} | } | ||||
if(flag != null){ | if(flag != null){ | ||||
queryWrapper.select(DkCheckInRecord::getSysUserName, DkCheckInRecord::getSysUserId); | queryWrapper.select(DkCheckInRecord::getSysUserName, DkCheckInRecord::getSysUserId); | ||||
queryWrapper.in(DkCheckInRecord::getAttendanceGroupId, dkCheckInRecordDTO.getAttendanceGroupIds()); | |||||
queryWrapper.groupBy(DkCheckInRecord::getSysUserName).groupBy(DkCheckInRecord::getSysUserId); | queryWrapper.groupBy(DkCheckInRecord::getSysUserName).groupBy(DkCheckInRecord::getSysUserId); | ||||
}else{ | }else{ | ||||
queryWrapper.orderByDesc(DkCheckInRecord::getSysUserName).orderByDesc(DkCheckInRecord::getCheckInTime); | queryWrapper.orderByDesc(DkCheckInRecord::getSysUserName).orderByDesc(DkCheckInRecord::getCheckInTime); |