From 8853292babb2ad94de4a3207966f1e83b767cd2d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sun, 17 Sep 2023 16:38:34 +0800
Subject: [PATCH] 新增流程节点进程查询接口
---
src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml | 70 ++++++++++++++++++++++++++---------
1 files changed, 52 insertions(+), 18 deletions(-)
diff --git a/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml b/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
index f6f405e..6454882 100644
--- a/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
+++ b/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
@@ -41,8 +41,15 @@
<if test="apply.examinationType!=null and apply.examinationType!=''">
and sa.examination_type = #{apply.examinationType}
</if>
- <if test="apply.applyStatus!=null">
- and sa.exam_id is null
+ <if test="apply.deptId!=null and apply.deptId!=''">
+ and bu.dept_id = #{apply.deptId}
+ </if>
+ <if test="apply.applyStatus==2">
+ and exam_id is null
+ </if>
+ <if test="apply.applyStatus==4">
+ and sa.apply_status = 4
+ and bu.is_apply = 2
</if>
<if test="apply.applyExamType!=null">
and apply_exam_type = #{apply.applyExamType}
@@ -219,22 +226,57 @@
</select>
<!--查询报名人员未关联考试的ids集合-->
- <select id="getApplyIds" resultType="java.lang.Long">
+ <select id="getApplyIds" resultType="org.springblade.modules.apply.entity.Apply">
SELECT
- sa.id
+ sa.id,sa.exam_id
FROM
sys_apply sa
+ left join
+ ksxt_exam ke
+ on
+ sa.exam_id = ke.id
left join
blade_user bu
on
sa.user_id = bu.id
+ left join
+ blade_dept bd
+ on
+ bd.id = bu.dept_id
WHERE
1=1
and is_exam = 1
and sa.apply_status = 2
and bu.is_apply = 1
- and sa.exam_id is null
- limit 0,#{number}
+ <if test="apply.realName!=null and apply.realName!=''">
+ and bu.real_name like concat('%', #{apply.realName},'%')
+ </if>
+ <if test="apply.deptName!=null and apply.deptName!=''">
+ and bd.dept_name like concat('%', #{apply.deptName},'%')
+ </if>
+ <if test="apply.userId!=null and apply.userId!=''">
+ and sa.user_id like concat('%', #{apply.userId},'%')
+ </if>
+ <if test="apply.examinationType!=null and apply.examinationType!=''">
+ and sa.examination_type = #{apply.examinationType}
+ </if>
+ <if test="apply.deptId!=null and apply.deptId!=''">
+ and bu.dept_id = #{apply.deptId}
+ </if>
+ <if test="apply.applyStatus==2">
+ and exam_id is null
+ </if>
+ <if test="apply.applyStatus==4">
+ and sa.apply_status = 4
+ and bu.is_apply = 2
+ </if>
+ <if test="apply.applyExamType!=null">
+ and apply_exam_type = #{apply.applyExamType}
+ </if>
+ <if test="apply.examId!=null">
+ and sa.exam_id = #{apply.examId}
+ </if>
+ limit #{apply.serialStart},#{apply.serialEnd}
</select>
<!--查询考试人数-->
@@ -249,10 +291,8 @@
sa.user_id = bu.id
WHERE
1=1
- and is_exam = 1
and sa.apply_status = 2
- and bu.is_apply = 1
- and sa.exam_id is not null
+ and sa.exam_id = #{id}
</select>
<!-- 查询培训考试人数-->
@@ -267,10 +307,8 @@
sr.user_id = bu.id
WHERE
1=1
- and is_exam = 1
and sr.cancel = 1
- and bu.is_train = 1
- and sr.train_exam_id is not null
+ and sr.train_exam_id = #{id}
</select>
<!--查询已报名的的人信息集合-->
@@ -296,10 +334,8 @@
bd.id = bu.dept_id
WHERE
1=1
- and is_exam = 1
and sa.apply_status = 2
- and bu.is_apply = 1
- and sa.exam_id is not null
+ and sa.exam_id = #{id}
</select>
<!--查询已培训报名的的人信息集合-->
@@ -325,10 +361,8 @@
bd.id = bu.dept_id
WHERE
1=1
- and is_exam = 1
and sr.cancel = 1
- and bu.is_train = 1
- and sr.train_exam_id is not null
+ and sr.train_exam_id = #{id}
</select>
--
Gitblit v1.9.3