From b431c00a3e736e27599cd34793c65369fdb7b8cd Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 04 Jan 2024 15:50:50 +0800
Subject: [PATCH] 模拟成绩查询修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 79 ++++++++++++++++++++++++++++++---------
1 files changed, 60 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index 64daf61..6daee65 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -55,6 +55,7 @@
ifnull(TIMESTAMPDIFF(YEAR, SUBSTRING(bu.cardid, 7, 8), CURDATE()),0) AS age,
sll.longitude,sll.latitude,
bud.unit_name,
+ bud.permanent_residence_address as registered,
bd.dept_name
from
blade_user bu
@@ -103,6 +104,9 @@
</if>
<if test="user.roleId!=null and user.roleId != ''">
and bu.role_id = #{user.roleId}
+ </if>
+ <if test="user.auditStatus != null and user.auditStatus != ''">
+ and bu.audit_status = #{user.auditStatus}
</if>
<if test="user.roleAlias!=null and user.roleAlias != ''">
and br.role_alias = '保安'
@@ -288,6 +292,9 @@
<if test="user.userType!=null and user.userType != ''">
and bu.user_type = #{user.userType}
</if>
+ <if test="user.auditStatus != null and user.auditStatus != ''">
+ and bu.audit_status = #{user.auditStatus}
+ </if>
<if test="user.securitynumber!=null and user.securitynumber != ''">
and bu.securitynumber like concat('%', #{user.securitynumber},'%')
</if>
@@ -394,24 +401,31 @@
</select>
<select id="exportUser" resultType="org.springblade.modules.system.excel.UserExcel">
- SELECT id,
- tenant_id,
- user_type,
- account,
- name,
- real_name,
- email,
- phone,
- birthday,
- role_id,
- dept_id,
- post_id
- FROM blade_user ${ew.customSqlSegment}
+ SELECT
+ bu.id,
+ bd.dept_name AS deptId,
+ bu.real_name,
+ bu.phone,
+ bu.sex,
+ bu.cardid
+ FROM
+ blade_user bu
+ LEFT JOIN blade_dept bd ON bu.dept_id = bd.id
+ where bu.is_deleted = 0
+ <if test="obj.account != null and obj.account != ''">
+ AND bu.account LIKE CONCAT('%',#{obj.account},'%')
+ </if>
+ <if test="obj.realName != null and obj.realName != ''">
+ AND bu.real_name LIKE CONCAT('%',#{obj.realName},'%')
+ </if>
+ <if test="obj.deptId != null and obj.deptId != ''">
+ AND bu.dept_id = #{obj.deptId}
+ </if>
</select>
<!--通过 身份证号查询用户信息-->
<select id="getUserInfoByIdCardNo" resultType="org.springblade.modules.system.entity.User">
- SELECT id, name, real_name RealName,securitynumber
+ SELECT id, name, real_name RealName,securitynumber,dept_id
FROM blade_user
where 1=1
and is_deleted = 0
@@ -984,16 +998,17 @@
(id,
tenant_id,account,password,name,real_name,avatar,email,phone,sex,
role_id,dept_id,cardid,nativePlace,nation,fingerprint,education,
- politicaloutlook,healstats,height,address,registered,securitynumber,
- hold,jurisdiction,examination_type,status,is_deleted,dispatch,create_time,unit_name
+ politicaloutlook,healstats,height,securitynumber,
+ hold,jurisdiction,examination_type,status,is_deleted,dispatch,create_time
)
values
<foreach collection="list" item="user" separator=",">
- (#{user.id},
+ (
+ #{user.id},
#{user.tenantId},#{user.account},#{user.password},#{user.name},#{user.realName},#{user.avatar},#{user.email},#{user.phone},#{user.sex},
#{user.roleId},#{user.deptId},#{user.cardid},#{user.nativeplace},#{user.nation},#{user.fingerprint},#{user.education},
- #{user.politicaloutlook},#{user.healstats},#{user.height},#{user.address},#{user.registered},#{user.securitynumber},
- #{user.hold},#{user.jurisdiction},#{user.examinationType},#{user.status},#{user.isDeleted},#{user.dispatch},#{user.createTime},#{user.unitName}
+ #{user.politicaloutlook},#{user.healstats},#{user.height},#{user.securitynumber},
+ #{user.hold},#{user.jurisdiction},#{user.examinationType},#{user.status},#{user.isDeleted},#{user.dispatch},#{user.createTime}
)
</foreach>
</insert>
@@ -1123,6 +1138,15 @@
</choose>
</update>
+
+ <update id="batchAudit">
+ UPDATE BLADE_USER SET audit_status = #{auditStatus}
+ WHERE is_deleted = 0 and id in
+ <foreach collection="ids.split(',')" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </update>
+
<!--判断是否报名-->
<select id="getUserIsApply" resultType="org.springblade.modules.system.entity.User">
select bu.* from blade_user bu
@@ -1146,6 +1170,23 @@
and bu.role_id = '1412226235153731586'
and bud.id is null
</select>
+ <select id="getUserInfoDetail" resultType="org.springblade.modules.system.vo.UserInfoDetail">
+ SELECT * FROM BLADE_USER bu
+ LEFT JOIN BLADE_USER_DETAIL BUD on bud.user_id = bu.id and bud.is_deleted = 0
+ WHERE bu.is_deleted = 0 and bu.id = #{id}
+
+ </select>
+ <select id="getUserInfoByIdCardNoAndSecurityNumber"
+ resultType="org.springblade.modules.system.entity.User">
+
+ SELECT id, name, real_name RealName,securitynumber,dept_id
+ FROM blade_user
+ where 1=1
+ and is_deleted = 0
+ and status = 1
+ and cardid = #{cardid}
+ and securitynumber = #{securityNumber}
+ </select>
</mapper>
--
Gitblit v1.9.3