From 7293f04d18fb2e882e152f962c3aa1d8fcb1f93e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 17 Nov 2021 15:46:35 +0800
Subject: [PATCH] 证书打印信息导出修改
---
src/main/java/org/springblade/modules/accreditation/mapper/AccreditationRecordsMapper.xml | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 113 insertions(+), 7 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 e8db204..317e9c1 100644
--- a/src/main/java/org/springblade/modules/accreditation/mapper/AccreditationRecordsMapper.xml
+++ b/src/main/java/org/springblade/modules/accreditation/mapper/AccreditationRecordsMapper.xml
@@ -8,7 +8,8 @@
sar.*,
bt.dept_name AS deptName,
bu.real_name realName,
- bu.sex,bu.cardid idCardNo,
+ IF(mod(SUBSTR(bu.cardid,17,1),2),1,2) sex,
+ bu.cardid idCardNo,
bu.securitynumber securityNumber,
bu.avatar,
ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING( bu.cardid,7,4),0) age,
@@ -73,6 +74,9 @@
<if test="accreditationRecords.deptId!=null">
and bt.id = #{accreditationRecords.deptId}
</if>
+ <if test="accreditationRecords.userType!=null">
+ and bu.user_type = #{accreditationRecords.userType}
+ </if>
<if test="accreditationRecords.type!=null">
and sar.type = #{accreditationRecords.type}
</if>
@@ -91,7 +95,6 @@
<if test="accreditationRecords.endTime!=null and accreditationRecords.endTime!='' and accreditationRecords.endTime!='undefined'">
and sar.create_time <= #{accreditationRecords.endTime}
</if>
- order by sar.create_time desc
</select>
<!--自定义详情信息-->
@@ -100,7 +103,8 @@
sar.*,
bt.dept_name AS deptName,
bu.real_name realName,
- bu.sex,bu.cardid idCardNo,
+ IF(mod(SUBSTR(bu.cardid,17,1),2),1,2) sex,
+ bu.cardid idCardNo,
bu.securitynumber securityNumber,
bu.avatar,
ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING( bu.cardid,7,4),0) age
@@ -126,7 +130,8 @@
sar.*,
bt.dept_name AS deptName,
bu.real_name realName,
- bu.sex,bu.cardid idCardNo,
+ IF(mod(SUBSTR(bu.cardid,17,1),2),1,2) sex,
+ bu.cardid idCardNo,
bu.securitynumber securityNumber,
bu.avatar,
ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING( bu.cardid,7,4),0) age
@@ -172,6 +177,9 @@
<if test="accreditationRecords.securityNumber!=null and accreditationRecords.securityNumber!=''">
and bu.securitynumber like concat('%', #{accreditationRecords.securityNumber},'%')
</if>
+ <if test="accreditationRecords.userType!=null">
+ and bu.user_type = #{accreditationRecords.userType}
+ </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>
@@ -202,7 +210,6 @@
<if test="accreditationRecords.endTime!=null and accreditationRecords.endTime!='' and accreditationRecords.endTime!='undefined'">
and sar.create_time <= #{accreditationRecords.endTime}
</if>
- order by sar.create_time desc
</select>
@@ -210,7 +217,8 @@
<select id="exportSecurityBookPaper" resultType="org.springblade.modules.accreditation.excel.ExportSecurityBookPaperExcel">
SELECT
bu.real_name realName,
- bu.sex,bu.cardid idCardNo,
+ IF(mod(SUBSTR(bu.cardid,17,1),2),1,2) sex,
+ bu.cardid idCardNo,
bt.dept_name AS deptName,
bu.securitynumber securityNumber,
bu1.real_name applyName,
@@ -271,6 +279,9 @@
<if test="accreditationRecords.status!=null">
and sar.status = #{accreditationRecords.status}
</if>
+ <if test="accreditationRecords.userType!=null">
+ and bu.user_type = #{accreditationRecords.userType}
+ </if>
<if test="accreditationRecords.createUser!=null">
and sar.create_user = #{accreditationRecords.createUser}
</if>
@@ -295,6 +306,101 @@
<if test="accreditationRecords.endTime!=null and accreditationRecords.endTime!='' and accreditationRecords.endTime!='undefined'">
and sar.create_time <= #{accreditationRecords.endTime}
</if>
- order by sar.create_time desc
+ </select>
+
+
+ <!--导出证书制证信息(包含照片)-->
+ <select id="exportSecurityBookPapers" resultType="org.springblade.modules.accreditation.vo.AccreditationRecordsVo">
+ SELECT
+ sar.*,
+ bt.dept_name AS deptName,
+ bu.real_name realName,
+ IF(mod(SUBSTR(bu.cardid,17,1),2),1,2) sex,
+ bu.cardid idCardNo,
+ bu.securitynumber securityNumber,
+ bu.avatar,
+ 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
+ <if test="accreditationRecords.deptName!=null and accreditationRecords.deptName!=''">
+ and bt.dept_name like concat('%', #{accreditationRecords.deptName},'%')
+ </if>
+ <if test="accreditationRecords.realName!=null and accreditationRecords.realName!=''">
+ and bu.real_name like concat('%', #{accreditationRecords.realName},'%')
+ </if>
+ <if test="accreditationRecords.idCardNo!=null and accreditationRecords.idCardNo!=''">
+ and bu.cardid like concat('%', #{accreditationRecords.idCardNo},'%')
+ </if>
+ <if test="accreditationRecords.applyUnit!=null and accreditationRecords.applyUnit!=''">
+ and bt1.dept_name like concat('%', #{accreditationRecords.applyUnit},'%')
+ </if>
+ <if test="accreditationRecords.securityNumber!=null and accreditationRecords.securityNumber!=''">
+ and bu.securitynumber like concat('%', #{accreditationRecords.securityNumber},'%')
+ </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>
+ <if test="accreditationRecords.status!=null">
+ and sar.status = #{accreditationRecords.status}
+ </if>
+ <if test="accreditationRecords.createUser!=null">
+ and sar.create_user = #{accreditationRecords.createUser}
+ </if>
+ <if test="accreditationRecords.deptId!=null">
+ and bt.id = #{accreditationRecords.deptId}
+ </if>
+ <if test="accreditationRecords.userType!=null">
+ and bu.user_type = #{accreditationRecords.userType}
+ </if>
+ <if test="accreditationRecords.type!=null">
+ and sar.type = #{accreditationRecords.type}
+ </if>
+ <if test="accreditationRecords.auditStatus!=null">
+ and sar.audit_status = #{accreditationRecords.auditStatus}
+ </if>
+ <if test="accreditationRecords.isAvatar==1">
+ and bu.avatar is not null and bu.avatar!=""
+ </if>
+ <if test="accreditationRecords.isAvatar==2">
+ and (bu.avatar is null or bu.avatar="")
+ </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>
</select>
</mapper>
--
Gitblit v1.9.3