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-20 17:06:49 +08:00
parent 6d6bc517a7
commit 30581107f7
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,4 +28,6 @@ public class MessageReadListQuery implements Query {
@ApiModelProperty("发送人") @ApiModelProperty("发送人")
private String senderName; private String senderName;
@ApiModelProperty("移动端发起日期")
private String date;
} }

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

@@ -61,4 +61,6 @@ public class MessageReadListVo implements Vo {
//发起部门 //发起部门
private String dept; private String dept;
private String flowableName;
} }

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

@@ -384,14 +384,15 @@ public class MessageListService extends MybatisBaseService<MessageListMapper, Me
}else{//已阅 }else{//已阅
qw.eq("ml.state",1); qw.eq("ml.state",1);
} }
String createStartTime = messageReadListQuery.getCreateStartTime(); if(StringUtils.isNotBlank(messageReadListQuery.getDate())){
String createEndTime = messageReadListQuery.getCreateEndTime(); String[] s = messageReadListQuery.getDate().split("至");
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (m.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). String createStartTime = s[0];
apply(StringUtils.isNotEmpty(createEndTime), "date_format (m.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" String createEndTime = s[1];
); qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (m.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
if(){ apply(StringUtils.isNotEmpty(createEndTime), "date_format (m.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
} }
IPage<MessageReadListQuery> iPage = PagerUtil.queryToPage(pq); IPage<MessageReadListQuery> iPage = PagerUtil.queryToPage(pq);
IPage<MessageReadListVo> page = baseMapper.getAppReadListByUserSid(iPage, qw,messageReadListQuery.getNames()); IPage<MessageReadListVo> page = baseMapper.getAppReadListByUserSid(iPage, qw,messageReadListQuery.getNames());
PagerVo<MessageReadListVo> pagerVo = PagerUtil.pageToVo(page, null); PagerVo<MessageReadListVo> pagerVo = PagerUtil.pageToVo(page, null);