|
@@ -128,7 +128,7 @@ public class TaBuildingDynamicController extends BaseController {
|
128
|
128
|
})
|
129
|
129
|
@RequestMapping(value = "/wx/buildingDynamiceList", method = RequestMethod.GET)
|
130
|
130
|
public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "buildingId", required = false)String buildingId,
|
131
|
|
- @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
|
|
131
|
+ @RequestParam(value = "pageNumber",defaultValue = "1")Integer pageNumber,
|
132
|
132
|
@RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
|
133
|
133
|
@RequestParam(defaultValue = "false" )boolean mine,
|
134
|
134
|
@RequestParam(value = "cityId", required = false)Integer cityId,
|
|
@@ -142,9 +142,9 @@ public class TaBuildingDynamicController extends BaseController {
|
142
|
142
|
return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
|
143
|
143
|
}
|
144
|
144
|
TaPerson person = taPersons.get(0);
|
145
|
|
- responseBean.addSuccess(iBuildingDynamicService.getJoinedActivity(pageNum,pageSize,"",person));
|
|
145
|
+ responseBean.addSuccess(iBuildingDynamicService.getJoinedActivity(pageNumber,pageSize,"",person));
|
146
|
146
|
}else {
|
147
|
|
- responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId,openid,cityId,orgId);
|
|
147
|
+ responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNumber,pageSize,buildingId,openid,cityId,orgId);
|
148
|
148
|
}
|
149
|
149
|
|
150
|
150
|
return responseBean;
|
|
@@ -158,7 +158,7 @@ public class TaBuildingDynamicController extends BaseController {
|
158
|
158
|
})
|
159
|
159
|
@RequestMapping(value = "/wx/save/buildingDynamiceList", method = RequestMethod.GET)
|
160
|
160
|
public ResponseBean wxSaveBuildingDynamiceList(@RequestParam(value = "buildingId", required = false)String buildingId,
|
161
|
|
- @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
|
|
161
|
+ @RequestParam(value = "pageNumber",defaultValue = "1")Integer pageNumber,
|
162
|
162
|
@RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
|
163
|
163
|
HttpServletRequest request){
|
164
|
164
|
String openid = getOpenId(request);
|
|
@@ -177,7 +177,7 @@ public class TaBuildingDynamicController extends BaseController {
|
177
|
177
|
for(int i = 0; i<saveList.size();i++){
|
178
|
178
|
ids.add(saveList.get(i).getSavedTarget());
|
179
|
179
|
}
|
180
|
|
- IPage<TaBuildingDynamic> page = new Page<>(pageNum, pageSize);
|
|
180
|
+ IPage<TaBuildingDynamic> page = new Page<>(pageNumber, pageSize);
|
181
|
181
|
QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
|
182
|
182
|
buildingDynamicQueryWrapper.in("dynamic_id",ids);
|
183
|
183
|
IPage<TaBuildingDynamic> buildingDynamicIPage = iBuildingDynamicService.page(page,buildingDynamicQueryWrapper);
|