@@ -34,6 +34,7 @@ public class DkAppController extends BaseController { | |||
private DkAppService dkAppService; | |||
// 查询当前用户考勤组 | |||
@GetMapping("/queryAttendanceGroupByUserId") | |||
public R<AppDTO> queryAttendanceGroupBYUserId(long userId) { | |||
return R.ok(dkAttendanceGroupService.queryAttendanceGroupBYUserId(userId)); |
@@ -33,26 +33,31 @@ public class DkAttendanceGroupController extends BaseController { | |||
@Autowired | |||
private DkAttendanceGroupService dkAttendanceGroupService; | |||
// 查询打卡配置列表 | |||
@GetMapping("/list") | |||
public TableDataInfo<DkAttendanceGroupDTO> list(DkAttendanceGroupDTO dkAttendanceGroupDTO) { | |||
return dkAttendanceGroupService.queryPageList(dkAttendanceGroupDTO); | |||
} | |||
// 新增打卡配置 | |||
@PostMapping("/add") | |||
public R<String> add(@RequestBody DkAttendanceGroupDTO dkAttendanceGroupDTO) { | |||
return R.ok(dkAttendanceGroupService.add(dkAttendanceGroupDTO)); | |||
} | |||
// 删除打卡配置 | |||
@DeleteMapping("/del/{id}") | |||
public R<Void> del(@PathVariable Long id) { | |||
return toAjax(dkAttendanceGroupService.del(id)); | |||
} | |||
// 删除用户配置 | |||
@DeleteMapping("/delUser/{id}") | |||
public R<Void> delUser(@PathVariable long id) { | |||
return toAjax(dkAttendanceGroupService.deleteConfig(id)); | |||
} | |||
// 查询用户打卡配置 | |||
@GetMapping("/queryAttendanceGroup") | |||
public R<List<DkAttendanceGroupDTO>> queryAttendanceGroup() { | |||
return R.ok(dkAttendanceGroupService.queryAttendanceGroup()); |
@@ -35,17 +35,20 @@ public class DkConfigController extends BaseController { | |||
return dkConfigService.queryList(dkCheckInConfigDTO); | |||
} | |||
// 新增 | |||
@PostMapping("/add") | |||
public R<Void> add(@Validated(AddGroup.class) @RequestBody DkCheckInConfigDTO dkCheckInConfigDTO) { | |||
return toAjax(dkConfigService.addConfig(dkCheckInConfigDTO)); | |||
} | |||
// 删除 | |||
@DeleteMapping("/deleteConfig/{id}") | |||
public R<Integer> remove(@PathVariable Long id) { | |||
return R.ok(dkConfigService.deleteConfig(id)); | |||
} | |||
// 修改 | |||
@PutMapping("/updateConfig") | |||
public R<Void> edit(@RequestBody DkCheckInConfigDTO bo) { | |||
return toAjax(dkConfigService.updateConfig(bo)); |
@@ -49,6 +49,9 @@ public class DkRecordController extends BaseController { | |||
} | |||
/** | |||
* 导出结果列表 | |||
*/ | |||
@PostMapping("/exportNew") | |||
public void exportNew(DkCheckInRecordDTO bo, HttpServletResponse response) { | |||
dkRecordService.exportNew(bo, response); |
@@ -28,6 +28,7 @@ public class DkAttendanceGroupServiceImpl implements DkAttendanceGroupService { | |||
private DkAttendanceGroupAndUserMapper dkAttendanceGroupAndUserMapper; | |||
// 查询考勤组 | |||
@Override | |||
public TableDataInfo<DkAttendanceGroupDTO> queryPageList(DkAttendanceGroupDTO dkAttendanceGroupDTO) { | |||
List<DkAttendanceGroupDTO> dkAttendanceGroupDTOS = new ArrayList<>(); | |||
@@ -44,6 +45,7 @@ public class DkAttendanceGroupServiceImpl implements DkAttendanceGroupService { | |||
return TableDataInfo.build(dkAttendanceGroupDTOS); | |||
} | |||
// 添加考勤组 | |||
@Override | |||
public String add(DkAttendanceGroupDTO dkAttendanceGroupDTO) { | |||
StringBuffer stringBuffer = new StringBuffer(); | |||
@@ -91,12 +93,14 @@ public class DkAttendanceGroupServiceImpl implements DkAttendanceGroupService { | |||
return dkAttendanceGroupMapper.deleteById(id); | |||
} | |||
// 查询用户所在的考勤组 | |||
public AppDTO queryAttendanceGroupBYUserId(long userId){ | |||
AppDTO appDTO; | |||
appDTO = dkAttendanceGroupMapper.queryAttendanceGroupBYUserId(userId); | |||
return appDTO; | |||
} | |||
// 删除用户考勤组 | |||
@Override | |||
public int deleteConfig(long id) { | |||
// LambdaQueryWrapper<DkAttendanceGroupAndUser> queryWrapper = Wrappers.lambdaQuery(); | |||
@@ -105,6 +109,7 @@ public class DkAttendanceGroupServiceImpl implements DkAttendanceGroupService { | |||
} | |||
// 查询所有考勤组 | |||
@Override | |||
public List<DkAttendanceGroupDTO> queryAttendanceGroup() { | |||
LambdaQueryWrapper<DkAttendanceGroup> queryWrapper = Wrappers.lambdaQuery(); |