From 6d5a7893cf2813f387f350f136ae104c8708faf1 Mon Sep 17 00:00:00 2001
From: liuxm <liuxm@fescotech.com>
Date: 星期四, 25 四月 2024 14:17:23 +0800
Subject: [PATCH] 修改用户,角色查询参数
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaUser.java | 4 ++--
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaRole.java | 4 ++--
pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml | 12 +++++++++---
pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml | 13 ++++++++-----
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/QueryVo.java | 2 ++
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/QueryVo.java | 2 +-
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/QueryVo.java | 2 ++
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java | 2 +-
8 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaRole.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaRole.java
index eb0a905..963d429 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaRole.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaRole.java
@@ -60,9 +60,9 @@
/**
* 鍒涘缓鏃堕棿
*/
- @TableField(value = "create_dt", fill = FieldFill.INSERT)
+ @TableField(value = "dt", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- public Date createDt;
+ public Date dt;
/**
* 鍓嶇web鐣岄潰鎻愪氦鐨勮鑹叉墍灞炴潈闄愮殑id锛屽叾鏄竴涓瓧绗︿覆鏁扮粍
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaUser.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaUser.java
index e843aa4..38751b5 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaUser.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoBa/BaUser.java
@@ -83,9 +83,9 @@
/**
* 鍒涘缓鏃堕棿
*/
- @TableField(value = "create_dt", fill = FieldFill.INSERT)
+ @TableField(value = "dt", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- public Date createDt;
+ public Date dt;
//////////////////////////////////////
// 浠ヤ笅涓嶆槸鏁版嵁搴撳疄浣撳睘鎬�
diff --git a/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
index b722404..f83630f 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
@@ -8,7 +8,7 @@
<result column="name" property="name" />
<result column="disabled" property="disabled" />
<result column="deleted" property="deleted" />
- <result column="create_dt" property="createDt" />
+ <result column="dt" property="dt" />
</resultMap>
<resultMap id="partResultMap" type="com.dy.pmsGlobal.pojoBa.BaRole">
<result column="id" property="id" />
@@ -21,12 +21,12 @@
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, `name`, disabled, deleted,create_dt
+ id, `name`, disabled, deleted,dt
</sql>
<sql id="Part_Column_List">
<!--@mbg.generated-->
- id, `name`, disabled,create_dt
+ id, `name`, disabled,dt
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="someResultMap">
@@ -147,6 +147,12 @@
<if test="name != null and name != ''">
r.name like concat('%', #{name}, '%') and
</if>
+ <if test="disable != null and disable != ''">
+ r.disable =#{disabled,jdbcType=BOOLEAN} and
+ </if>
+ <if test="dt != null and dt != ''">
+ DATE_FORMAT(r.dt, '%Y-%m-%d') = #{dt,jdbcType=TIMESTAMP} and
+ </if>
</trim>
order by id DESC
<trim prefix="limit " >
diff --git a/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
index 59beadf..199414c 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
@@ -11,7 +11,7 @@
<result column="supper_admin" property="supperAdmin" />
<result column="disabled" property="disabled" typeHandler="com.dy.common.mybatis.BooleanTypeHandler" />
<result column="deleted" property="deleted" typeHandler="com.dy.common.mybatis.BooleanTypeHandler" />
- <result column="create_dt" property="createDt" />
+ <result column="dt" property="dt" />
</resultMap>
<resultMap id="partResultMap" type="com.dy.pmsGlobal.pojoBa.BaUser">
<!--@mbg.generated-->
@@ -37,10 +37,10 @@
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, `name`, phone, `password`, supper_admin, disabled, deleted,create_dt
+ id, `name`, phone, `password`, supper_admin, disabled, deleted,dt
</sql>
<sql id="part_Column_List">
- ${alias}.id, ${alias}.name, ${alias}.phone, ${alias}.password, ${alias}.disabled,${alias}.create_dt
+ ${alias}.id, ${alias}.name, ${alias}.phone, ${alias}.password, ${alias}.disabled,${alias}.dt
</sql>
<sql id="Login_Column_List">
id, name, phone, supper_admin
@@ -99,10 +99,13 @@
bu.name like concat('%', #{name}, '%') and
</if>
<if test="phone != null and phone !=''">
- bu.phone = #{phone,jdbcType=VARCHAR}
+ bu.phone = #{phone,jdbcType=VARCHAR} and
</if>
<if test="roleId != null">
- ur.role_id=#{roleId,jdbcType=BIGINT}
+ ur.role_id=#{roleId,jdbcType=BIGINT} and
+ </if>
+ <if test="disabled != null">
+ bu.disabled=#{disabled,jdbcType=BOOLEAN}
</if>
</trim>
order by id DESC
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/QueryVo.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/QueryVo.java
index 8fab024..e44f76c 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/QueryVo.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/log/QueryVo.java
@@ -10,5 +10,5 @@
@AllArgsConstructor
@Builder
public class QueryVo extends QueryConditionVo {
- public String name;
+ public String userName;
}
\ No newline at end of file
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/QueryVo.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/QueryVo.java
index 53d38a0..1a707e1 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/QueryVo.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/role/QueryVo.java
@@ -11,4 +11,6 @@
@Builder
public class QueryVo extends QueryConditionVo {
public String name;
+ public boolean disable;
+ public String dt;
}
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/QueryVo.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/QueryVo.java
index f66b8e9..8e3a4ec 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/QueryVo.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/QueryVo.java
@@ -16,5 +16,7 @@
public String phone;
public Long roleId;
+
+ public Long disabled;
}
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java
index 0c8796c..88000f3 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java
@@ -207,7 +207,7 @@
}
}
} catch (Exception e) {
- log.error("淇濆瓨鐢ㄦ埛寮傚父", e);
+ log.error("淇敼瀵嗙爜寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
}
if (count <= 0) {
--
Gitblit v1.8.0