Merge branch 'v3' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3

src/main/java/com/huiju/estateagents/controller/TaNewsController.java

@@ -73,7 +73,8 @@ public class TaNewsController extends BaseController {
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
             @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query",value = "项目id"),
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "newsTypeId", paramType = "query",value = "资讯类型id"),
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "newsStatus", paramType = "query",value = "状态")
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "newsStatus", paramType = "query",value = "状态"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "title", paramType = "query",value = "标题")
     })
     @RequestMapping(value="/admin/taNews",method= RequestMethod.GET)
     public ResponseBean taNewsList(HttpServletRequest request,
@@ -81,8 +82,9 @@ public class TaNewsController extends BaseController {
                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                    @RequestParam(value = "buildingId", required = false) String buildingId,
                                    @RequestParam(value = "newsTypeId", required = false) Integer newsTypeId,
-                                   @RequestParam(value = "newsStatus", required = false) Integer newsStatus){
-        ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, getOrgId(request), newsTypeId, newsStatus);
+                                   @RequestParam(value = "newsStatus", required = false) Integer newsStatus,
+                                   @RequestParam(value = "title", required = false) String title){
+        ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, getOrgId(request), newsTypeId, newsStatus,title);
         return responseBean;
     }
 

src/main/java/com/huiju/estateagents/service/ITaNewsService.java

@@ -26,7 +26,7 @@ public interface ITaNewsService extends IService<TaNews> {
      * @param newsTypeId
      * @return
      */
-    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus);
+    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus,String title);
 
     /**
      * 根据Id查询资讯数据

src/main/java/com/huiju/estateagents/service/impl/TaNewsServiceImpl.java

@@ -58,7 +58,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
 
 
     @Override
-    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus) {
+    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus,String title) {
         ResponseBean responseBean = new ResponseBean();
 
         IPage<TaNews> page = new Page<>();
@@ -71,6 +71,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
         taNewsQueryWrapper.eq(newsTypeId != null,"news_type_id", newsTypeId);
         taNewsQueryWrapper.eq(newsStatus != null, "news_status", newsStatus);
         taNewsQueryWrapper.eq("status", 1);
+        taNewsQueryWrapper.like(title!=null,"news_name", title);
         taNewsQueryWrapper.orderByDesc("create_date");
         IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);
 

src/main/resources/mapper/TaBuildingDynamicMapper.xml

@@ -31,7 +31,7 @@
             and city_id = #{cityId}
         </if>
         <if test="title != null and title != ''">
-            and title = #{title}
+            and title like CONCAT('%', #{title} , '%')
         </if>
         <if test="orgId != null and orgId != ''">
             and org_id = #{orgId}