From 4b56200d3f9e2f1473dc341e4364c323bf8de1e0 Mon Sep 17 00:00:00 2001
From: lw <532810027@qq.com>
Date: Mon, 29 Jul 2024 20:32:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9F=A5=E7=9C=8B=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E5=AE=A1=E6=89=B9=E9=80=9A=E8=BF=87=E7=9A=84JD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/RecruitProcessController.java     | 10 ++++++++++
 .../zeroerr/mapper/RecruitProcessTaskMapper.java |  2 ++
 .../service/RecruitProcessTaskService.java       |  2 ++
 .../impl/RecruitProcessTaskServiceImpl.java      |  5 +++++
 .../mapper/RecruitProcessTaskMapper.xml          | 16 ++++++++++++++++
 5 files changed, 35 insertions(+)

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<RecruitProcessTask> 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<RecruitProcessTask>
     void updateReapply(@Param("taskId") String taskId);
 
     void updateUnBindHR(@Param("taskId") String taskId);
+
+    List<RecruitProcessTask> 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<RecruitProcessTask>
     void updateReapply(String taskId);
 
     void updateUnBindHR(String taskId);
+
+    List<RecruitProcessTask> 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<RecruitProcessTas
         recruitProcessTaskMapper.updateUnBindHR(taskId);
     }
 
+    @Override
+    public List<RecruitProcessTask> 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}
     </update>
 
+    <select id="listAllPass" resultMap="BaseResultMap">
+        select * from recruit_process_task where status='approved'
+        <if test="postName != null and postName != ''">
+            and post_name like concat('%', #{postName}, '%')
+        </if>
+        <if test="applyDate != null">
+            and apply_date = #{applyDate}
+        </if>
+        <if test="deptId != null">
+            and dept_id = #{deptId}
+        </if>
+        <if test="status != null">
+            and status = #{status}
+        </if>
+        order by apply_date desc
+    </select>
 </mapper>