other_project/message-center
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

待办已办

Browse Source
This commit is contained in:
dimengzhe
2023-04-17 17:40:39 +08:00
parent c53ffc7323
commit b9245ae04c
4 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
message-center-api/src/main/java/com/yxt/messagecenter/api/messagelist/app/MessageReadListQuery.java
View File

@@ -25,4 +25,7 @@ public class MessageReadListQuery implements Query {
private String createStartTime; private String createStartTime;
@ApiModelProperty("发起结束日期") @ApiModelProperty("发起结束日期")
private String createEndTime; private String createEndTime;
@ApiModelProperty("发送人")
private String senderName;
} }

2
message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListMapper.java
View File

@@ -85,7 +85,7 @@ public interface MessageListMapper extends BaseMapper<MessageList> {
AppLastMsgVo selectLastMsg(@Param("userSid") String userSid, @Param("msgTypeSid") String msgTypeSid); AppLastMsgVo selectLastMsg(@Param("userSid") String userSid, @Param("msgTypeSid") String msgTypeSid);
IPage<AppMessageListVo> getAppMsgListByUserSid(IPage<AppMessageListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<MessageList> qw); IPage<AppMessageListVo> getAppMsgListByUserSid(IPage<AppMessageListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<MessageList> qw);
IPage<MessageReadListVo> getAppReadListByUserSid(IPage<MessageReadListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<MessageList> qw); IPage<MessageReadListVo> getAppReadListByUserSid(IPage<MessageReadListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<MessageList> qw,@Param("name") String name);
int updateAppReadByType(@Param("msgTypeSid") String msgTypeSid, @Param("userSid") String userSid); int updateAppReadByType(@Param("msgTypeSid") String msgTypeSid, @Param("userSid") String userSid);

9
message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListMapper.xml
View File

@@ -246,6 +246,15 @@
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
and ml.rDelStatus = 0 and ml.rDelStatus = 0
<if test="name != null and name != ''">
and concat(IFNULL(m.msgTitle
, '')
, IFNULL(m.senderName
, '')
) LIKE concat('%'
, #{name}
, '%')
</if>
</where> </where>
ORDER BY ml.id DESC ORDER BY ml.id DESC
</select> </select>

9
message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListService.java
View File

@@ -376,16 +376,16 @@ public class MessageListService extends MybatisBaseService<MessageListMapper, Me
MessageReadListQuery messageReadListQuery = pq.getParams(); MessageReadListQuery messageReadListQuery = pq.getParams();
qw.eq("ml.receiverSid", pq.getParams().getUserSid()); qw.eq("ml.receiverSid", pq.getParams().getUserSid());
qw.eq("m.msgTypeSid","bc59c198-2d52-bb54-e4106aa38821a9ec");//阅读类 qw.eq("m.msgTypeSid","bc59c198-2d52-bb54-e4106aa38821a9ec");//阅读类
if(StringUtils.isNotBlank(messageReadListQuery.getNames())){ /*if(StringUtils.isNotBlank(messageReadListQuery.getNames())){
qw.like("m.msgTitle",messageReadListQuery.getNames()); qw.like("m.msgTitle",messageReadListQuery.getNames());
} }*/
if("0".equals(messageReadListQuery.getState())){//待阅 if("0".equals(messageReadListQuery.getState())){//待阅
qw.eq("ml.state",0); qw.eq("ml.state",0);
}else{//已阅 }else{//已阅
qw.eq("ml.state",1); qw.eq("ml.state",1);
} }
IPage<MessageReadListQuery> iPage = PagerUtil.queryToPage(pq); IPage<MessageReadListQuery> iPage = PagerUtil.queryToPage(pq);
IPage<MessageReadListVo> page = baseMapper.getAppReadListByUserSid(iPage, qw); IPage<MessageReadListVo> page = baseMapper.getAppReadListByUserSid(iPage, qw,messageReadListQuery.getNames());
PagerVo<MessageReadListVo> pagerVo = PagerUtil.pageToVo(page, null); PagerVo<MessageReadListVo> pagerVo = PagerUtil.pageToVo(page, null);
//定义的app的sid的index集合 //定义的app的sid的index集合
Map<String, List<Integer>> appVer = new HashMap<>(); Map<String, List<Integer>> appVer = new HashMap<>();
@@ -449,6 +449,9 @@ public class MessageListService extends MybatisBaseService<MessageListMapper, Me
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (m.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (m.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(createEndTime), "date_format (m.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" apply(StringUtils.isNotEmpty(createEndTime), "date_format (m.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
); );
if(StringUtils.isNotBlank(messageReadListQuery.getSenderName())){
qw.like("m.senderName",messageReadListQuery.getSenderName());
}
IPage<MessageReadListQuery> iPage = PagerUtil.queryToPage(pq); IPage<MessageReadListQuery> iPage = PagerUtil.queryToPage(pq);
IPage<MessageReadListPCVo> page = baseMapper.todoAllReadList(iPage, qw); IPage<MessageReadListPCVo> page = baseMapper.todoAllReadList(iPage, qw);
PagerVo<MessageReadListPCVo> pagerVo = PagerUtil.pageToVo(page, null); PagerVo<MessageReadListPCVo> pagerVo = PagerUtil.pageToVo(page, null);