|
|
@@ -24,6 +24,10 @@
|
|
|
<result column="jpush_type_" property="jpushType"/>
|
|
|
</resultMap>
|
|
|
|
|
|
+ <resultMap type="com.ym.mec.biz.dal.dto.SysMessageDto" id="messageDto" extends="message">
|
|
|
+ <result column="username_" property="user.username"/>
|
|
|
+ </resultMap>
|
|
|
+
|
|
|
<resultMap type="com.ym.mec.biz.dal.dto.Mapper" id="Mapper">
|
|
|
<result column="key_" property="key"/>
|
|
|
<result column="value_" property="value"/>
|
|
|
@@ -32,31 +36,31 @@
|
|
|
<sql id="queryCondition">
|
|
|
<where>
|
|
|
<if test="jpushType != null and jpushType != ''">
|
|
|
- and (jpush_type_ = #{jpushType} OR jpush_type_ IS NULL)
|
|
|
+ and (m.jpush_type_ = #{jpushType} OR m.jpush_type_ IS NULL)
|
|
|
</if>
|
|
|
<if test="userId != null">
|
|
|
- and user_id_ = #{userId}
|
|
|
+ and m.user_id_ = #{userId}
|
|
|
</if>
|
|
|
<if test="receiver != null">
|
|
|
- and receiver_ like '%' #{receiver} '%'
|
|
|
+ and m.receiver_ like '%' #{receiver} '%'
|
|
|
</if>
|
|
|
<if test="status != null">
|
|
|
- and status_ = #{status,jdbcType=TINYINT}
|
|
|
+ and m.status_ = #{status,jdbcType=TINYINT}
|
|
|
</if>
|
|
|
<if test="readStatus != null">
|
|
|
- and read_status_ = #{readStatus,jdbcType=TINYINT}
|
|
|
+ and m.read_status_ = #{readStatus,jdbcType=TINYINT}
|
|
|
</if>
|
|
|
<if test="title != null">
|
|
|
- and title_ like '%' #{title} '%'
|
|
|
+ and m.title_ like '%' #{title} '%'
|
|
|
</if>
|
|
|
<if test="type != null">
|
|
|
- and type_ = #{type}
|
|
|
+ and m.type_ = #{type}
|
|
|
</if>
|
|
|
<if test="group != null">
|
|
|
- and group_ = #{group}
|
|
|
+ and m.group_ = #{group}
|
|
|
</if>
|
|
|
<if test="readStatus != null">
|
|
|
- and read_status_ = #{readStatus}
|
|
|
+ and m.read_status_ = #{readStatus}
|
|
|
</if>
|
|
|
</where>
|
|
|
</sql>
|
|
|
@@ -158,15 +162,22 @@
|
|
|
</update>
|
|
|
|
|
|
<select id="queryCount" parameterType="map" resultType="int">
|
|
|
- select count(*) from sys_message
|
|
|
+ select count(m.id_) from sys_message m
|
|
|
<include refid="queryCondition" />
|
|
|
- order by create_on_ desc
|
|
|
+ order by m.create_on_ desc
|
|
|
</select>
|
|
|
|
|
|
<select id="queryPage" parameterType="map" resultMap="message">
|
|
|
- select * from sys_message
|
|
|
+ select m.* from sys_message m
|
|
|
+ <include refid="queryCondition" />
|
|
|
+ order by m.create_on_ desc
|
|
|
+ <include refid="global.limit" />
|
|
|
+ </select>
|
|
|
+
|
|
|
+ <select id="queryListPage" parameterType="map" resultMap="messageDto">
|
|
|
+ select m.*,u.username_ from sys_message m left join sys_user u on m.user_id_ = u.id_
|
|
|
<include refid="queryCondition" />
|
|
|
- order by create_on_ desc
|
|
|
+ order by m.create_on_ desc
|
|
|
<include refid="global.limit" />
|
|
|
</select>
|
|
|
|
yonge