From aa925d851857f50eff0556411366690d9a78a0e5 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 27 十一月 2023 17:30:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-account/src/main/resources/mapper/TStudentMapper.xml | 49 +++++++++++++++++++++++--------------------------
1 files changed, 23 insertions(+), 26 deletions(-)
diff --git a/cloud-server-account/src/main/resources/mapper/TStudentMapper.xml b/cloud-server-account/src/main/resources/mapper/TStudentMapper.xml
index f8b53aa..078ea64 100644
--- a/cloud-server-account/src/main/resources/mapper/TStudentMapper.xml
+++ b/cloud-server-account/src/main/resources/mapper/TStudentMapper.xml
@@ -4,21 +4,21 @@
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.dsh.account.dto.TStudentDto">
- <id column="id" property="id" />
- <result column="appUserId" property="appUserId" />
- <result column="name" property="name" />
- <result column="phone" property="phone" />
- <result column="birthday" property="birthday" />
- <result column="sex" property="sex" />
- <result column="height" property="height" />
- <result column="weight" property="weight" />
- <result column="bmi" property="bmi" />
- <result column="idCard" property="idCard" />
- <result column="lateralSurface" property="lateralSurface" />
- <result column="state" property="state" />
- <result column="insertTime" property="insertTime" />
- <result column="headImg" property="headImg" />
- <result column="isDefault" property="isDefault" />
+ <id column="id" property="id"/>
+ <result column="appUserId" property="appUserId"/>
+ <result column="name" property="name"/>
+ <result column="phone" property="phone"/>
+ <result column="birthday" property="birthday"/>
+ <result column="sex" property="sex"/>
+ <result column="height" property="height"/>
+ <result column="weight" property="weight"/>
+ <result column="bmi" property="bmi"/>
+ <result column="idCard" property="idCard"/>
+ <result column="lateralSurface" property="lateralSurface"/>
+ <result column="state" property="state"/>
+ <result column="insertTime" property="insertTime"/>
+ <result column="headImg" property="headImg"/>
+ <result column="isDefault" property="isDefault"/>
</resultMap>
<insert id="createHistory">
@@ -43,18 +43,19 @@
and o.city = #{item.city}
</if>
<if test="item.name != null and item.name != ''">
- and o.name LIKE CONCAT('%',#{item.name},'%')
+ and o.name LIKE CONCAT('%',#{item.name},'%')
</if>
<if test="item.userName != null and item.userName != ''">
- and o.userName LIKE CONCAT('%',#{item.userName},'%')
+ and o.userName LIKE CONCAT('%',#{item.userName},'%')
</if>
<if test="item.phone != null and item.phone != ''">
- and o.phone LIKE CONCAT('%',#{item.phone},'%')
+ and o.phone LIKE CONCAT('%',#{item.phone},'%')
</if>
<if test="item.ids != null and item.ids.size >0 ">
- and o.appUserId in <foreach collection="item.ids" separator="," open="(" item="id" close=")">
- #{id}
- </foreach>
+ and o.appUserId in
+ <foreach collection="item.ids" separator="," open="(" item="id" close=")">
+ #{id}
+ </foreach>
</if>
</where>
@@ -76,7 +77,6 @@
</select>
-
<select id="getGiftSelect" resultType="java.lang.Integer">
SELECT appUserId FROM t_student
WHERE name = #{giftSearchDto.name}
@@ -86,13 +86,10 @@
<select id="queryCom" resultType="java.util.Map">
SELECT
- es.id as id ,tc.name,es.content,es.insertTime,es.imgs as images
+ es.id as id ,es.coachId,es.content,es.insertTime,es.imgs as images
FROM
t_evaluate_student es
-
- left JOIN t_student ts on es.studentId = ts.id
- LEFT JOIN t_coach tc on es.coachId = tc.id
where es.studentId = #{id}
--
Gitblit v1.7.1