diff --git a/message-center-api/src/main/java/com/yxt/messagecenter/api/messagelist/app/MessageReadListQuery.java b/message-center-api/src/main/java/com/yxt/messagecenter/api/messagelist/app/MessageReadListQuery.java index 91c7fba..7758ac1 100644 --- a/message-center-api/src/main/java/com/yxt/messagecenter/api/messagelist/app/MessageReadListQuery.java +++ b/message-center-api/src/main/java/com/yxt/messagecenter/api/messagelist/app/MessageReadListQuery.java @@ -28,4 +28,6 @@ public class MessageReadListQuery implements Query { @ApiModelProperty("发送人") private String senderName; + @ApiModelProperty("移动端发起日期") + private String date; } diff --git a/message-center-api/src/main/java/com/yxt/messagecenter/api/messagelist/app/MessageReadListVo.java b/message-center-api/src/main/java/com/yxt/messagecenter/api/messagelist/app/MessageReadListVo.java index 57987cf..076cc18 100644 --- a/message-center-api/src/main/java/com/yxt/messagecenter/api/messagelist/app/MessageReadListVo.java +++ b/message-center-api/src/main/java/com/yxt/messagecenter/api/messagelist/app/MessageReadListVo.java @@ -61,4 +61,6 @@ public class MessageReadListVo implements Vo { //发起部门 private String dept; + private String flowableName; + } diff --git a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListService.java b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListService.java index eb8b2b6..6174f3c 100644 --- a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListService.java +++ b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListService.java @@ -384,14 +384,15 @@ public class MessageListService extends MybatisBaseService= date_format('" + createStartTime + "','%Y-%m-%d')"). - apply(StringUtils.isNotEmpty(createEndTime), "date_format (m.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" - ); - if(){ - + if(StringUtils.isNotBlank(messageReadListQuery.getDate())){ + String[] s = messageReadListQuery.getDate().split("至"); + String createStartTime = s[0]; + String createEndTime = s[1]; + 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')" + ); } + IPage iPage = PagerUtil.queryToPage(pq); IPage page = baseMapper.getAppReadListByUserSid(iPage, qw,messageReadListQuery.getNames()); PagerVo pagerVo = PagerUtil.pageToVo(page, null);