Skip to content

G
gdtel-gztel-school-center
Commit 97451bd7 by 罗承锋
Options

后台活动提交

parent 68e6d997
Showing with 93 additions and 12 deletions
common/src/main/java/com/winsun/bean/activity/HhrActivity.java
...@@ -32,7 +32,7 @@ public class HhrActivity implements Serializable{ ...@@ -32,7 +32,7 @@ public class HhrActivity implements Serializable{
/** /**
* 活动积分 * 活动积分
*/ */
private int integral; private Integer integral;
/** /**
* 活动封面图片 * 活动封面图片
...@@ -50,6 +50,16 @@ public class HhrActivity implements Serializable{ ...@@ -50,6 +50,16 @@ public class HhrActivity implements Serializable{
private String subclass; private String subclass;
/** /**
* 县分
*/
private String subName;
/**
* 学校
*/
private String subSchool;
/**
* 学生证照片 * 学生证照片
*/ */
private String range; private String range;
...@@ -65,6 +75,11 @@ public class HhrActivity implements Serializable{ ...@@ -65,6 +75,11 @@ public class HhrActivity implements Serializable{
private Integer sort; private Integer sort;
/** /**
* 是否县分项目
*/
private Integer isSubName;
/**
* 创建时间 * 创建时间
*/ */
private Date createTime; private Date createTime;
......
common/src/main/resources/com/winsun/mapper/mapping/OrderMapper.xml
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
<!-- 更新未下单并且融合时间小于当前时间的订单 --> <!-- 更新未下单并且融合时间小于当前时间的订单 -->
<update id="updateNosendAndRhTimeLtNowOrder"> <update id="updateNosendAndRhTimeLtNowOrder">
update hhr_order set order_status = "待受理" where rh_time &lt; #{now} and order_status = "未下单" update hhr_order set order_status = "待受理",remarks="融合时间已过当前时间" where rh_time &lt; #{now} and order_status = "未下单"
</update> </update>
<!-- 00：移动通报学校 --> <!-- 00：移动通报学校 -->
......
service-manager/src/main/java/com/winsun/controller/ActivityController.java
...@@ -5,6 +5,7 @@ import java.util.List; ...@@ -5,6 +5,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
import com.winsun.mapper.HhrUserMapper;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -38,13 +39,12 @@ import com.winsun.utils.PicturesUtil; ...@@ -38,13 +39,12 @@ import com.winsun.utils.PicturesUtil;
@RequestMapping("/activity") @RequestMapping("/activity")
public class ActivityController extends BaseController { public class ActivityController extends BaseController {
private static ActivityMapper activityMapper; @Autowired
private ActivityMapper activityMapper;
private static String PATH_TYPE = "activity"; private static String PATH_TYPE = "activity";
@Autowired @Autowired
public ActivityController(ActivityMapper activityMapper) { private HhrUserMapper hhrUserMapper;
ActivityController.activityMapper = activityMapper;
}
@Permission(menuname = "查询活动信息", value = "list", method = RequestMethod.POST) @Permission(menuname = "查询活动信息", value = "list", method = RequestMethod.POST)
public ResponseData<Page<HhrActivity>> list(@RequestParam("title") String title, public ResponseData<Page<HhrActivity>> list(@RequestParam("title") String title,
...@@ -59,6 +59,7 @@ public class ActivityController extends BaseController { ...@@ -59,6 +59,7 @@ public class ActivityController extends BaseController {
wrapper.eq(StringUtils.isNotBlank(activityType), "activity_type", activityType); wrapper.eq(StringUtils.isNotBlank(activityType), "activity_type", activityType);
wrapper.eq(StringUtils.isNotBlank(subclass), "subclass", subclass); wrapper.eq(StringUtils.isNotBlank(subclass), "subclass", subclass);
wrapper.eq("del_flag", 0); wrapper.eq("del_flag", 0);
wrapper.eq(StringUtils.isNotBlank(status), "status", status);
Page<HhrActivity> page = new Page<>(pageIndex, pageSize); Page<HhrActivity> page = new Page<>(pageIndex, pageSize);
List<HhrActivity> list = activityMapper.selectPage(page, wrapper); List<HhrActivity> list = activityMapper.selectPage(page, wrapper);
...@@ -74,6 +75,21 @@ public class ActivityController extends BaseController { ...@@ -74,6 +75,21 @@ public class ActivityController extends BaseController {
ShiroUser user = getShiroUser(); ShiroUser user = getShiroUser();
// 添加活动权限
boolean hasDataPermission = user.getRoleNames().stream().anyMatch(data -> StringUtils.equalsAny(data, "县分管理员（订单）", "系统管理员", "超级管理员"));
if (!hasDataPermission) {
return ResponseData.error("无数据权限！");
}
// 获取当前用户所属县分
List<Map<String, Object>> maps = hhrUserMapper.selectHehuorenSchool(user.getId() + "");
String subName = "";
String subSchool = "";
if (maps != null && maps.size() != 0) {
subName = maps.get(0).get("sub_name") != null ? maps.get(0).get("sub_name").toString() : "";
subSchool = maps.get(0).get("school_name") != null ? maps.get(0).get("school_name").toString() : "";
}
HhrActivity activity = new HhrActivity(); HhrActivity activity = new HhrActivity();
activity.setTitle(title); activity.setTitle(title);
activity.setDesc(desc); activity.setDesc(desc);
...@@ -82,16 +98,36 @@ public class ActivityController extends BaseController { ...@@ -82,16 +98,36 @@ public class ActivityController extends BaseController {
activity.setSubclass(subclass); activity.setSubclass(subclass);
activity.setSort(Integer.parseInt(sort)); activity.setSort(Integer.parseInt(sort));
activity.setRange(range); activity.setRange(range);
activity.setIsSubName(0);
activity.setImageUrl(imageUrl); activity.setImageUrl(imageUrl);
activity.setCreator(user.getName()); activity.setCreator(user.getName());
activity.setCreateTime(new Date()); activity.setCreateTime(new Date());
activity.setUpdateTime(new Date()); activity.setUpdateTime(new Date());
activity.setSubName(subName);
activity.setSubSchool(subSchool);
boolean isSubManager = user.getRoleNames().stream().anyMatch(data -> StringUtils.equalsAny(data, "县份管理员（订单）"));
if (isSubManager && "团队活动".equals(activity.getActivityType())) {
return ResponseData.error("无权限创建团队活动");
}
if (isSubManager && "个人活动".equals(activity.getActivityType())) {
activity.setIsSubName(1);
activity.setStatus("0");
activity.setRange(subName);
}else{
activity.setIsSubName(0);
activity.setStatus("1");
if ("团队活动".equals(activity.getActivityType())) {
activity.setRange("全市");
}
}
int num = activityMapper.insert(activity); int num = activityMapper.insert(activity);
if (num > 0) { if (num > 0) {
return ResponseData.success("修改完毕！"); return ResponseData.success("添加完毕！");
} }
return ResponseData.error("修改失败"); return ResponseData.error("添加失败");
} }
@Permission(menuname = "修改活动", value = "updateActivity", method = RequestMethod.POST) @Permission(menuname = "修改活动", value = "updateActivity", method = RequestMethod.POST)
...@@ -109,7 +145,6 @@ public class ActivityController extends BaseController { ...@@ -109,7 +145,6 @@ public class ActivityController extends BaseController {
activity.setActivityType(activityType); activity.setActivityType(activityType);
activity.setSubclass(subclass); activity.setSubclass(subclass);
activity.setSort(Integer.parseInt(sort)); activity.setSort(Integer.parseInt(sort));
activity.setRange(range);
activity.setImageUrl(imageUrl); activity.setImageUrl(imageUrl);
activity.setUpdateTime(new Date()); activity.setUpdateTime(new Date());
int num = activityMapper.updateById(activity); int num = activityMapper.updateById(activity);
...@@ -137,6 +172,37 @@ public class ActivityController extends BaseController { ...@@ -137,6 +172,37 @@ public class ActivityController extends BaseController {
} }
/** /**
* 审核活动
* @param activityId
* @param status
* @return
*/
@Permission(menuname = "审核活动", value = "auditActivity", method = RequestMethod.POST)
public ResponseData<String> auditActivity(@RequestParam("activityId") String activityId,@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("审核状态错误");
}
HhrActivity hhrActivity = new HhrActivity();
hhrActivity.setId(activityId);
hhrActivity.setStatus(status);
Integer integer = activityMapper.updateById(hhrActivity);
if (integer > 0) {
return ResponseData.success("", "审核成功！");
}
return ResponseData.error("审核失败！");
}
/**
* 查询活动列表 * 查询活动列表
* *
* @param pageNo 查询页码 默认首页 * @param pageNo 查询页码 默认首页
...@@ -145,13 +211,13 @@ public class ActivityController extends BaseController { ...@@ -145,13 +211,13 @@ public class ActivityController extends BaseController {
* @param subclass 查询条件-活动小类 * @param subclass 查询条件-活动小类
* @return * @return
*/ */
@ResponseBody @Permission(menuname = "获取活动列表", value = "getActivityList", method = RequestMethod.POST)
@RequestMapping(value = "getActivityList", method = RequestMethod.POST) public ResponseData<Map<String, Object>> getActivityList(Integer pageNo, Integer pageSize, String activityType, String subclass, String status) {
public ResponseData<Map<String, Object>> getActivityList(Integer pageNo, Integer pageSize, String activityType, String subclass) {
Wrapper<HhrActivity> wrapper = new EntityWrapper<HhrActivity>(); Wrapper<HhrActivity> wrapper = new EntityWrapper<HhrActivity>();
wrapper.eq(StringUtils.isNotBlank(activityType), "activity_type", activityType); wrapper.eq(StringUtils.isNotBlank(activityType), "activity_type", activityType);
wrapper.eq(StringUtils.isNotBlank(subclass), "subclass", subclass); wrapper.eq(StringUtils.isNotBlank(subclass), "subclass", subclass);
wrapper.eq(StringUtils.isNotBlank(status), "status", status);
wrapper.eq("del_flag", 0); wrapper.eq("del_flag", 0);
Page<HhrActivity> page = new Page<>(pageNo == null ? 1 : pageNo, pageSize == null ? 10 : pageSize); Page<HhrActivity> page = new Page<>(pageNo == null ? 1 : pageNo, pageSize == null ? 10 : pageSize);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment