From 259f9264ee131ad7b2be815a55385de350293ac4 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 20 Aug 2021 10:40:54 +0800
Subject: [PATCH] 用户审查异常查询接口修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 35 ++++++++++++++++++++++-------------
src/main/java/org/springblade/modules/system/entity/User.java | 4 ++++
src/main/java/org/springblade/modules/system/vo/UserVO.java | 5 +++++
3 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/entity/User.java b/src/main/java/org/springblade/modules/system/entity/User.java
index c9b961c..bace1d3 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -18,10 +18,12 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
+import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -76,6 +78,8 @@
/**
* 生日
*/
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date birthday;
/**
* 性别
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 a44af74..1e2d4ab 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -144,38 +144,47 @@
ORDER BY id
</select>
- <select id="selectUserPages" resultMap="userResultMap">
- select * from blade_user where is_deleted = 0
+ <select id="selectUserPages" resultMap="userResultMaps">
+ select
+ bu.*,
+ TIMESTAMPDIFF(YEAR, bu.birthday, CURDATE()) age
+ from
+ blade_user bu
+ left join
+ sys_information si
+ on
+ si.departmentid = bu.dept_id
+ where is_deleted = 0
<if test="user.realName!=null and user.realName != ''">
- and real_name like concat(concat('%', #{user.realName}),'%')
+ and bu.real_name like concat(concat('%', #{user.realName}),'%')
</if>
<if test="user.deptId!=null and user.deptId != ''">
- and dept_id like concat(concat('%', #{user.deptId}),'%')
+ and bu.dept_id like concat(concat('%', #{user.deptId}),'%')
</if>
<if test="user.userType!=null and user.userType != ''">
- and user_type = #{user.userType}
+ and bu.user_type = #{user.userType}
</if>
<if test="user.nativeplace!=null and user.nativeplace != ''">
- and nativeplace = #{user.nativeplace}
+ and bu.nativeplace = #{user.nativeplace}
</if>
<if test="user.examinationType!=null and user.examinationType != ''">
- and examination_type = #{user.examinationType}
+ and bu.examination_type = #{user.examinationType}
</if>
<if test="user.sex!=null and user.sex != ''">
- and sex = #{user.sex}
+ and bu.sex = #{user.sex}
</if>
<if test="user.status!=null and user.status != ''">
- and status = #{user.status}
+ and bu.status = #{user.status}
</if>
<if test="user.hold!=null and user.hold != ''">
- and hold = #{user.hold}
+ and bu.hold = #{user.hold}
</if> <if test="user.jurisdiction!=null and user.jurisdiction != ''">
- and jurisdiction = #{user.jurisdiction}
+ and si.jurisdiction = #{user.jurisdiction}
</if>
<if test="user.securitynumber!=null and user.securitynumber != ''">
- and securitynumber = #{user.securitynumber}
+ and bu.securitynumber = #{user.securitynumber}
</if>
- ORDER BY id
+ ORDER BY bu.id
</select>
diff --git a/src/main/java/org/springblade/modules/system/vo/UserVO.java b/src/main/java/org/springblade/modules/system/vo/UserVO.java
index c0bd13a..1a56468 100644
--- a/src/main/java/org/springblade/modules/system/vo/UserVO.java
+++ b/src/main/java/org/springblade/modules/system/vo/UserVO.java
@@ -89,4 +89,9 @@
* 排序
*/
private String sort;
+
+ /**
+ * 排序
+ */
+ private Integer age;
}
--
Gitblit v1.9.3