解决参数未找到问题

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/PoNewsController.java

@@ -4,7 +4,6 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -84,7 +83,7 @@ public class PoNewsController extends BaseController
     @Log(title = "标题和时间搜索")
     @PreAuthorize("@ss.hasPermi('system:news:querynews')")
     @GetMapping("/queryNews")
-    public TableDataInfo list(@RequestParam(value="title",required = false)String title,
+    public TableDataInfo list(@RequestParam(value="newsTitle",required = false)String title,
                               @RequestParam(value="newsTimeStart",required = false)Date newsTimeStart,
                               @RequestParam(value="newsTimeEnd",required = false) Date newsTimeEnd)
     {

ruoyi-system/src/main/java/com/ruoyi/system/mapper/PoNewsMapper.java

@@ -1,6 +1,7 @@
 package com.ruoyi.system.mapper;
 
 import com.ruoyi.system.domain.PoNews;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
@@ -60,14 +61,14 @@ public interface PoNewsMapper
      * @param newsTimeEnd
      * @return
      */
-    List<PoNews> selectPoNewsListByTitleAndNewsTimeStartAndNewsTimeEnd(String title, Date newsTimeStart, Date newsTimeEnd);
+    List<PoNews> selectPoNewsListByTitleAndNewsTimeStartAndNewsTimeEnd(@Param("newsTitle") String title, @Param("newsTimeStart") Date newsTimeStart, @Param("newsTimeEnd") Date newsTimeEnd);
 
     /**
      * 标题不为空时间为空
      * @param title
      * @return
      */
-    List<PoNews> selectPoNewsListByTitle(String title);
+    //List<PoNews> selectPoNewsListByTitle(String title);
 
     /**
      * 标题为空时间不为空
@@ -75,7 +76,7 @@ public interface PoNewsMapper
      * @param newsTimeEnd
      * @return
      */
-    List<PoNews> selectPoNewsByTime(Date newsTimeStart, Date newsTimeEnd);
+    //List<PoNews> selectPoNewsByTime( Date newsTimeStart,  Date newsTimeEnd);
 
     /**
      * 获取详细消息内容

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PoNewsServiceImpl.java

@@ -152,21 +152,32 @@ public class PoNewsServiceImpl implements IPoNewsService {
                 }
                 if (newsTimeStart.before(newsTimeEnd)) {
                     return poNewsMapper.selectPoNewsListByTitleAndNewsTimeStartAndNewsTimeEnd(title, newsTimeStart, newsTimeEnd);
-                } else if ((newsTimeStart != null && newsTimeEnd == null) || (newsTimeStart == null && newsTimeEnd != null)) {
+                } else{
                     //有一个时间不为空返回提示信息
                     List list = new ArrayList();
                     list.add("请选择正确的时间段");
                     return list;
                 }
             } else {//时间都为空
-                return poNewsMapper.selectPoNewsListByTitle(title);
+                return poNewsMapper.selectPoNewsListByTitleAndNewsTimeStartAndNewsTimeEnd(title,newsTimeStart,newsTimeEnd);
             }
         }
         //标题为空
         else {
             //时间不为空
+            //保证查询的是已经发布的
+            if (DateUtils.getNowDate().before(newsTimeEnd)){
+                newsTimeEnd = DateUtils.getNowDate();
+            }
             if (newsTimeStart != null && newsTimeEnd != null) {
-                return poNewsMapper.selectPoNewsByTime(newsTimeStart, newsTimeEnd);
+                if (newsTimeStart.before(newsTimeEnd)){
+                    return poNewsMapper.selectPoNewsListByTitleAndNewsTimeStartAndNewsTimeEnd(title,newsTimeStart,newsTimeEnd);
+                }else{
+                    //有一个时间不为空返回提示信息
+                    List list = new ArrayList();
+                    list.add("请选择正确的时间段");
+                    return list;
+                }
             }
         }
         //都为空执行分页查询

ruoyi-system/src/main/resources/mapper/system/PoNewsMapper.xml

@@ -40,6 +40,7 @@
             <if test="image != null and image != ''">and image = #{image}</if>
             <if test="newsTime != null ">and news_time = #{newsTime}</if>
             <if test="phonenumber != null ">and phonenumber = #{phonenumber}</if>
+            and news_time $lt; now()
         </where>
     </select>
 
@@ -134,21 +135,8 @@
     </where>
     </select>
 
-<!--    标题不为空时间为空-->
-    <select id="selectPoNewsListByTitle" resultType="PoNews" resultMap="PoNewsResult">
-        <include refid="selectPoNewsVo"></include>
-        <where>
-            <if test="newsTitle != null and newsTitle != ''">and news_title like concat('%', #{newsTitle}, '%')</if>
-        </where>
-    </select>
 
-<!--    标题为空时间不为空-->
-    <select id="selectPoNewsByTime" resultType="PoNews" resultMap="PoNewsResult">
-        <include refid="selectPoNewsVo"></include>
-        <where>
-            <if test="newsTimeStart != null and newsTimeEnd != null "> and news_time between #{newsTimeStart} and #{newsTimeEnd}</if>
-        </where>
-    </select>
+
 
 <!--    查询详细内容-->
     <select id="selectContentByNewsId" resultType="PoNews" resultMap="PoNewsResult">