魏熙美 5 years ago
parent
commit
5ec256748b

+ 4
- 4
src/main/java/com/huiju/estateagents/controller/TaNewsController.java View File

45
     @RequestMapping(value="/taNews",method= RequestMethod.GET)
45
     @RequestMapping(value="/taNews",method= RequestMethod.GET)
46
     public ResponseBean taNewsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
46
     public ResponseBean taNewsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
47
                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
47
                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
48
-                                   @RequestParam(value = "buildingId") Integer buildingId,
49
-                                   @RequestParam(value = "orgId") Integer orgId,
50
-                                   @RequestParam(value = "newsTypeId") Integer newsTypeId,
51
-                                   @RequestParam(value = "newsStatus") Integer newsStatus){
48
+                                   @RequestParam(value = "buildingId", required = false) String buildingId,
49
+                                   @RequestParam(value = "orgId", required = false) Integer orgId,
50
+                                   @RequestParam(value = "newsTypeId", required = false) Integer newsTypeId,
51
+                                   @RequestParam(value = "newsStatus", required = false) Integer newsStatus){
52
         ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, orgId, newsTypeId, newsStatus);
52
         ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, orgId, newsTypeId, newsStatus);
53
         return responseBean;
53
         return responseBean;
54
     }
54
     }

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaNewsTypeController.java View File

45
     @RequestMapping(value="/taNewsType",method= RequestMethod.GET)
45
     @RequestMapping(value="/taNewsType",method= RequestMethod.GET)
46
     public ResponseBean taNewsTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
46
     public ResponseBean taNewsTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
47
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
47
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
48
-                                       @RequestParam(value = "buildingId", required = false) Integer buildingId,
48
+                                       @RequestParam(value = "buildingId", required = false) String buildingId,
49
                                        @RequestParam(value = "orgId", required = false) Integer orgId){
49
                                        @RequestParam(value = "orgId", required = false) Integer orgId){
50
         ResponseBean responseBean = iTaNewsTypeService.getList(pageNum, pageSize, buildingId, orgId);
50
         ResponseBean responseBean = iTaNewsTypeService.getList(pageNum, pageSize, buildingId, orgId);
51
         return responseBean;
51
         return responseBean;

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITaNewsService.java View File

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

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITaNewsTypeService.java View File

22
      * @param orgId
22
      * @param orgId
23
      * @return
23
      * @return
24
      */
24
      */
25
-    ResponseBean getList(Integer pageNum, Integer pageSize, Integer buildingId, Integer orgId);
25
+    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId);
26
 
26
 
27
     /**
27
     /**
28
      * 根据Id查询资讯类型数据
28
      * 根据Id查询资讯类型数据

+ 4
- 3
src/main/java/com/huiju/estateagents/service/impl/TaNewsServiceImpl.java View File

52
 
52
 
53
 
53
 
54
     @Override
54
     @Override
55
-    public ResponseBean getList(Integer pageNum, Integer pageSize, Integer buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus) {
55
+    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus) {
56
         ResponseBean responseBean = new ResponseBean();
56
         ResponseBean responseBean = new ResponseBean();
57
 
57
 
58
         IPage<TaNews> page = new Page<>();
58
         IPage<TaNews> page = new Page<>();
101
         check(taNews);
101
         check(taNews);
102
 
102
 
103
         BeanTools.copyProperties(taNews, oldNews);
103
         BeanTools.copyProperties(taNews, oldNews);
104
-        responseBean.addSuccess(this.updateById(oldNews));
104
+        this.updateById(oldNews);
105
+        responseBean.addSuccess(oldNews);
105
         return responseBean;
106
         return responseBean;
106
     }
107
     }
107
 
108
 
176
             responseBean.addError("数据不存!");
177
             responseBean.addError("数据不存!");
177
         }
178
         }
178
 
179
 
179
-        taNewsMapper.setFieldNum(id + "", "pv_num", 1);
180
+        taNewsMapper.setFieldNum(String.valueOf(id), "pv_num", 1);
180
 
181
 
181
         responseBean.addSuccess((Object)"");
182
         responseBean.addSuccess((Object)"");
182
         return responseBean;
183
         return responseBean;

+ 3
- 1
src/main/java/com/huiju/estateagents/service/impl/TaNewsTypeServiceImpl.java View File

33
 
33
 
34
 
34
 
35
     @Override
35
     @Override
36
-    public ResponseBean getList(Integer pageNum, Integer pageSize, Integer buildingId, Integer orgId) {
36
+    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId) {
37
         ResponseBean responseBean = new ResponseBean();
37
         ResponseBean responseBean = new ResponseBean();
38
         IPage<TaNewsType> page = new Page<>();
38
         IPage<TaNewsType> page = new Page<>();
39
         page.setCurrent(pageNum);
39
         page.setCurrent(pageNum);
75
 
75
 
76
         BeanTools.copyProperties(taNewsType, oldTaNewsType);
76
         BeanTools.copyProperties(taNewsType, oldTaNewsType);
77
         this.updateById(oldTaNewsType);
77
         this.updateById(oldTaNewsType);
78
+        responseBean.addSuccess(oldTaNewsType);
78
         return responseBean;
79
         return responseBean;
79
     }
80
     }
80
 
81
 
86
         check(taNewsType);
87
         check(taNewsType);
87
 
88
 
88
         taNewsType.setCreateDate(LocalDateTime.now());
89
         taNewsType.setCreateDate(LocalDateTime.now());
90
+        taNewsType.setStatus(1);
89
         this.save(taNewsType);
91
         this.save(taNewsType);
90
         responseBean.addSuccess(taNewsType);
92
         responseBean.addSuccess(taNewsType);
91
         return responseBean;
93
         return responseBean;