|
|
@@ -1,12 +1,9 @@
|
|
|
package com.goafanti.admin.controller;
|
|
|
|
|
|
-import java.util.Arrays;
|
|
|
-
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
-import org.springframework.web.bind.annotation.RequestParam;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import com.goafanti.activityUser.service.ActivityUserService;
|
|
|
@@ -28,7 +25,8 @@ public class AdminActivityUserApiController extends BaseApiController {
|
|
|
public Result activityUserList(String activityName, String mobile, String username, Integer number, String pageSize,
|
|
|
String pageNo) {
|
|
|
Result res = new Result();
|
|
|
- res.setData(activityUserService.listActivityUser(activityName, mobile, username, number, getPSize(pageSize), getPNo(pageNo)));
|
|
|
+ res.setData(activityUserService.listActivityUser(activityName, mobile, username, number, getPSize(pageSize),
|
|
|
+ getPNo(pageNo)));
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
@@ -39,20 +37,21 @@ public class AdminActivityUserApiController extends BaseApiController {
|
|
|
public Result activityOrgList(String activityName, String mobile, String unitName, Integer number, String pageSize,
|
|
|
String pageNo) {
|
|
|
Result res = new Result();
|
|
|
- res.setData(activityUserService.listActivityOrg(activityName, mobile, unitName, number, getPSize(pageSize), getPNo(pageNo)));
|
|
|
+ res.setData(activityUserService.listActivityOrg(activityName, mobile, unitName, number, getPSize(pageSize),
|
|
|
+ getPNo(pageNo)));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 批量删除活动报名记录
|
|
|
*/
|
|
|
@RequestMapping(value = "/delete", method = RequestMethod.POST)
|
|
|
- public Result delete(@RequestParam(name = "ids[]", required = false) String[] ids) {
|
|
|
+ public Result delete(String aid, String uid) {
|
|
|
Result res = new Result();
|
|
|
- if (ids == null || ids.length < 1) {
|
|
|
+ if (StringUtils.isBlank(aid) || StringUtils.isBlank(uid) || !StringUtils.isNumeric(aid)) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
|
|
|
} else {
|
|
|
- res.setData(activityUserService.batchDeleteByPrimaryKey(Arrays.asList(ids)));
|
|
|
+ res.setData(activityUserService.batchDeleteByPrimaryKey(Long.parseLong(aid), uid));
|
|
|
}
|
|
|
return res;
|
|
|
}
|