活动审核

service-manager/src/main/java/com/winsun/controller/ActivityController.java

 package com.winsun.controller;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 
 import com.winsun.bean.School;
+import com.winsun.bean.activity.HhrActivityRecord;
 import com.winsun.mapper.HhrUserMapper;
 import com.winsun.mapper.SchoolMapper;
 import org.apache.commons.lang3.StringUtils;
@@ -62,19 +60,19 @@ public class ActivityController extends BaseController {
 		wrapper.eq(StringUtils.isNotBlank(subclass), "subclass", subclass);
 		wrapper.eq("del_flag", 0);
 		wrapper.eq(StringUtils.isNotBlank(status), "status", status);
-		
+
 		Page<HhrActivity> page = new Page<>(pageIndex, pageSize);
 		List<HhrActivity> list = activityMapper.selectPage(page, wrapper);
 		page.setRecords(list);
 		return ResponseData.success(page, "查询完毕！");
 	}
-	
+
 	@Permission(menuname = "新增活动", value = "addActivity", method = RequestMethod.POST)
 	public ResponseData<String> addActivity(@RequestParam("title") String title, @RequestParam("desc") String desc,
-			@RequestParam("integral") String integral, @RequestParam("activityType") String activityType, 
+			@RequestParam("integral") String integral, @RequestParam("activityType") String activityType,
 			@RequestParam("subclass") String subclass,@RequestParam("imageUrl") String imageUrl,
 			@RequestParam("sort") String sort, @RequestParam("range") String range){
-		
+
 		ShiroUser user = getShiroUser();
 
 		// 添加活动权限
@@ -107,8 +105,9 @@ public class ActivityController extends BaseController {
 		activity.setUpdateTime(new Date());
 		activity.setSubName(subName);
 		activity.setSubSchool(subSchool);
+		activity.setDelFlag(0);
 
-		boolean isSubManager = user.getRoleNames().stream().anyMatch(data -> StringUtils.equalsAny(data, "县份管理员（订单）"));
+		boolean isSubManager = user.getRoleNames().stream().anyMatch(data -> StringUtils.equalsAny(data, "县份管理员（订单）", "超级管理员"));
 		if (isSubManager && "团队活动".equals(activity.getActivityType())) {
 			return ResponseData.error("无权限创建团队活动");
 		}
@@ -131,11 +130,11 @@ public class ActivityController extends BaseController {
 
 		return ResponseData.error("添加失败");
 	}
-	
+
 	@Permission(menuname = "修改活动", value = "updateActivity", method = RequestMethod.POST)
-	public ResponseData<String> addActivity(@RequestParam("id") String id, 
+	public ResponseData<String> addActivity(@RequestParam("id") String id,
 			@RequestParam("title") String title, @RequestParam("desc") String desc,
-			@RequestParam("integral") String integral, @RequestParam("activityType") String activityType, 
+			@RequestParam("integral") String integral, @RequestParam("activityType") String activityType,
 			@RequestParam("subclass") String subclass,@RequestParam("imageUrl") String imageUrl,
 			@RequestParam("sort") String sort, @RequestParam("range") String range){
 
@@ -150,14 +149,14 @@ public class ActivityController extends BaseController {
 		activity.setImageUrl(imageUrl);
 		activity.setUpdateTime(new Date());
 		int num = activityMapper.updateById(activity);
-		
+
 		if (num > 0) {
 			return ResponseData.success("修改完毕！");
 		}
 
 		return ResponseData.error("修改失败");
 	}
-	
+
 	@Permission(menuname = "删除活动", value = "deleteActivity", method = RequestMethod.POST)
 	public ResponseData<String> deleteActivity(@RequestParam("id") String id){
 
@@ -165,7 +164,7 @@ public class ActivityController extends BaseController {
 		activity.setId(id);
 		activity.setDelFlag(1);
 		int num = activityMapper.updateById(activity);
-		
+
 		if (num > 0) {
 			return ResponseData.success("删除完毕！");
 		}
@@ -203,7 +202,51 @@ public class ActivityController extends BaseController {
 
 		return ResponseData.error("审核失败！");
 	}
-	
+
+	/**
+	 * 审核活动
+	 * @param id
+	 * @param ids
+	 * @param status
+	 * @return
+	 */
+	@Permission(menuname = "审核活动", value = "auditActivityNew", method = RequestMethod.POST)
+	public ResponseData<String> auditActivityNew(@RequestParam(value = "id",required = false) String id,
+												 @RequestParam("ids") String ids,
+												 @RequestParam("status") String status) {
+
+		ShiroUser shiroUser = getShiroUser();
+		boolean b = shiroUser.getRoleNames().stream().anyMatch(data -> StringUtils.equalsAny(data, "系统管理员", "超级管理员"));
+		if (!b) {
+			return ResponseData.error("无权审核");
+		}
+		if (!"1".equals(status) && !"2".equals(status)) {
+			return ResponseData.error("审核状态错误");
+		}
+		List<Integer> list = new ArrayList<>();
+		List<String> list1 = new ArrayList<>();
+		Wrapper<HhrActivity> wrapper = new EntityWrapper<>();
+		if(id != null && StringUtils.isNotBlank(id)){
+			wrapper.eq("id",id);
+		}else {
+			list1 = Arrays.asList(ids.split(",")); //[a, b, c]
+			for (String s : list1) {
+				list.add(Integer.valueOf(s));
+			}
+			wrapper.in("id",list);
+		}
+		HhrActivity hhrActivity = new HhrActivity();
+		hhrActivity.setStatus(status);
+		hhrActivity.setUpdateTime(new Date());
+		Integer integer = activityMapper.update(hhrActivity,wrapper);
+
+		if (integer > 0) {
+			return ResponseData.success("", "审核成功！");
+		}
+
+		return ResponseData.error("审核失败！");
+	}
+
 	/**
      * 查询活动列表
      *
@@ -272,7 +315,7 @@ public class ActivityController extends BaseController {
 			return ResponseData.error("查询失败！");
 		}
 	}
-    
+
 	/**
      * 获取活动信息
      *
@@ -286,7 +329,7 @@ public class ActivityController extends BaseController {
 
         return ResponseData.success(activityMap, "查询成功");
     }
-    
+
     @Permission(menuname = "上传图片",value = "uploadImg", method = RequestMethod.POST)
     public ResponseData<String> uploadImg(@RequestParam("picture") String picture) {
         ShiroUser user = getShiroUser();
@@ -298,5 +341,5 @@ public class ActivityController extends BaseController {
         }
         return ResponseData.error("上传图片失败！");
     }
-    
+
 }