diff --git a/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java b/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java index cb4aadb..1764982 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java @@ -90,6 +90,7 @@ public class ActivityBasicScopeController { FROM `vw_user` u LEFT JOIN sys_user_role sur on sur.userid = u.id + LEFT JOIN club_user clubuser ON clubuser.userid=u.id $condition """); try { @@ -201,8 +202,8 @@ public class ActivityBasicScopeController { } @At - public Object getRoleListByMenuId(String menuId) { - return Result.success(dao.query(Sys_role.class, Cnd.where("system_name", "=", menuId).desc("code"))); + public Object getRoleListByMenuId() { + return Result.success(dao.query(Sys_role.class, Cnd.NEW().desc("code"))); } @@ -350,7 +351,6 @@ public class ActivityBasicScopeController { cnd.andEX("u.personType", IN_OR_NIN_OP, activityUserScopePageParam.getPersonTypes()); cnd.andEX("u.userState", IN_OR_NIN_OP, activityUserScopePageParam.getUserStates()); cnd.andEX("u.sex", IN_OR_NIN_OP, activityUserScopePageParam.getSexTypes()); - cnd.andEX("sur.jdhid", EQ_OR_NEQ_OP, activityUserScopePageParam.getTeacherMeetingId()); cnd.andEX("sur.roleid", IN_OR_NIN_OP, activityUserScopePageParam.getRoleIds()); cnd.andEX("clubuser.clubid", EQ_OR_NEQ_OP, activityUserScopePageParam.getClubId()); diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyUserController.java b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyUserController.java index ba7dc86..c6ec823 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyUserController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyUserController.java @@ -115,11 +115,14 @@ public class ActivityCultureApplyUserController { @At @SaCheckLogin @ApiOperation(value = "队友搜索") - public Result queryTeammate(@Valid String keyword) { + public Result queryTeammate(@Valid String keyword,Integer signUpMethod) { Sql sql = Sqls.create("select id userId,username userName,loginname loginName,sex,mobile,unitName from vw_user $condition limit 0,10"); Cnd cnd = Cnd.NEW(); cnd.or(Cnd.likeEX("username", keyword)); cnd.or(Cnd.likeEX("loginname", keyword)); + if (signUpMethod == 3){ + cnd.and("unionid", "=", SecurityUtil.getUnionId()); + } sql.setCondition(cnd); List list = activityCultureApplyUserService.listMap(sql); return Result.success(list); @@ -142,6 +145,16 @@ public class ActivityCultureApplyUserController { return Result.success(list); } + @At + @SaCheckLogin + @ApiOperation(value = "查询分工会报名人员") + public Result listTeamUserUnion(@Valid String activityId) { + List list = dao.query(ActivityTissuePerson.class, Cnd.where(ActivityTissuePerson::getTissueId, "=", activityId) + .and(ActivityTissuePerson::getApplyUserId, "=", SecurityUtil.getUserId()) + ); + return Result.success(list); + } + @At @SaCheckLogin @ApiOperation(value = "是否报名") diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureApplyUserServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureApplyUserServiceImpl.java index 92b34c2..78f8f93 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureApplyUserServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureApplyUserServiceImpl.java @@ -129,8 +129,9 @@ public class ActivityCultureApplyUserServiceImpl extends BaseServiceImpl totalUserNumberLimit) { throw new BaseException("报名名额已满！"); } } @@ -139,19 +140,18 @@ public class ActivityCultureApplyUserServiceImpl extends BaseServiceImpl 0)) { + int hasRegisterCount = count(sql);*/ + if (personIds.size() > limitNumByUnion) { throw new BaseException("该分工会报名名额已满！"); } } @@ -202,6 +202,8 @@ public class ActivityCultureApplyUserServiceImpl extends BaseServiceImpl fullPersonList = listEntity(sql); + insert(fullPersonList); } } diff --git a/src/main/java/com/budwk/app/zhgh/activity/sports/controller/ActivitySportsApplyUserController.java b/src/main/java/com/budwk/app/zhgh/activity/sports/controller/ActivitySportsApplyUserController.java index fb9ee0b..d06b684 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/sports/controller/ActivitySportsApplyUserController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/sports/controller/ActivitySportsApplyUserController.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil; import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; +import com.budwk.app.sys.models.Sys_user; import com.budwk.app.zhgh.activity.sports.models.ActivitySchoolApply; import com.budwk.app.zhgh.activity.sports.param.ActivitySportsApplyUserPageParam; import com.budwk.app.zhgh.activity.sports.service.ActivitySportsApplyUserService; @@ -13,6 +14,7 @@ import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; +import org.nutz.dao.util.cri.SqlExpressionGroup; import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; @@ -222,4 +224,24 @@ public class ActivitySportsApplyUserController { return Result.success(applyList); } + + @At + @SaCheckPermission("activity.apply") + public Result getSysUser(String queryString,String[] loginnames){ + Cnd cnd = Cnd.NEW(); + cnd.andEX("loginname", "not in", loginnames); + if (StrUtil.isNotBlank(queryString)) { + SqlExpressionGroup group = new SqlExpressionGroup(); + group.andLike("username", queryString).orLike("loginname", queryString); + cnd.and(group); + } + + Sql sql = Sqls.create("select id,loginname,username,sex,mobile,unitId,birthday,idcard from `vw_user` $condition LIMIT 30"); + sql.setCondition(cnd); + sql.setCallback(Sqls.callback.entities()); + sql.setEntity(activitySportsApplyUserService.getEntity()); + List list = dao.execute(sql).getList(Sys_user.class); + return Result.success(list); + } + } diff --git a/src/main/java/com/budwk/app/zhgh/activity/sports/h5Controller/H5ActivitySportsApplyUserController.java b/src/main/java/com/budwk/app/zhgh/activity/sports/h5Controller/H5ActivitySportsApplyUserController.java index fcda342..2dd809a 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/sports/h5Controller/H5ActivitySportsApplyUserController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/sports/h5Controller/H5ActivitySportsApplyUserController.java @@ -1,17 +1,35 @@ package com.budwk.app.zhgh.activity.sports.h5Controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; import com.budwk.app.base.result.Result; +import com.budwk.app.sys.views.View_user; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.activity.basic.models.ActivityBasicUnion; +import com.budwk.app.zhgh.activity.basic.models.ActivityBasicUnit; +import com.budwk.app.zhgh.activity.basic.models.ActivityEvent; +import com.budwk.app.zhgh.activity.basic.models.ActivityUserScope; import com.budwk.app.zhgh.activity.sports.models.ActivitySchool; +import com.budwk.app.zhgh.activity.sports.models.ActivitySchoolApply; +import com.budwk.app.zhgh.activity.sports.models.ActivitySchoolEvent; +import com.budwk.app.zhgh.activity.sports.models.ActivitySchoolTeam; import com.budwk.app.zhgh.activity.sports.param.ActivitySportsApplyUserPageParam; import com.budwk.app.zhgh.activity.sports.service.ActivitySportsApplyUserService; +import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Lang; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Param; import javax.validation.Valid; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.List; /** * @ClassName H5ActivitySportsApplyUserController @@ -26,6 +44,9 @@ public class H5ActivitySportsApplyUserController { @Inject private ActivitySportsApplyUserService activitySportsApplyUserService; + @Inject + private Dao dao; + @At("/applyUser") @Ok("beetl:platform/zhghh5/activity/sports/applyUser.html") @SaCheckPermission("h5.activity.sports.applyUser") @@ -60,5 +81,142 @@ public class H5ActivitySportsApplyUserController { } + @At + @SaCheckPermission("h5.activity.sports.applyUser") + public Result signUpUser(@Valid String activityId, @Valid String eventId, @Valid String schoolEventId, @Valid String teamId) { + View_user user = dao.fetch(View_user.class, Cnd.where(View_user::getId, "=", SecurityUtil.getUserId())); + ActivitySchoolEvent schoolEvent = dao.fetch(ActivitySchoolEvent.class, schoolEventId); + ActivityEvent activityEvent = dao.fetch(ActivityEvent.class, eventId); + ActivitySchool activitySchool = dao.fetch(ActivitySchool.class, activityId); + ActivitySchoolTeam schoolTeam = dao.fetch(ActivitySchoolTeam.class, teamId); + + ActivityBasicUnit basicUnit = dao.fetch(ActivityBasicUnit.class, Cnd.where("id", "=", SecurityUtil.getUnitId())); + ActivityBasicUnion basicUnion = dao.fetch(ActivityBasicUnion.class, Cnd.where("id", "=", basicUnit.getUnionId())); + if (Lang.isEmpty(basicUnion)) { + return Result.error("请先设置活动工会"); + } + + + //判断是否在活动组别内 + int count = dao.count(ActivityUserScope.class, + Cnd.where(ActivityUserScope::getGroupId, "=", activitySchool.getActivityGroupId()) + .and(ActivityUserScope::getUserId, "=", SecurityUtil.getUserId())); + if (count == 0) { + return Result.error("您没有权限参与该活动"); + } + //如果不等于空代表是个人项目 + if (ObjectUtil.isNotEmpty(activityEvent.getIsMenWomen())) { + if (activityEvent.getIsMenWomen() == 1 && !user.getSex().equals("男")) { + return Result.error("当前项目只能男性能报名！"); + } + if (activityEvent.getIsMenWomen() == 2 && !user.getSex().equals("女")) { + return Result.error("当前项目只能女性能报名！"); + } + } + List schoolApplyList = dao.query(ActivitySchoolApply.class, + Cnd.where(ActivitySchoolApply::getActivityId, "=", activityId) + .and(ActivitySchoolApply::getEventId, "=", eventId) + .and(ActivitySchoolApply::getActivityUnionId, "=", basicUnit.getId()) + .and(ActivitySchoolApply::getApplyUser, "!=", SecurityUtil.getUserId())); + + + if (ObjectUtil.isNotEmpty(schoolEvent.getRestrictGirlNum()) && user.getSex().equals("女")) { + if (schoolEvent.getRestrictGirlNum() == 0) { + return Result.error("当前项目女性没有报名名额！"); + } + //找出当前工会女性报名的数量 + int size = schoolApplyList.stream().filter(girl -> girl.getSex().equals("女")).toList().size(); + //数量加上自己如果大于配置的 + if (size + 1 > schoolEvent.getRestrictGirlNum()) { + return Result.error("当前项目女性只能报名" + schoolEvent.getRestrictGirlNum() + "人！"); + } + } + + if (ObjectUtil.isNotEmpty(schoolEvent.getRestrictBoyNum()) && user.getSex().equals("男")) { + if (schoolEvent.getRestrictBoyNum() == 0) { + return Result.error("当前项目男性没有报名名额！"); + } + //找出当前工会男性报名的数量 + int size = schoolApplyList.stream().filter(girl -> girl.getSex().equals("男")).toList().size(); + //数量加上自己如果大于配置的 + if (size + 1 > schoolEvent.getRestrictBoyNum()) { + return Result.error("当前项目男性只能报名" + schoolEvent.getRestrictGirlNum() + "人！"); + } + } + + + if (ObjectUtil.isNotEmpty(schoolEvent.getStartAgeDate()) && ObjectUtil.isNotEmpty(schoolEvent.getEndAgeDate())) { + //如果年龄做了判断 + try { + if (ObjectUtil.isEmpty(user.getBirthday())) { + return Result.error("请先完善您的出生日期"); + } + // 需要先将字符串转换为日期进行比较 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Date startAgeDate = sdf.parse(schoolEvent.getStartAgeDate()); + Date endAgeDate = sdf.parse(schoolEvent.getEndAgeDate()); + if (user.getBirthday().getTime() < startAgeDate.getTime() || user.getBirthday().getTime() > endAgeDate.getTime()) { + return Result.error("您年龄不在报名时间段内"); + } + } catch (Exception e) { + return Result.error("年龄格式解析错误"); + } + } + + ActivitySchoolApply schoolApply = new ActivitySchoolApply(); + schoolApply.setActivityId(activityId); + schoolApply.setEventId(eventId); + schoolApply.setUnionname(user.getUnionName()); + schoolApply.setAwardsMode(activityEvent.getProjectType()); + schoolApply.setUnitId(user.getUnitId()); + schoolApply.setUnionId(user.getUnionId()); + schoolApply.setActivityUnionId(basicUnion.getId()); + schoolApply.setActivityUnionName(basicUnion.getName()); + schoolApply.setUserId(SecurityUtil.getUserId()); + schoolApply.setApplyUser(SecurityUtil.getUserId()); + schoolApply.setBirthday(ObjectUtil.isNotEmpty(user.getBirthday()) ? String.valueOf(user.getBirthday()) : null); + schoolApply.setApplyDate(DateUtil.now()); + schoolApply.setIdentity(List.of("1")); + if (activitySchool.getApplyWay().size() == 2 && activitySchool.getApplyWay().contains(1)) { + schoolApply.setStatus(0); + } else if (activitySchool.getApplyWay().size() == 1 && activitySchool.getApplyWay().contains(1)) { + schoolApply.setStatus(2); + } + schoolApply.setUnitname(user.getUnitName()); + schoolApply.setTeamId(schoolTeam.getId()); + schoolApply.setTeam(schoolTeam.getName()); + schoolApply.setLoginname(user.getLoginname()); + schoolApply.setUsername(user.getUsername()); + schoolApply.setMobile(user.getMobile()); + schoolApply.setSex(user.getSex()); + dao.insert(schoolApply); + return Result.success(); + } + + + @At + @SaCheckPermission("h5.activity.sports.applyUser") + public Result cancelApply(@Valid String activityId, @Valid String eventId, @Valid String schoolEventId) { + int count = dao.count(ActivitySchoolApply.class, + Cnd.where(ActivitySchoolApply::getUserId, "=", SecurityUtil.getUserId()) + .and(ActivitySchoolApply::getActivityId, "=", activityId) + .and(ActivitySchoolApply::getEventId, "=", eventId).and(ActivitySchoolApply::getStatus, "=", 2)); + if (count > 0) { + return Result.error("您已报名成功无法取消，请联系管理员取消！"); + } + + dao.clear(ActivitySchoolApply.class, Cnd.where(ActivitySchoolApply::getUserId, "=", SecurityUtil.getUserId()) + .and(ActivitySchoolApply::getActivityId, "=", activityId).and(ActivitySchoolApply::getEventId, "=", eventId)); + return Result.success(); + } + + + @At + @SaCheckPermission("h5.activity.sports.applyUser") + public Result listTeamList(@Valid String activityId, @Valid String eventId) { + return Result.success(dao.query(ActivitySchoolTeam.class, Cnd.where(ActivitySchoolTeam::getActivityId, "=", activityId) + .and(ActivitySchoolTeam::getEventId, "=", eventId).asc(ActivitySchoolTeam::getLocation))); + } + } diff --git a/src/main/java/com/budwk/app/zhgh/activity/sports/models/ActivitySchool.java b/src/main/java/com/budwk/app/zhgh/activity/sports/models/ActivitySchool.java index e116bd6..7de41ca 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/sports/models/ActivitySchool.java +++ b/src/main/java/com/budwk/app/zhgh/activity/sports/models/ActivitySchool.java @@ -20,7 +20,7 @@ import java.util.List; @Data @Comment("体育活动") @Table("activity_school") -public class ActivitySchool extends BaseModel implements Serializable , SysHomeConvert { +public class ActivitySchool extends BaseModel implements Serializable, SysHomeConvert { @Column @Name @@ -171,7 +171,7 @@ public class ActivitySchool extends BaseModel implements Serializable , SysHomeC @Column @Comment("小程序活动封面") - @ColDefine(type = ColType.VARCHAR,width = 100) + @ColDefine(type = ColType.VARCHAR, width = 100) private String image; @Many(field = "activityId") @@ -205,7 +205,11 @@ public class ActivitySchool extends BaseModel implements Serializable , SysHomeC sysHomeActivity.setName(this.getName()); sysHomeActivity.setCover(this.getImage()); sysHomeActivity.setUrl("/platform/activity/apply"); - sysHomeActivity.setH5Url(null); + if (this.applyWay.contains(2)) { + sysHomeActivity.setH5Url("/platform/h5/activity/apply/applyUser?activityId=" + this.getId()); + } else { + sysHomeActivity.setH5Url(null); + } sysHomeActivity.setStartDate(DateUtil.parseDate(this.getApplyStartTime())); sysHomeActivity.setEndDate(DateUtil.parseDate(this.getApplyEndTime())); sysHomeActivity.setAllowUserGroupId(this.getActivityGroupId()); diff --git a/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java index fab9b64..103697a 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java @@ -1,6 +1,7 @@ package com.budwk.app.zhgh.activity.sports.service.impl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.page.Pagination; @@ -53,6 +54,9 @@ public class ActivitySportsApplyUserServiceImpl extends BaseServiceImpl0")); cnd.and(new Static("(SELECT COUNT(1) FROM activity_user_scope WHERE groupId=school.activityGroupId AND userId='%s') >0".formatted(SecurityUtil.getUserId()))); } - cnd.and("YEAR(school.applyStartTime)", "=", year); + cnd.andEX("YEAR(school.applyStartTime)", "=", year); cnd.desc("school.applyStartTime"); sql.setCondition(cnd); @@ -339,7 +346,8 @@ public class ActivitySportsApplyUserServiceImpl extends BaseServiceImpl awardsModeG = list.stream().filter(v -> v.getAwardsMode().equals("1")).collect(Collectors.toList()); list.forEach(v -> { - if (Strings.isNotBlank(v.getBirthday())) { + if (ObjectUtil.isNotEmpty(v.getBirthday())) { + String birthday = v.getBirthday(); v.setAge(cn.hutool.core.date.DateUtil.ageOfNow(v.getBirthday())); } }); @@ -372,6 +380,7 @@ public class ActivitySportsApplyUserServiceImpl extends BaseServiceImpl System.currentTimeMillis()){ + return Result.error("申请事项未开始"); + } + if(notice.getEndTime().getTime() < System.currentTimeMillis()){ + return Result.error("申请事项已结束"); + } warmthCondolence.setNo(warmthCondolenceService.createNo(warmthCondolence)); warmthCondolenceService.insertOrUpdate(warmthCondolence); - bpmService.startSaveProcessInstance(BpmProcessConstant.WARMTH_CONDOLENCE.name(), warmthCondolence.getUserName()+"的申请", warmthCondolence.getId(), null); + bpmService.startSaveProcessInstance(BpmProcessConstant.WARMTH_CONDOLENCE.name(), warmthCondolence.getUserName() + "的申请", warmthCondolence.getId(), null); return Result.success(); } @@ -60,22 +73,32 @@ public class WarmthCondolenceApplyController { @ApiOperation("提交") @Aop(TransAop.READ_COMMITTED) @SLog(tag = "送温暖慰问申请", msg = "送温暖慰问申请") - public Result submit(@Param("warmthCondolence")@Valid WarmthCondolence warmthCondolence){ + public Result submit(@Param("warmthCondolence") @Valid WarmthCondolence warmthCondolence) { + WarmthCondolenceNotice notice = warmthCondolenceService.dao().fetch(WarmthCondolenceNotice.class, warmthCondolence.getNoticeId()); + if (Lang.isEmpty(notice)) { + return Result.error("未找到申请事项"); + } + if(notice.getStartTime().getTime() > System.currentTimeMillis()){ + return Result.error("申请事项未开始"); + } + if(notice.getEndTime().getTime() < System.currentTimeMillis()){ + return Result.error("申请事项已结束"); + } warmthCondolence.setNo(warmthCondolenceService.createNo(warmthCondolence)); warmthCondolenceService.insertOrUpdate(warmthCondolence); //查询分工会审批人工号 String branchUnionApprovalLoginName = commonService.findUserLoginNameByRoleCode(RoleConstant.BRANCH_UNION_CHAIRMAN, Cnd.where(Sys_user_role::getUnionId, "=", warmthCondolence.getUnionId())); - if(StrUtil.isBlank(branchUnionApprovalLoginName)){ + if (StrUtil.isBlank(branchUnionApprovalLoginName)) { return Result.error("分工会未配置审批人，请联系校工会！"); } - bpmService.startSubmitProcessInstance(BpmProcessConstant.WARMTH_CONDOLENCE.name(), warmthCondolence.getUserName()+"的申请", warmthCondolence.getId(), List.of(branchUnionApprovalLoginName),null); + bpmService.startSubmitProcessInstance(BpmProcessConstant.WARMTH_CONDOLENCE.name(), warmthCondolence.getUserName() + "的申请", warmthCondolence.getId(), List.of(branchUnionApprovalLoginName), null); return Result.success(); } @At @SaCheckPermission("warmthCondolence.apply") @ApiOperation("详情") - public Result info(@Valid String id){ + public Result info(@Valid String id) { WarmthCondolence condolence = warmthCondolenceService.fetch(id); return Result.success(condolence); } diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/warmthCondolence/controller/WarmthCondolenceCommonController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/warmthCondolence/controller/WarmthCondolenceCommonController.java index 6346561..495d94f 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/warmthCondolence/controller/WarmthCondolenceCommonController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/warmthCondolence/controller/WarmthCondolenceCommonController.java @@ -46,7 +46,7 @@ public class WarmthCondolenceCommonController { @SaCheckPermission("warmthCondolence") public Result listNotice(){ List list = warmthCondolenceNoticeService.query(Cnd.where(WarmthCondolenceNotice::getEnable, "=", 1) - .asc(WarmthCondolenceNotice::getStartTime)); + .desc(WarmthCondolenceNotice::getStartTime)); return Result.success(list); } diff --git a/src/main/resources/static/components/module/activity/UserScope.vue b/src/main/resources/static/components/module/activity/UserScope.vue index 8627ddb..f104b25 100644 --- a/src/main/resources/static/components/module/activity/UserScope.vue +++ b/src/main/resources/static/components/module/activity/UserScope.vue @@ -1,773 +1,686 @@ diff --git a/src/main/resources/views/platform/zhgh/activity/sports/infoManage/addActivity.js b/src/main/resources/views/platform/zhgh/activity/sports/infoManage/addActivity.js index d01fed0..8c44398 100644 --- a/src/main/resources/views/platform/zhgh/activity/sports/infoManage/addActivity.js +++ b/src/main/resources/views/platform/zhgh/activity/sports/infoManage/addActivity.js @@ -270,7 +270,7 @@ let ACTIVITY_SPORTS_ADD_ACTIVITY = { - + { if (res.code === 0) { this.$message.success(res.msg) + this.$store.dispatch("pjaxRoute", "/platform/warmthCondolence/mine") } }) } diff --git a/src/main/resources/views/platform/zhgh/dayofficework/warmthCondolence/notice/index.html b/src/main/resources/views/platform/zhgh/dayofficework/warmthCondolence/notice/index.html index 64ffaaa..6bdd7a5 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/warmthCondolence/notice/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/warmthCondolence/notice/index.html @@ -129,13 +129,13 @@ layout("/layouts/platform.html"){ } }) }, - doDelete(id) { + doDelete(row) { this.$confirm("您确定要删除吗？", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning" }).then(() => { - this.$axios.post("/platform/warmthCondolenceNotice/delete", { id: id }).then((res) => { + this.$axios.post("/platform/warmthCondolenceNotice/delete", { id: row.id }).then((res) => { if (res.code === 0) { this.$message.success(res.msg) this.doSearch() diff --git a/src/main/resources/views/platform/zhghh5/activity/culture/signUp.html b/src/main/resources/views/platform/zhghh5/activity/culture/signUp.html index e6d1cab..1342c37 100644 --- a/src/main/resources/views/platform/zhghh5/activity/culture/signUp.html +++ b/src/main/resources/views/platform/zhghh5/activity/culture/signUp.html @@ -191,8 +191,8 @@ layout("/layouts/platform_h5.html"){ 报名方式： 个人报名 - 分工会报名 - 组队报名 + 组队报名 + 分工会报名
@@ -277,6 +277,51 @@ layout("/layouts/platform_h5.html"){
+ +
+
选择报名人员 + + ，报名人数 + {{viewData.unionTeamNum}}人 + +
+ + + + + 添加 + + + + + + + + + + + + + +
+
填写报名信息
{ if (res.code === 0) { this.viewData = res.data + //总人数限制 + if (this.viewData.userNumberLimit === 1) { + } else if (this.viewData.userNumberLimit === 2) { + //分工会人数限制 + const union = this.viewData.unionUserNumberLimit.find(v => v.id === this.$store.state.user.union.id) + this.viewData.unionTeamNum = union.limitNum + } + if (this.viewData.signUpMethod === 3) { + this.listTeamUserUnion() + } else { + this.listTeamUser() + } if (this.viewData.formConfig) { this.formCreateRule = formCreate.parseJson(this.viewData.formConfig.rule) this.formCreateOption = formCreate.parseJson(this.viewData.formConfig.options) } - this.listTeamUser() } }) } @@ -382,6 +438,17 @@ layout("/layouts/platform_h5.html"){ } }) }, + //查询报名人员 + listTeamUserUnion() { + this.$axios.post("/platform/activity/culture/applyUser/listTeamUserUnion", {activityId: this.id}).then((res) => { + if (res.code === 0) { + this.isSignUp = res.data.length > 0 + this.teamUsers = res.data + this.defaultAddSelf() + this.customFormInit() + } + }) + }, //表单回显 customFormInit() { if (this.teamUsers && this.teamUsers.length > 0) { @@ -467,7 +534,7 @@ layout("/layouts/platform_h5.html"){ }) return } - if (this.teamUsers.length > this.viewData.teamNum) { + if (this.viewData.teamNum && this.teamUsers.length > this.viewData.teamNum) { this.$dialog .alert({ title: "提示", @@ -499,7 +566,11 @@ layout("/layouts/platform_h5.html"){ this.$axios.post("/platform/activity/culture/applyUser/signUp", formData).then((res) => { if (res.code === 0) { this.$toast.success(res.msg) - this.listTeamUser() + if (this.viewData.signUpMethod === 3) { + this.listTeamUserUnion() + } else { + this.listTeamUser() + } } }) }) @@ -568,7 +639,7 @@ layout("/layouts/platform_h5.html"){ }) return } - if (this.teamUsers.length > this.viewData.teamNum) { + if (this.viewData.teamNum && this.teamUsers.length > this.viewData.teamNum) { this.$dialog .alert({ title: "提示", @@ -601,7 +672,11 @@ layout("/layouts/platform_h5.html"){ this.$axios.post("/platform/activity/culture/applyUser/signUp", formData).then((res) => { if (res.code === 0) { this.$toast.success(res.msg) - this.listTeamUser() + if (this.viewData.signUpMethod === 3) { + this.listTeamUserUnion() + } else { + this.listTeamUser() + } } }) }) @@ -618,7 +693,11 @@ layout("/layouts/platform_h5.html"){ this.$axios.post("/platform/activity/culture/applyUser/cancelSignUp", {activityId: this.id}).then((res) => { if (res.code === 0) { this.$toast.success(res.msg) - this.listTeamUser() + if (this.viewData.signUpMethod === 3) { + this.listTeamUserUnion() + } else { + this.listTeamUser() + } this.fapi.resetFields() } }) @@ -628,7 +707,10 @@ layout("/layouts/platform_h5.html"){ //查询队友信息 queryTeammate(val) { if (val) { - this.$axios.post("/platform/activity/culture/applyUser/queryTeammate", {keyword: val}).then((res) => { + this.$axios.post("/platform/activity/culture/applyUser/queryTeammate", { + keyword: val, + signUpMethod: this.viewData.signUpMethod + }).then((res) => { if (res.code === 0) { res.data.map(v => { v.applyUserId = this.$store.state.user.id @@ -663,7 +745,7 @@ layout("/layouts/platform_h5.html"){ }) return } - if (this.teamUsers.length >= this.viewData.teamNum) { + if (this.viewData.teamNum && this.teamUsers.length >= this.viewData.teamNum) { this.$dialog .alert({ title: "提示", diff --git a/src/main/resources/views/platform/zhghh5/activity/sports/applyUser.html b/src/main/resources/views/platform/zhghh5/activity/sports/applyUser.html index 70c89fb..3618ecd 100644 --- a/src/main/resources/views/platform/zhghh5/activity/sports/applyUser.html +++ b/src/main/resources/views/platform/zhghh5/activity/sports/applyUser.html @@ -8,7 +8,8 @@ layout("/layouts/platform_h5.html"){
- + @@ -81,10 +82,11 @@ layout("/layouts/platform_h5.html"){ diff --git a/src/main/resources/views/platform/zhghh5/activity/sports/eventList.html b/src/main/resources/views/platform/zhghh5/activity/sports/eventList.html index ede8c40..6f4f89b 100644 --- a/src/main/resources/views/platform/zhghh5/activity/sports/eventList.html +++ b/src/main/resources/views/platform/zhghh5/activity/sports/eventList.html @@ -5,16 +5,17 @@ layout("/layouts/platform_h5.html"){
- +
@@ -25,11 +26,16 @@ layout("/layouts/platform_h5.html"){
@@ -54,31 +60,54 @@ layout("/layouts/platform_h5.html"){ 0人 - + - + + 取消报名 + +
+
+ + 报 名 + + + 取消报名 + +
+ +
- +