diff --git a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/RecruitProcessController.java b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/RecruitProcessController.java index 5853740..4ab823e 100644 --- a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/RecruitProcessController.java +++ b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/controller/RecruitProcessController.java @@ -372,6 +372,16 @@ public class RecruitProcessController extends BaseController { } + @PreAuthorize("@ss.hasPermi('recruit:jd:list')") + @GetMapping("/jd/list") + @ApiOperation(value = "审批-《我已审批》分页/条件查询获取表单") + public TableDataInfo jdList(RecruitProcessTask task) { + startPage(); + List taskList = recruitProcessTaskService.listAllPass(task); + //把taskList的taskId变成字符串 + return getDataTable(taskList); + } + @GetMapping("/pending/getHr") @ApiOperation(value = "审批-《待我审批》查询所有的hr") diff --git a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/mapper/RecruitProcessTaskMapper.java b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/mapper/RecruitProcessTaskMapper.java index f8748b1..4bbb982 100644 --- a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/mapper/RecruitProcessTaskMapper.java +++ b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/mapper/RecruitProcessTaskMapper.java @@ -44,6 +44,8 @@ public interface RecruitProcessTaskMapper extends BaseMapper void updateReapply(@Param("taskId") String taskId); void updateUnBindHR(@Param("taskId") String taskId); + + List listAllPass(RecruitProcessTask task); } diff --git a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/RecruitProcessTaskService.java b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/RecruitProcessTaskService.java index e079ddd..3ec620a 100644 --- a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/RecruitProcessTaskService.java +++ b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/RecruitProcessTaskService.java @@ -44,4 +44,6 @@ public interface RecruitProcessTaskService extends IService void updateReapply(String taskId); void updateUnBindHR(String taskId); + + List listAllPass(RecruitProcessTask task); } diff --git a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/impl/RecruitProcessTaskServiceImpl.java b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/impl/RecruitProcessTaskServiceImpl.java index cbfe046..813c8c4 100644 --- a/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/impl/RecruitProcessTaskServiceImpl.java +++ b/zeroerr_oa-recruit/src/main/java/cn/zeroerr/service/impl/RecruitProcessTaskServiceImpl.java @@ -146,6 +146,11 @@ public class RecruitProcessTaskServiceImpl extends ServiceImpl listAllPass(RecruitProcessTask task) { + return recruitProcessTaskMapper.listAllPass(task); + } + /** * 处理流程节点 diff --git a/zeroerr_oa-recruit/src/main/resources/mapper/RecruitProcessTaskMapper.xml b/zeroerr_oa-recruit/src/main/resources/mapper/RecruitProcessTaskMapper.xml index fc8f626..78e4444 100644 --- a/zeroerr_oa-recruit/src/main/resources/mapper/RecruitProcessTaskMapper.xml +++ b/zeroerr_oa-recruit/src/main/resources/mapper/RecruitProcessTaskMapper.xml @@ -266,4 +266,20 @@ update recruit_process_task set hr_id=null ,hr_name=null where task_id=#{taskId} +