albertshaw лет назад: 8
Родитель
Сommit
3c0f12ca81

+ 2 - 4
src/main/java/com/goafanti/activityUser/service/ActivityUserService.java

@@ -1,7 +1,5 @@
 package com.goafanti.activityUser.service;
 
-import java.util.List;
-
 import com.goafanti.activityUser.bo.ActivityUserListBo;
 import com.goafanti.common.model.ActivityUser;
 import com.goafanti.common.model.ActivityUserKey;
@@ -21,10 +19,10 @@ public interface ActivityUserService {
 	Pagination<ActivityUserListBo> listActivityOrg(String activityName, String mobile, String unitName, Integer number,
 			Integer pSize, Integer pNo);
 
-	int batchDeleteByPrimaryKey(List<String> asList);
-
 	ActivityUser selectByPrimaryKey(ActivityUserKey key);
 
 	ActivityUser selectByAidAndUid(Long aid, String userId);
 
+	int batchDeleteByPrimaryKey(Long aid, String uid);
+
 }

+ 4 - 5
src/main/java/com/goafanti/activityUser/service/impl/ActivityUserServiceImpl.java

@@ -2,7 +2,6 @@ package com.goafanti.activityUser.service.impl;
 
 import java.util.Calendar;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -100,16 +99,16 @@ public class ActivityUserServiceImpl extends BaseMybatisDao<ActivityUserMapper>
 		if (StringUtils.isNotBlank(username)) {
 			params.put("username", username);
 		}
-		
-		if (StringUtils.isNotBlank(unitName)){
+
+		if (StringUtils.isNotBlank(unitName)) {
 			params.put("unitName", unitName);
 		}
 		return params;
 	}
 
 	@Override
-	public int batchDeleteByPrimaryKey(List<String> id) {
-		return activityUserMapper.batchDeleteByPrimaryKey(id);
+	public int batchDeleteByPrimaryKey(Long aid, String uid) {
+		return activityUserMapper.batchDeleteByPrimaryKey(aid, uid);
 	}
 
 	@Override

+ 8 - 9
src/main/java/com/goafanti/admin/controller/AdminActivityUserApiController.java

@@ -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;
 	}

+ 1 - 3
src/main/java/com/goafanti/common/dao/ActivityUserMapper.java

@@ -1,7 +1,5 @@
 package com.goafanti.common.dao;
 
-import java.util.List;
-
 import org.apache.ibatis.annotations.Param;
 
 import com.goafanti.common.model.ActivityUser;
@@ -22,7 +20,7 @@ public interface ActivityUserMapper {
 
 	ActivityUser selectByUid(String uid);
 
-	int batchDeleteByPrimaryKey(List<String> id);
+	int batchDeleteByPrimaryKey(@Param("aid")Long aid, @Param("uid")String uid);
 
 	ActivityUser selectByAidAndUid(@Param("aid")Long aid, @Param("uid")String uid);
 }

+ 3 - 6
src/main/java/com/goafanti/common/mapper/ActivityUserMapper.xml

@@ -203,14 +203,11 @@
   	</if>
   </select>
   
-  <delete id="batchDeleteByPrimaryKey" parameterType="java.util.List">
+  <delete id="batchDeleteByPrimaryKey">
   	delete
   		from activity_user
-  	where aid in
-  	<foreach item="item" index="index" collection="list" open="("
-			separator="," close=")">
-			#{item}
-	</foreach>
+  	where aid = #{aid,jdbcType=BIGINT}
+      and uid = #{uid,jdbcType=VARCHAR}
   </delete>
   
     <select id="selectByAidAndUid" resultMap="BaseResultMap" >