提交

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

@@ -45,10 +45,10 @@ public class TaNewsController extends BaseController {
     @RequestMapping(value="/taNews",method= RequestMethod.GET)
     public ResponseBean taNewsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                   @RequestParam(value = "buildingId") Integer buildingId,
-                                   @RequestParam(value = "orgId") Integer orgId,
-                                   @RequestParam(value = "newsTypeId") Integer newsTypeId,
-                                   @RequestParam(value = "newsStatus") Integer newsStatus){
+                                   @RequestParam(value = "buildingId", required = false) String buildingId,
+                                   @RequestParam(value = "orgId", required = false) Integer orgId,
+                                   @RequestParam(value = "newsTypeId", required = false) Integer newsTypeId,
+                                   @RequestParam(value = "newsStatus", required = false) Integer newsStatus){
         ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, orgId, newsTypeId, newsStatus);
         return responseBean;
     }

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

@@ -45,7 +45,7 @@ public class TaNewsTypeController extends BaseController {
     @RequestMapping(value="/taNewsType",method= RequestMethod.GET)
     public ResponseBean taNewsTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                       @RequestParam(value = "buildingId", required = false) Integer buildingId,
+                                       @RequestParam(value = "buildingId", required = false) String buildingId,
                                        @RequestParam(value = "orgId", required = false) Integer orgId){
         ResponseBean responseBean = iTaNewsTypeService.getList(pageNum, pageSize, buildingId, orgId);
         return responseBean;

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

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

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

@@ -22,7 +22,7 @@ public interface ITaNewsTypeService extends IService<TaNewsType> {
      * @param orgId
      * @return
      */
-    ResponseBean getList(Integer pageNum, Integer pageSize, Integer buildingId, Integer orgId);
+    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId);
 
     /**
      * 根据Id查询资讯类型数据

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

@@ -52,7 +52,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
 
 
     @Override
-    public ResponseBean getList(Integer pageNum, Integer pageSize, Integer buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus) {
+    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus) {
         ResponseBean responseBean = new ResponseBean();
 
         IPage<TaNews> page = new Page<>();
@@ -101,7 +101,8 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
         check(taNews);
 
         BeanTools.copyProperties(taNews, oldNews);
-        responseBean.addSuccess(this.updateById(oldNews));
+        this.updateById(oldNews);
+        responseBean.addSuccess(oldNews);
         return responseBean;
     }
 
@@ -176,7 +177,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
             responseBean.addError("数据不存!");
         }
 
-        taNewsMapper.setFieldNum(id + "", "pv_num", 1);
+        taNewsMapper.setFieldNum(String.valueOf(id), "pv_num", 1);
 
         responseBean.addSuccess((Object)"");
         return responseBean;

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

@@ -33,7 +33,7 @@ public class TaNewsTypeServiceImpl extends ServiceImpl<TaNewsTypeMapper, TaNewsT
 
 
     @Override
-    public ResponseBean getList(Integer pageNum, Integer pageSize, Integer buildingId, Integer orgId) {
+    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         IPage<TaNewsType> page = new Page<>();
         page.setCurrent(pageNum);
@@ -75,6 +75,7 @@ public class TaNewsTypeServiceImpl extends ServiceImpl<TaNewsTypeMapper, TaNewsT
 
         BeanTools.copyProperties(taNewsType, oldTaNewsType);
         this.updateById(oldTaNewsType);
+        responseBean.addSuccess(oldTaNewsType);
         return responseBean;
     }
 
@@ -86,6 +87,7 @@ public class TaNewsTypeServiceImpl extends ServiceImpl<TaNewsTypeMapper, TaNewsT
         check(taNewsType);
 
         taNewsType.setCreateDate(LocalDateTime.now());
+        taNewsType.setStatus(1);
         this.save(taNewsType);
         responseBean.addSuccess(taNewsType);
         return responseBean;