From 0e5e1cc8e8e91553f4fa559b165690283400f911 Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Mon, 20 Dec 2021 15:02:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E6=8E=A8=E9=80=81=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ArticleController.java              | 33 +++++++++++++++++++---
 .../talkonlineweb/controller/TestController.java   |  8 +++---
 .../talkonlineweb/domain/LymsPushMessages.java     | 12 ++++++++
 3 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ArticleController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ArticleController.java
index 265d20f..ba80db7 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ArticleController.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ArticleController.java
@@ -6,10 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.lyms.talkonlineweb.domain.*;
 import com.lyms.talkonlineweb.result.BaseResponse;
-import com.lyms.talkonlineweb.service.ArticleInfoService;
-import com.lyms.talkonlineweb.service.GetpushartInfoService;
-import com.lyms.talkonlineweb.service.LymsArticleService;
-import com.lyms.talkonlineweb.service.LymsPushedartService;
+import com.lyms.talkonlineweb.service.*;
 import com.lyms.talkonlineweb.service.impl.PushedartlogsInfoServiceImpl;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.io.IOUtils;
@@ -53,6 +50,9 @@ public class ArticleController {
 
     @Autowired
     private GetpushartInfoService getpushartInfoService;//小程序用户端-根据患者获取推送的文章-视图
+
+    @Autowired
+    private LymsPushMessagesService lymsPushMessagesService;
     /**
      * 上传文件
      *
@@ -359,5 +359,30 @@ public class ArticleController {
         return baseResponse;
     }
 
+    /**
+     * 新推送记录列表
+     *
+     * @return
+     */
+    @GetMapping("getLymsPushMessages")
+    public BaseResponse getLymsPushMessages(LymsPushMessages lymsPushMessages, Integer current, Integer size){
+        BaseResponse baseResponse=new BaseResponse();
+        try {
+            Page<LymsPushMessages> page=new Page<>(current,size);
+            QueryWrapper<LymsPushMessages> queryWrapper = new QueryWrapper<>();
+            queryWrapper.setEntity(lymsPushMessages);
+            if(null!=lymsPushMessages.getStartDate()&&null!=lymsPushMessages.getEndDate()){
+                queryWrapper.ge("plan_time", lymsPushMessages.getStartDate()).le("plan_time",lymsPushMessages.getEndDate());
+            }
+            queryWrapper.orderByDesc("plan_time");
+            Page<LymsPushMessages> lymsPushMessagesPage=lymsPushMessagesService.page(page,queryWrapper);
+            baseResponse.setObject(lymsPushMessagesPage);
+            baseResponse.setErrormsg("成功");
+        } catch (Exception e) {
+            baseResponse.setErrormsg("失败");
+            e.printStackTrace();
+        }
+        return baseResponse;
+    }
 
 }
diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/TestController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/TestController.java
index 1e69abf..e9a8cfe 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/TestController.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/TestController.java
@@ -15,12 +15,12 @@ public class TestController {
     public PushArticleTask pushArticleTask;
     @Autowired
     public PushArticleTaskData pushArticleTaskData;
-    @GetMapping("test0")
-    public  void test0() {
-        pushArticleTask.pushArtcle();
-    }
     @GetMapping("test9")
     public  void test9() {
+        pushArticleTask.pushArtcle();
+    }
+    @GetMapping("test0")
+    public  void test0() {
         pushArticleTaskData.pushArtcleData();
     }
 
diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsPushMessages.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsPushMessages.java
index 6c5e655..d044620 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsPushMessages.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsPushMessages.java
@@ -153,6 +153,18 @@ public class LymsPushMessages implements Serializable {
     @TableField(value = "plan_time")
     private Date planTime;
 
+    /**
+     * 列表筛选条件startDate
+     */
+    @TableField(exist = false)
+    private String startDate;
+
+    /**
+     * 列表筛选条件endDate
+     */
+    @TableField(exist = false)
+    private String endDate;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 
-- 
1.8.3.1