活动审核

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

 package com.winsun.controller;
 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.School;
+import com.winsun.bean.activity.HhrActivityRecord;
 import com.winsun.mapper.HhrUserMapper;
 import com.winsun.mapper.HhrUserMapper;
 import com.winsun.mapper.SchoolMapper;
 import com.winsun.mapper.SchoolMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -107,8 +105,9 @@ public class ActivityController extends BaseController {
 		activity.setUpdateTime(new Date());
 		activity.setUpdateTime(new Date());
 		activity.setSubName(subName);
 		activity.setSubName(subName);
 		activity.setSubSchool(subSchool);
 		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())) {
 		if (isSubManager && "团队活动".equals(activity.getActivityType())) {
 			return ResponseData.error("无权限创建团队活动");
 			return ResponseData.error("无权限创建团队活动");
 		}
 		}
@@ -205,6 +204,50 @@ public class ActivityController extends BaseController {
 	}
 	}
 
 
 	/**
 	/**
+	 * 审核活动
+	 * @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("审核失败！");
+	}
+
+	/**
      * 查询活动列表
      * 查询活动列表
      *
      *
      * @param pageNo      查询页码 默认首页
      * @param pageNo      查询页码 默认首页