魏超 hace 5 años
padre
commit
15af487d54

+ 3
- 2
src/main/java/com/huiju/estateagents/controller/TaNewsController.java Ver fichero

82
                                    @RequestParam(value = "buildingId", required = false) String buildingId,
82
                                    @RequestParam(value = "buildingId", required = false) String buildingId,
83
                                    @RequestParam(value = "newsTypeId", required = false) Integer newsTypeId,
83
                                    @RequestParam(value = "newsTypeId", required = false) Integer newsTypeId,
84
                                    @RequestParam(value = "newsStatus", required = false) Integer newsStatus,
84
                                    @RequestParam(value = "newsStatus", required = false) Integer newsStatus,
85
-                                   @RequestParam(value = "title", required = false) String title){
86
-        ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, getOrgId(request), newsTypeId, newsStatus,title);
85
+                                   @RequestParam(value = "title", required = false) String title,
86
+                                   @RequestParam(value = "cityId", required = false) Integer cityId){
87
+        ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, getOrgId(request), newsTypeId, newsStatus, title, cityId);
87
         return responseBean;
88
         return responseBean;
88
     }
89
     }
89
 
90
 

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITaNewsService.java Ver fichero

26
      * @param newsTypeId
26
      * @param newsTypeId
27
      * @return
27
      * @return
28
      */
28
      */
29
-    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus,String title);
29
+    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus,String title, Integer cityId);
30
 
30
 
31
     /**
31
     /**
32
      * 根据Id查询资讯数据
32
      * 根据Id查询资讯数据

+ 2
- 1
src/main/java/com/huiju/estateagents/service/impl/TaNewsServiceImpl.java Ver fichero

58
 
58
 
59
 
59
 
60
     @Override
60
     @Override
61
-    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus,String title) {
61
+    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus,String title, Integer cityId) {
62
         ResponseBean responseBean = new ResponseBean();
62
         ResponseBean responseBean = new ResponseBean();
63
 
63
 
64
         IPage<TaNews> page = new Page<>();
64
         IPage<TaNews> page = new Page<>();
71
         taNewsQueryWrapper.eq(newsTypeId != null,"news_type_id", newsTypeId);
71
         taNewsQueryWrapper.eq(newsTypeId != null,"news_type_id", newsTypeId);
72
         taNewsQueryWrapper.eq(newsStatus != null, "news_status", newsStatus);
72
         taNewsQueryWrapper.eq(newsStatus != null, "news_status", newsStatus);
73
         taNewsQueryWrapper.eq("status", 1);
73
         taNewsQueryWrapper.eq("status", 1);
74
+        taNewsQueryWrapper.eq(cityId != null, "city_id", cityId);
74
         taNewsQueryWrapper.like(title!=null,"news_name", title);
75
         taNewsQueryWrapper.like(title!=null,"news_name", title);
75
         taNewsQueryWrapper.orderByAsc("news_status");
76
         taNewsQueryWrapper.orderByAsc("news_status");
76
         taNewsQueryWrapper.orderByDesc("weight","create_date");
77
         taNewsQueryWrapper.orderByDesc("weight","create_date");