fuxingfan 3 年前
父节点
当前提交
f02ebd0a39

+ 2
- 1
src/main/java/com/yunzhi/marketing/controller/TaBuildingDynamicController.java 查看文件

180
     @RequestMapping(value = "/wx/buildingDynamiceList", method = RequestMethod.GET)
180
     @RequestMapping(value = "/wx/buildingDynamiceList", method = RequestMethod.GET)
181
     public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "buildingId", required = false)String buildingId,
181
     public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "buildingId", required = false)String buildingId,
182
                                                 @RequestParam(value = "type", required = false) String type,
182
                                                 @RequestParam(value = "type", required = false) String type,
183
+                                                @RequestParam(value = "home", required = false) Integer home,
183
                                                @RequestParam(value = "pageNumber",defaultValue = "1")Integer pageNumber,
184
                                                @RequestParam(value = "pageNumber",defaultValue = "1")Integer pageNumber,
184
                                                @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
185
                                                @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
185
                                                @RequestParam(defaultValue = "false" )boolean mine,
186
                                                @RequestParam(defaultValue = "false" )boolean mine,
196
             TaPerson person = taPersons.get(0);
197
             TaPerson person = taPersons.get(0);
197
             responseBean.addSuccess(iBuildingDynamicService.getJoinedActivity(pageNumber,pageSize,"",person,orgId));
198
             responseBean.addSuccess(iBuildingDynamicService.getJoinedActivity(pageNumber,pageSize,"",person,orgId));
198
         }else {
199
         }else {
199
-            responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNumber,pageSize,buildingId,openid,cityId,orgId,type);
200
+            responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNumber,pageSize,buildingId,openid,cityId,orgId,type,home);
200
         }
201
         }
201
 
202
 
202
         return responseBean;
203
         return responseBean;

+ 1
- 1
src/main/java/com/yunzhi/marketing/service/ITaBuildingDynamicService.java 查看文件

41
      * 微信小程序 项目动态管理列表
41
      * 微信小程序 项目动态管理列表
42
      * @return
42
      * @return
43
      */
43
      */
44
-    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid,Integer cityId,Integer orgId,String type);
44
+    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid,Integer cityId,Integer orgId,String type,Integer home);
45
 
45
 
46
     /**
46
     /**
47
      * 微信小程序 项目详情
47
      * 微信小程序 项目详情

+ 2
- 1
src/main/java/com/yunzhi/marketing/service/impl/TaBuildingDynamicServiceImpl.java 查看文件

97
     }
97
     }
98
 
98
 
99
     @Override
99
     @Override
100
-    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid,Integer cityId,Integer orgId,String type) {
100
+    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid,Integer cityId,Integer orgId,String type,Integer home) {
101
         Page<TaBuildingDynamic> page = new Page<>();
101
         Page<TaBuildingDynamic> page = new Page<>();
102
         page.setCurrent(pageNum);
102
         page.setCurrent(pageNum);
103
         page.setSize(pageSize);
103
         page.setSize(pageSize);
111
         buildingDynamicQueryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id", buildingId);
111
         buildingDynamicQueryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id", buildingId);
112
         buildingDynamicQueryWrapper.eq("status", "1");
112
         buildingDynamicQueryWrapper.eq("status", "1");
113
         buildingDynamicQueryWrapper.eq(null != cityId,"city_id",cityId);
113
         buildingDynamicQueryWrapper.eq(null != cityId,"city_id",cityId);
114
+        buildingDynamicQueryWrapper.eq(null != home,"home",home);
114
         buildingDynamicQueryWrapper.eq(!StringUtils.isEmpty(type),"type",type);
115
         buildingDynamicQueryWrapper.eq(!StringUtils.isEmpty(type),"type",type);
115
         buildingDynamicQueryWrapper.eq("org_id",orgId);
116
         buildingDynamicQueryWrapper.eq("org_id",orgId);
116
         buildingDynamicQueryWrapper.orderByDesc("weight","create_date");
117
         buildingDynamicQueryWrapper.orderByDesc("weight","create_date");

+ 1
- 1
src/main/resources/application-dev.yml 查看文件

1
 server:
1
 server:
2
-  port: 8088
2
+  port: 8081
3
 spring:
3
 spring:
4
   application:
4
   application:
5
     name: marketing-cloud
5
     name: marketing-cloud