留言 时间范围 关键字搜索

zxdt-api/src/main/java/api/controller/online/MessageController.java

@@ -94,9 +94,17 @@ public class MessageController extends BaseController {
     @ApiOperation("留言列表")
     @Log(title = "查询留言消息列表",businessType = BusinessType.QUERY)
     @GetMapping("/leavelist")
-    public AjaxResult getLeaveList() {
+    public AjaxResult getLeaveList(MessageInput input) {
         LambdaQueryWrapper<Message> qw = new QueryWrapper<Message>().select("kh_user user,count(*) as count,DATE_FORMAT(max(create_time), '%Y-%m-%d %H:%i:%s') as time").lambda();
-        qw.eq( Message::getSend, 1).isNull( Message::getKfUser).groupBy(Message::getKhUser);
+
+        qw.eq( Message::getSend, 1).isNull( Message::getKfUser);
+             qw.like(!StringHelper.isEmpty(input.getContent()),  Message::getMsgContent, input.getContent());
+
+        if (input.getStartTime() != null && input.getEndTime() != null) {
+            qw.between(Message::getCreateTime, input.getStartTime(), input.getEndTime());
+        }
+
+       qw .groupBy(Message::getKhUser);
         List<Map<String,Object>> list=messageService.getMaps(qw);
 
         if(list.size()>0) {

zxdt-entity/src/main/java/api/entity/input/online/MessageInput.java

@@ -1,6 +1,9 @@
 package api.entity.input.online;
 
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 @Data
 public class MessageInput {
@@ -10,4 +13,9 @@ public class MessageInput {
     private String content;
     //用户
     private String user;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private String startTime;
+
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
 }