|
@@ -5,6 +5,7 @@ import com.ruoyi.common.config.RuoYiConfig;
|
|
|
import com.ruoyi.common.core.controller.BaseController;
|
|
import com.ruoyi.common.core.controller.BaseController;
|
|
|
import com.ruoyi.common.core.domain.AjaxResult;
|
|
import com.ruoyi.common.core.domain.AjaxResult;
|
|
|
import com.ruoyi.common.core.domain.R;
|
|
import com.ruoyi.common.core.domain.R;
|
|
|
|
|
+import com.ruoyi.common.core.domain.entity.SysDept;
|
|
|
import com.ruoyi.project.domain.CompanyClockBo;
|
|
import com.ruoyi.project.domain.CompanyClockBo;
|
|
|
import com.ruoyi.common.core.page.TableDataInfo;
|
|
import com.ruoyi.common.core.page.TableDataInfo;
|
|
|
import com.ruoyi.common.enums.BusinessType;
|
|
import com.ruoyi.common.enums.BusinessType;
|
|
@@ -23,6 +24,7 @@ import com.ruoyi.project.domain.ProjectTask;
|
|
|
import com.ruoyi.project.service.ProjectStaffRecordService;
|
|
import com.ruoyi.project.service.ProjectStaffRecordService;
|
|
|
import com.ruoyi.project.service.ProjectStaffService;
|
|
import com.ruoyi.project.service.ProjectStaffService;
|
|
|
import com.ruoyi.project.service.ProjectTaskService;
|
|
import com.ruoyi.project.service.ProjectTaskService;
|
|
|
|
|
+import com.ruoyi.system.service.ISysDeptService;
|
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import org.apache.http.HttpStatus;
|
|
import org.apache.http.HttpStatus;
|
|
@@ -52,6 +54,8 @@ public class ProjectTaskController extends BaseController {
|
|
|
private ProjectStaffService projectStaffService;
|
|
private ProjectStaffService projectStaffService;
|
|
|
@Resource
|
|
@Resource
|
|
|
private ProjectStaffRecordService projectStaffRecordService;
|
|
private ProjectStaffRecordService projectStaffRecordService;
|
|
|
|
|
+ @Resource
|
|
|
|
|
+ private ISysDeptService sysDeptService;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 新增项目任务
|
|
* 新增项目任务
|
|
@@ -543,7 +547,9 @@ public class ProjectTaskController extends BaseController {
|
|
|
* 获取公司打卡数据
|
|
* 获取公司打卡数据
|
|
|
*/
|
|
*/
|
|
|
@GetMapping("/getCompanyClock")
|
|
@GetMapping("/getCompanyClock")
|
|
|
- public TableDataInfo getCompanyClock(Integer deptId){
|
|
|
|
|
|
|
+ public TableDataInfo getCompanyClock(String usci){
|
|
|
|
|
+ SysDept sysDept = sysDeptService.selectByusci(usci);
|
|
|
|
|
+ Long deptId = sysDept.getDeptId();
|
|
|
startPage();
|
|
startPage();
|
|
|
List<CompanyClockBo> companyClock = projectStaffRecordService.getCompanyClock(deptId);
|
|
List<CompanyClockBo> companyClock = projectStaffRecordService.getCompanyClock(deptId);
|
|
|
return getDataTable(companyClock);
|
|
return getDataTable(companyClock);
|
|
@@ -553,8 +559,8 @@ public class ProjectTaskController extends BaseController {
|
|
|
* 获取公司部门,项目,人员信息
|
|
* 获取公司部门,项目,人员信息
|
|
|
*/
|
|
*/
|
|
|
@GetMapping("/getCompanyData")
|
|
@GetMapping("/getCompanyData")
|
|
|
- public AjaxResult getCompanyData(Integer deptId){
|
|
|
|
|
|
|
+ public AjaxResult getCompanyData(String usci){
|
|
|
|
|
|
|
|
- return AjaxResult.success(projectTaskService.getCompanyData(deptId));
|
|
|
|
|
|
|
+ return AjaxResult.success(projectTaskService.getCompanyData(usci));
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|