From 934b32c0af147ef324736c835e0e877962e893fe Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 19 Dec 2023 11:47:09 +0800
Subject: [PATCH] 审批功能
---
src/main/java/org/springblade/modules/accreditation/mapper/AccreditationRecordsMapper.xml | 73 ++++++++++++++++++++----------------
1 files changed, 40 insertions(+), 33 deletions(-)
diff --git a/src/main/java/org/springblade/modules/accreditation/mapper/AccreditationRecordsMapper.xml b/src/main/java/org/springblade/modules/accreditation/mapper/AccreditationRecordsMapper.xml
index 1400c89..77c4a7c 100644
--- a/src/main/java/org/springblade/modules/accreditation/mapper/AccreditationRecordsMapper.xml
+++ b/src/main/java/org/springblade/modules/accreditation/mapper/AccreditationRecordsMapper.xml
@@ -15,7 +15,6 @@
ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING( bu.cardid,7,4),0) age,
bu1.real_name applyName,
bt1.dept_name applyUnit,
- bu.registered,
bu.user_type userType
FROM
sys_accreditation_records sar
@@ -45,6 +44,8 @@
sj.id = si.jurisdiction
WHERE
1=1
+ and bu.status = 1
+ and bu.is_deleted = 0
<if test="accreditationRecords.deptName!=null and accreditationRecords.deptName!=''">
and bt.dept_name like concat('%', #{accreditationRecords.deptName},'%')
</if>
@@ -63,7 +64,10 @@
<if test="accreditationRecords.jurisdiction!=null and accreditationRecords.jurisdiction!='' and accreditationRecords.jurisdiction!='1372091709474910209'">
and (sj.id = #{accreditationRecords.jurisdiction} or sj.parent_id = #{accreditationRecords.jurisdiction})
</if>
- <if test="accreditationRecords.status!=null">
+ <if test="accreditationRecords.status==1">
+ and sar.status = #{accreditationRecords.status}
+ </if>
+ <if test="accreditationRecords.status==2">
and sar.status = #{accreditationRecords.status}
</if>
<if test="accreditationRecords.createUser!=null">
@@ -93,6 +97,7 @@
<if test="accreditationRecords.endTime!=null and accreditationRecords.endTime!='' and accreditationRecords.endTime!='undefined'">
and sar.create_time <= #{accreditationRecords.endTime}
</if>
+ order by sar.id desc
</select>
<!--自定义详情信息-->
@@ -122,7 +127,7 @@
</select>
- <!--导出保安员证信息-->
+ <!--导出保安员证信息(上岗证)-->
<select id="exportSecurityPaperList" resultType="org.springblade.modules.accreditation.vo.AccreditationRecordsVo">
SELECT
sar.*,
@@ -172,6 +177,12 @@
<if test="accreditationRecords.idCardNo!=null and accreditationRecords.idCardNo!=''">
and bu.cardid like concat('%', #{accreditationRecords.idCardNo},'%')
</if>
+ <if test="accreditationRecords.status==1">
+ and sar.status = #{accreditationRecords.status}
+ </if>
+ <if test="accreditationRecords.status==2">
+ and sar.status = #{accreditationRecords.status}
+ </if>
<if test="accreditationRecords.securityNumber!=null and accreditationRecords.securityNumber!=''">
and bu.securitynumber like concat('%', #{accreditationRecords.securityNumber},'%')
</if>
@@ -202,12 +213,16 @@
<if test="accreditationRecords.isAvatar==2">
and (bu.avatar is null or bu.avatar="")
</if>
+ <if test="accreditationRecords.auditStatus!=null">
+ and sar.audit_status = #{accreditationRecords.auditStatus}
+ </if>
<if test="accreditationRecords.startTime!=null and accreditationRecords.startTime!='' and accreditationRecords.startTime!='undefined'">
and sar.create_time >= #{accreditationRecords.startTime}
</if>
<if test="accreditationRecords.endTime!=null and accreditationRecords.endTime!='' and accreditationRecords.endTime!='undefined'">
and sar.create_time <= #{accreditationRecords.endTime}
</if>
+ order by sar.id desc
</select>
@@ -271,6 +286,12 @@
<if test="accreditationRecords.securityNumber!=null and accreditationRecords.securityNumber!=''">
and bu.securitynumber like concat('%', #{accreditationRecords.securityNumber},'%')
</if>
+ <if test="accreditationRecords.status==1">
+ and sar.status = #{accreditationRecords.status}
+ </if>
+ <if test="accreditationRecords.status==2">
+ and sar.status = #{accreditationRecords.status}
+ </if>
<if test="accreditationRecords.jurisdiction!=null and accreditationRecords.jurisdiction!='' and accreditationRecords.jurisdiction!='1372091709474910209'">
and (sj.id = #{accreditationRecords.jurisdiction} or sj.parent_id = #{accreditationRecords.jurisdiction})
</if>
@@ -304,6 +325,7 @@
<if test="accreditationRecords.endTime!=null and accreditationRecords.endTime!='' and accreditationRecords.endTime!='undefined'">
and sar.create_time <= #{accreditationRecords.endTime}
</if>
+ order by sar.id desc
</select>
@@ -320,38 +342,16 @@
ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING( bu.cardid,7,4),0) age,
bu1.real_name applyName,
bt1.dept_name applyUnit,
- bu.registered,
bu.user_type userType
FROM
sys_accreditation_records sar
- left join
- blade_user bu
- on
- sar.user_id = bu.id
- LEFT JOIN
- blade_dept bt
- ON
- bu.dept_id = bt.id
- left join
- blade_user bu1
- on
- sar.create_user = bu1.id
- LEFT JOIN
- blade_dept bt1
- ON
- bu1.dept_id = bt1.id
- left join
- sys_information si
- on
- bt.id = si.departmentid
- left join
- sys_jurisdiction sj
- on
- sj.id = si.jurisdiction
- WHERE
- 1=1
- and bu.status = 1
- and bu.is_deleted = 0
+ left join blade_user bu on sar.user_id = bu.id
+ LEFT JOIN blade_dept bt ON bu.dept_id = bt.id
+ left join blade_user bu1 on sar.create_user = bu1.id
+ LEFT JOIN blade_dept bt1 ON bu1.dept_id = bt1.id
+ left join sys_information si on bt.id = si.departmentid
+ left join sys_jurisdiction sj on sj.id = si.jurisdiction
+ WHERE 1=1 and bu.status = 1 and bu.is_deleted = 0
<if test="accreditationRecords.deptName!=null and accreditationRecords.deptName!=''">
and bt.dept_name like concat('%', #{accreditationRecords.deptName},'%')
</if>
@@ -373,6 +373,12 @@
<if test="accreditationRecords.status!=null">
and sar.status = #{accreditationRecords.status}
</if>
+ <if test="accreditationRecords.status==1">
+ and sar.status = #{accreditationRecords.status}
+ </if>
+ <if test="accreditationRecords.status==2">
+ and sar.status = #{accreditationRecords.status}
+ </if>
<if test="accreditationRecords.createUser!=null">
and sar.create_user = #{accreditationRecords.createUser}
</if>
@@ -400,6 +406,7 @@
<if test="accreditationRecords.endTime!=null and accreditationRecords.endTime!='' and accreditationRecords.endTime!='undefined'">
and sar.create_time <= #{accreditationRecords.endTime}
</if>
+ order by sar.id desc
</select>
<!--根据用户 id 查询上岗证申请记录-->
@@ -410,6 +417,6 @@
<!--根据用户 id 查询当前人员是否有待审核和审核通过的记录数-->
<select id="getAccreditationRecordsByUserIdAuditCount" resultType="java.lang.Integer">
- select count(*) from sys_accreditation_records where (audit_status = 1 or audit_status = 3) and user_id = #{userId} and type = 2
+ select count(*) from sys_accreditation_records where (audit_status = 1 or audit_status = 2) and user_id = #{userId} and type = #{type}
</select>
</mapper>
--
Gitblit v1.9.3