@@ -541,10 +541,9 @@ public class ProjectTaskController extends BaseController {
* 获取公司打卡数据
*/
@GetMapping("/getCompanyClock")
- public AjaxResult getCompanyClock(Integer deptId){
- if (deptId==null){
- return AjaxResult.error("部门不能为空");
- }
- return AjaxResult.success(projectStaffRecordService.getCompanyClock(deptId));
+ public TableDataInfo getCompanyClock(Integer deptId){
+ startPage();
+ List<ProjectStaffRecord> companyClock = projectStaffRecordService.getCompanyClock(deptId);
+ return getDataTable(companyClock);
}
@@ -56,5 +56,5 @@ public interface ProjectStaffRecordService {
Object getNewMonthClock(Integer id, String yearMonth, String duration);
- Object getCompanyClock(Integer deptId);
+ List<ProjectStaffRecord> getCompanyClock(Integer deptId);
@@ -1182,7 +1182,7 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
@Override
- public Object getCompanyClock(Integer deptId) {
+ public List<ProjectStaffRecord> getCompanyClock(Integer deptId) {
return projectStaffRecordMapper.getCompanyClock(deptId);