|
@@ -67,6 +67,9 @@ public class TaBuildingDynamicController extends BaseController {
|
67
|
67
|
@Autowired
|
68
|
68
|
private ITaBuildingService iTaBuildingService;
|
69
|
69
|
|
|
70
|
+ @Autowired
|
|
71
|
+ private TaActivityDynamicEnlistMapper taActivityDynamicEnlistMapper;
|
|
72
|
+
|
70
|
73
|
@InitBinder
|
71
|
74
|
protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
|
72
|
75
|
DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
|
|
@@ -210,9 +213,9 @@ public class TaBuildingDynamicController extends BaseController {
|
210
|
213
|
* @param request
|
211
|
214
|
* @return
|
212
|
215
|
*/
|
213
|
|
- @ApiOperation(value = "微信端查询活动详情", notes = "微信端查询活动详情")
|
|
216
|
+ @ApiOperation(value = "微信端添加活动报名", notes = "微信端添加活动报名")
|
214
|
217
|
@ApiImplicitParams({
|
215
|
|
- @ApiImplicitParam(dataType = "TaActivityDynamicEnlist", name = "taActivityDynamicEnlist", paramType = "body",value = "活动详细信息")
|
|
218
|
+ @ApiImplicitParam(dataType = "TaActivityDynamicEnlist", name = "taActivityDynamicEnlist", paramType = "body",value = "")
|
216
|
219
|
})
|
217
|
220
|
@RequestMapping(value = "/wx/activityDynamicEnlistAdd", method = RequestMethod.POST)
|
218
|
221
|
public ResponseBean taActivityDynamicEnlist(@RequestBody TaActivityDynamicEnlist taActivityDynamicEnlist,
|
|
@@ -222,6 +225,21 @@ public class TaBuildingDynamicController extends BaseController {
|
222
|
225
|
if (null == taPersons || taPersons.size() != 1) {
|
223
|
226
|
return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
|
224
|
227
|
}
|
|
228
|
+
|
|
229
|
+ TaBuildingDynamic buildingDynamic = iBuildingDynamicService.getById(taActivityDynamicEnlist.getDynamicId());
|
|
230
|
+
|
|
231
|
+ // 携带的报名人数(是已经包括自己了),不能超过活动总人数
|
|
232
|
+
|
|
233
|
+ // 当前活动已报名的总人数
|
|
234
|
+ Integer enlistCount = taActivityDynamicEnlistMapper.selectEnlistCount(taActivityDynamicEnlist.getDynamicId(), getOrgId(request));
|
|
235
|
+ if ((enlistCount + taActivityDynamicEnlist.getAttendNum()) > buildingDynamic.getEnlistNum().intValue()) {
|
|
236
|
+ return ResponseBean.error("报名失败,超过活动报名的最大人数!", ResponseBean.ERROR_UNAVAILABLE);
|
|
237
|
+ }
|
|
238
|
+
|
|
239
|
+
|
|
240
|
+
|
|
241
|
+
|
|
242
|
+
|
225
|
243
|
TaPerson person = taPersons.get(0);
|
226
|
244
|
Integer orgId = getOrgId(request);
|
227
|
245
|
taActivityDynamicEnlist.setPersonId(person.getPersonId());
|