瀏覽代碼

导出数据的时候添加考勤组条件

main
1341924763@qq.com 2 天之前
父節點
當前提交
70287f3f2e

+ 5
- 0
zs-manager/src/main/java/com/ruoyi/zhushi/controller/DkAttendanceGroupController.java 查看文件

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());
}
} }

+ 5
- 1
zs-manager/src/main/java/com/ruoyi/zhushi/entity/DkCheckInRecordDTO.java 查看文件

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;
} }

+ 2
- 0
zs-manager/src/main/java/com/ruoyi/zhushi/service/DkAttendanceGroupService.java 查看文件

public AppDTO queryAttendanceGroupBYUserId(long useId); public AppDTO queryAttendanceGroupBYUserId(long useId);


public int deleteConfig(long id); public int deleteConfig(long id);

public List<DkAttendanceGroupDTO> queryAttendanceGroup();
} }

+ 6
- 0
zs-manager/src/main/java/com/ruoyi/zhushi/service/impl/DkAttendanceGroupServiceImpl.java 查看文件

return dkAttendanceGroupAndUserMapper.deleteById(id); return dkAttendanceGroupAndUserMapper.deleteById(id);


} }

@Override
public List<DkAttendanceGroupDTO> queryAttendanceGroup() {
LambdaQueryWrapper<DkAttendanceGroup> queryWrapper = Wrappers.lambdaQuery();
return dkAttendanceGroupMapper.selectVoList(queryWrapper);
}
} }

+ 1
- 0
zs-manager/src/main/java/com/ruoyi/zhushi/service/impl/DkRecordServiceImpl.java 查看文件

} }
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);

Loading…
取消
儲存