From 247cb86585a1d1894596ed18a6c93efecb992946 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期四, 14 十一月 2024 10:34:27 +0800
Subject: [PATCH] 班级成绩图表分析

---
 src/main/resources/mapper/UserMapper.xml |   38 +++++++++++++++++++++++++++-----------
 1 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index 9b07fdf..c4bb36b 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,14 +94,14 @@
     </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
         <where>
             and deleted=0
-            <if test="userName != null and userName != ''">
-                and user_name like concat('%',#{userName},'%')
+            <if test="realName != null and realName != ''">
+                and real_name like concat('%',#{realName},'%')
             </if>
             <if test="role != null ">
                 and role= #{role}
@@ -108,31 +110,34 @@
     </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>
             <if test="age != null">age = #{age},</if>
+            <if test="sex != null">sex = #{sex},</if>
+            <if test="phone != null and phone !='' ">phone = #{phone},</if>
+            <if test="birthDay != null ">birth_day = #{birthDay},</if>
             <if test="lastActiveTime != null">last_active_time = #{lastActiveTime},</if>
         </set>
         where id = #{id}
@@ -194,5 +199,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 AND tcu.teacher = 0
+        WHERE tcu.classes_id = #{classesId}
+        AND tcu.deleted = 0 AND tu.deleted = 0
+        ORDER BY tcu.create_time
+    </select>
+
 
 </mapper>

--
Gitblit v1.8.0