From d910a3e7ad5bc3a5e5443f506d05bbb9e83a4c8e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 31 十月 2024 17:14:33 +0800
Subject: [PATCH] 生成试卷时如果题目列表为空，则不反悔这个题型的数据
---
src/main/resources/mapper/UserMapper.xml | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index d3ee58e..c4bb36b 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/src/main/resources/mapper/UserMapper.xml
@@ -20,14 +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="need_update_password" property="needUpdatePassword" typeHandler="com.baomidou.mybatisplus.core.handlers.MybatisEnumTypeHandler"/>
<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,
- need_update_password, last_update_password_time
+ last_update_password_time
</sql>
@@ -101,8 +100,8 @@
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}
@@ -114,19 +113,19 @@
<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>
@@ -136,6 +135,9 @@
<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}
@@ -202,10 +204,11 @@
tu.real_name,
tu.phone
FROM t_user tu
- INNER JOIN t_classes_user tcu ON tu.id = tcu.user_id
+ 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 tcu.deleted = 0 AND tu.deleted = 0
ORDER BY tcu.create_time
</select>
+
</mapper>
--
Gitblit v1.8.0