From e9c1bc2e789f6f9f8c52fbd10788ad5a0d1f841b Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 12 七月 2024 13:39:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/resources/mapper/UserMapper.xml | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index 9b07fdf..7ae6eba 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/src/main/resources/mapper/UserMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.jxkg.mapper.UserMapper">
- <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.User">
+ <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.entity.User">
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="user_uuid" jdbcType="VARCHAR" property="userUuid"/>
<result column="user_name" jdbcType="VARCHAR" property="userName"/>
@@ -20,11 +20,13 @@
<result column="last_active_time" jdbcType="TIMESTAMP" property="lastActiveTime"/>
<result column="deleted" jdbcType="BIT" property="deleted"/>
<result column="wx_open_id" jdbcType="VARCHAR" property="wxOpenId"/>
+ <result column="last_update_password_time" property="lastUpdatePasswordTime"/>
</resultMap>
<sql id="Base_Column_List">
id
, user_uuid, user_name, password, real_name, age, sex, birth_day, user_level, phone,
- role, status, image_path, create_time, modify_time, last_active_time, deleted, wx_open_id
+ role, status, image_path, create_time, modify_time, last_active_time, deleted, wx_open_id,
+ last_update_password_time
</sql>
@@ -92,7 +94,7 @@
</select>
- <select id="userPage" resultMap="BaseResultMap" parameterType="com.ycl.jxkg.vo.admin.user.UserPageRequestVO">
+ <select id="userPage" resultMap="BaseResultMap" parameterType="com.ycl.jxkg.domain.vo.admin.user.UserPageRequestVO">
SELECT
<include refid="Base_Column_List"/>
FROM t_user
@@ -108,27 +110,27 @@
</select>
- <insert id="insertUser" parameterType="com.ycl.jxkg.domain.User"
+ <insert id="insertUser" parameterType="com.ycl.jxkg.domain.entity.User"
useGeneratedKeys="true" keyProperty="id">
insert into t_user
- (user_uuid, user_name, password, real_name, age, last_active_time)
- values (#{userUuid,jdbcType=VARCHAR}, #{userName}, #{password}, #{realName}, #{age}, #{lastActiveTime})
+ (user_uuid, user_name, password, real_name, age, last_active_time, last_update_password_time)
+ values (#{userUuid,jdbcType=VARCHAR}, #{userName}, #{password}, #{realName}, #{age}, #{lastActiveTime}, #{lastUpdatePasswordTime})
</insert>
<insert id="insertUsers" parameterType="java.util.List"
useGeneratedKeys="true" keyProperty="id">
insert into t_user
- (user_uuid,user_name,password,real_name,age,last_active_time)
+ (user_uuid,user_name,password,real_name,age,last_active_time, last_update_password_time)
values
<foreach collection="list" item="item" index="index"
separator=",">
(#{item.userUuid},#{item.userName},#{item.password},#{item.realName},#{item.age},
- #{item.lastActiveTime})
+ #{item.lastActiveTime}, #{item.lastUpdatePasswordTime})
</foreach>
</insert>
- <update id="updateUser" parameterType="com.ycl.jxkg.domain.User">
+ <update id="updateUser" parameterType="com.ycl.jxkg.domain.entity.User">
update t_user
<set>
<if test="realName != null">real_name = #{realName},</if>
@@ -194,5 +196,16 @@
limit 1
</select>
+ <select id="classesStudent" resultType="com.ycl.jxkg.domain.vo.StudentVO">
+ SELECT tu.id,
+ tu.real_name,
+ tu.phone
+ FROM t_user tu
+ INNER JOIN t_classes_user tcu ON tu.id = tcu.user_id
+ WHERE tcu.classes_id = #{classesId}
+ and tcu.deleted = 0
+ ORDER BY tcu.create_time
+ </select>
+
</mapper>
--
Gitblit v1.8.0