修改
This commit is contained in:
@@ -80,6 +80,7 @@ public interface MessageListMapper extends BaseMapper<MessageList> {
|
|||||||
Integer fetchByReceiverSid(String receiverSid);
|
Integer fetchByReceiverSid(String receiverSid);
|
||||||
|
|
||||||
int selectUnReadCount(@Param("msgTypeSid") String msgTypeSid, @Param("userSid") String userSid);
|
int selectUnReadCount(@Param("msgTypeSid") String msgTypeSid, @Param("userSid") String userSid);
|
||||||
|
int selectUnReadCount1(@Param("msgTypeSid") String msgTypeSid, @Param("userSid") String userSid);
|
||||||
|
|
||||||
AppLastMsgVo selectLastMsg(@Param("userSid") String userSid, @Param("msgTypeSid") String msgTypeSid);
|
AppLastMsgVo selectLastMsg(@Param("userSid") String userSid, @Param("msgTypeSid") String msgTypeSid);
|
||||||
|
|
||||||
|
|||||||
@@ -165,6 +165,19 @@
|
|||||||
AND mt.sid = #{msgTypeSid}
|
AND mt.sid = #{msgTypeSid}
|
||||||
</if>
|
</if>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<select id="selectUnReadCount1" resultType="int">
|
||||||
|
SELECT COUNT(1)
|
||||||
|
FROM message_list ml
|
||||||
|
LEFT JOIN message m ON ml.msgSid = m.sid
|
||||||
|
LEFT JOIN message_type mt ON m.msgTypeSid = mt.sid
|
||||||
|
WHERE mt.identifier = '0003'
|
||||||
|
AND ml.state = '0'
|
||||||
|
AND ml.receiverSid = #{userSid}
|
||||||
|
<if test="msgTypeSid != null and msgTypeSid != ''">
|
||||||
|
AND mt.sid = #{msgTypeSid}
|
||||||
|
</if>
|
||||||
|
</select>
|
||||||
<!--查询最近消息-->
|
<!--查询最近消息-->
|
||||||
<select id="selectLastMsg" resultType="com.yxt.messagecenter.api.messagelist.app.AppLastMsgVo">
|
<select id="selectLastMsg" resultType="com.yxt.messagecenter.api.messagelist.app.AppLastMsgVo">
|
||||||
SELECT DATE_FORMAT(ml.createTime, '%Y-%m-%d') as sendTime,
|
SELECT DATE_FORMAT(ml.createTime, '%Y-%m-%d') as sendTime,
|
||||||
@@ -222,11 +235,11 @@
|
|||||||
m.msgTitle,
|
m.msgTitle,
|
||||||
m.msgContent,
|
m.msgContent,
|
||||||
ml.state,
|
ml.state,
|
||||||
DATE_FORMAT(ml.createTime, '%Y-%m-%d %H:%i') as sendTime,
|
DATE_FORMAT(ml.createTime, '%Y-%m-%d %H:%m:%s') as sendTime,
|
||||||
m.msgTargetUri as moduleAction,
|
m.msgTargetUri as moduleAction,
|
||||||
m.senderName,
|
m.senderName,
|
||||||
m.msgSource,
|
m.msgSource,
|
||||||
DATE_FORMAT(ml.modifyTime, '%Y-%m-%d %H:%i') as redTime
|
DATE_FORMAT(ml.modifyTime, '%Y-%m-%d %H:%m:%s') as redTime
|
||||||
FROM message_list ml
|
FROM message_list ml
|
||||||
LEFT JOIN message m ON ml.msgSid = m.sid
|
LEFT JOIN message m ON ml.msgSid = m.sid
|
||||||
<where>
|
<where>
|
||||||
|
|||||||
@@ -192,7 +192,7 @@ public class MessageListRest implements MessageListFeign {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ResultBean<Integer> selectUnReadCount(String msgTypeSid, String userSid) {
|
public ResultBean<Integer> selectUnReadCount(String msgTypeSid, String userSid) {
|
||||||
return new ResultBean<Integer>().success().setData(messageListService.selectUnReadCount(msgTypeSid, userSid));
|
return new ResultBean<Integer>().success().setData(messageListService.selectUnReadCount1(msgTypeSid, userSid));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -250,6 +250,10 @@ public class MessageListService extends MybatisBaseService<MessageListMapper, Me
|
|||||||
return baseMapper.selectUnReadCount(msgTypeSid, userSid);
|
return baseMapper.selectUnReadCount(msgTypeSid, userSid);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Integer selectUnReadCount1(String msgTypeSid, String userSid) {
|
||||||
|
return baseMapper.selectUnReadCount1(msgTypeSid, userSid);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 手机端查询消息主页面
|
* 手机端查询消息主页面
|
||||||
*
|
*
|
||||||
|
|||||||
Reference in New Issue
Block a user