diff --git a/src/main/java/com/budwk/app/sys/models/Sys_user.java b/src/main/java/com/budwk/app/sys/models/Sys_user.java index ee1bb78..fe5c480 100644 --- a/src/main/java/com/budwk/app/sys/models/Sys_user.java +++ b/src/main/java/com/budwk/app/sys/models/Sys_user.java @@ -242,6 +242,16 @@ public class Sys_user extends BaseModel implements Serializable { @Default(value = "0") private Boolean member; + @Column + @Comment("会员入会日期") + @ColDefine(type = ColType.DATETIME) + private Date memberJoinTime; + + @Column + @Comment("会员离会日期") + @ColDefine(type = ColType.DATETIME) + private Date memberLeaveTime; + @Column @Comment("是否福利会员") @ColDefine(type = ColType.BOOLEAN) diff --git a/src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java b/src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java index a25e88c..7546266 100644 --- a/src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java +++ b/src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java @@ -228,6 +228,14 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService // 修改现有用户 u.setId(user.getId()); + // 本人电话、身份证不覆盖 + if (StrUtil.isNotBlank(user.getMobile())) { + u.setMobile(null); + } + if (StrUtil.isNotBlank(user.getIdCard())) { + u.setIdCard(null); + } + // 检查会员资格 boolean shouldBeMember = checkMembershipEligibility( source.getUserState(), @@ -236,10 +244,6 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService user ); - if(user.getLoginname().equals("45066")){ - System.out.println(".."); - } - // 更新会员状态 boolean currentIsMember = user.getMember() != null && user.getMember(); diff --git a/src/main/java/com/budwk/app/sys/views/View_user.java b/src/main/java/com/budwk/app/sys/views/View_user.java index f1570a5..2a7aa9b 100644 --- a/src/main/java/com/budwk/app/sys/views/View_user.java +++ b/src/main/java/com/budwk/app/sys/views/View_user.java @@ -170,4 +170,8 @@ public class View_user { @Column private Date postDoctoralJoinDate; + + private Date memberJoinTime; + + private Date memberLeaveTime; } 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/java/com/budwk/app/zhgh/staffmanage/member/controller/school/MemberSchoolUnionManageController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/school/MemberSchoolUnionManageController.java index 1727a3f..1f89c70 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/school/MemberSchoolUnionManageController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/school/MemberSchoolUnionManageController.java @@ -1,18 +1,31 @@ package com.budwk.app.zhgh.staffmanage.member.controller.school; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.bean.BeanUtil; import com.budwk.app.base.annotation.RepeatSubmit; import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.constant.BpmProcessConstant; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.result.Result; +import com.budwk.app.bpm.enums.BpmTaskApprovalTypeEnum; +import com.budwk.app.bpm.models.BpmProcessInstance; +import com.budwk.app.bpm.models.BpmProcessTask; +import com.budwk.app.bpm.param.BpmTaskApprovalParam; +import com.budwk.app.bpm.service.BpmService; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.staffmanage.member.constant.MemberChangeOrigin; import com.budwk.app.zhgh.staffmanage.member.models.MemberApplyRecord; import com.budwk.app.zhgh.staffmanage.member.param.pageform.MemberManagePageForm; import com.budwk.app.zhgh.staffmanage.member.service.MemberManageService; import lombok.extern.slf4j.Slf4j; +import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.dao.Cnd; +import org.nutz.dao.Dao; import org.nutz.dao.sql.Sql; +import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Lang; import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; @@ -20,6 +33,7 @@ import org.nutz.mvc.annotation.Param; import javax.validation.Valid; import java.util.List; +import java.util.Map; /** * @version 1.0 @@ -34,6 +48,10 @@ import java.util.List; @Ok("json") public class MemberSchoolUnionManageController { + @Inject + private Dao dao; + @Inject + private BpmService bpmService; @Inject private MemberManageService memberManageService; @@ -70,6 +88,7 @@ public class MemberSchoolUnionManageController { @At @RepeatSubmit + @Aop(TransAop.READ_COMMITTED) @SaCheckPermission("member.branchUnion.manage.list") @SLog(tag = "校工会管理-会员管理", type = "MemberBranchManageList", msg = "校工会普通变更") public Result generalMemberChange(@Param("record") MemberApplyRecord record, @Param("approvalRemark") String approvalRemark){ @@ -77,13 +96,35 @@ public class MemberSchoolUnionManageController { try { // 校验是否有变更的字段 List changeInfoList = memberManageService.compareMemberChangeInfo(record); - // 存储变更的类型 - List changeTypeList = memberManageService.compareMemberChangeType(changeInfoList, record); - record.setChangeTypes(changeTypeList); - record.setChangeOrigin(MemberChangeOrigin.SCHOOL_UNION.name()); - record.setRemark(approvalRemark); - memberManageService.insert(record); - memberManageService.compareMemberChangeInfoAndUpdateUser(record); + + if (Lang.isNotEmpty(changeInfoList)) { + // 存储变更的类型 + List changeTypeList = memberManageService.compareMemberChangeType(changeInfoList, record); + record.setChangeTypes(changeTypeList); + record.setChangeOrigin(MemberChangeOrigin.SCHOOL_UNION.name()); + record.setRemark(approvalRemark); + memberManageService.insert(record); + + // 开启流程，留痕 + bpmService.startSubmitProcessInstance(BpmProcessConstant.MEMBER_BRANCH_UNION_CHANGE.name(), + "【会员分工会变更】" +record.getUsername(), record.getId(), + List.of(SecurityUtil.getUserLoginname()), null); + // 然后完成申请流程 + BpmProcessInstance committeeInstance = dao.fetch(BpmProcessInstance.class, Cnd.where("processInstanceBusinessId", "=", record.getId())); + BpmProcessTask committeeTask = dao.fetch(BpmProcessTask.class, Cnd.where(BpmProcessTask::getProcessInstanceId, "=", committeeInstance.getId()) + .desc(BpmProcessTask::getCreatedAt)); + BpmTaskApprovalParam committeeParam = new BpmTaskApprovalParam(); + committeeParam.setProcessInstanceId(committeeInstance.getId()); + committeeParam.setProcessInstanceBusinessId(record.getId()); + committeeParam.setProcessInstanceTaskId(committeeTask.getId()); + committeeParam.setBpmTaskApprovalType(BpmTaskApprovalTypeEnum.PASS.name()); + committeeParam.setBpmTaskApprovalTypeEnum(BpmTaskApprovalTypeEnum.PASS); + committeeParam.setApprovalOpinion("校工会会审核通过"); + bpmService.completeTask(committeeParam.getProcessInstanceTaskId(), committeeParam.getBpmTaskApprovalTypeEnum(), null, null); + + // 更新用户信息 + memberManageService.compareMemberChangeInfoAndUpdateUser(record); + } return Result.success(); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberStatisticsPageForm.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberStatisticsPageForm.java index 860d8b4..9f6d84f 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberStatisticsPageForm.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/param/pageform/MemberStatisticsPageForm.java @@ -1,6 +1,8 @@ package com.budwk.app.zhgh.staffmanage.member.param.pageform; import com.budwk.app.base.param.PageForm; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,50 +15,86 @@ import java.util.List; * @Date 2024/8/8 14:49 * @注释 */ -@EqualsAndHashCode(callSuper = true) @Data +@ApiModel("会员综合查询") +@EqualsAndHashCode(callSuper = true) public class MemberStatisticsPageForm extends PageForm { + @ApiModelProperty(value = "是否有单位") private String isUnit; + @ApiModelProperty(value = "是否有工会") private String isUnion; + @ApiModelProperty(value = "查询类型") private String searchType; + @ApiModelProperty(value = "开始时间（生日）") private String startDate; + @ApiModelProperty(value = "结束时间（生日）") private String endDate; + @ApiModelProperty(value = "查询年份") private Integer year; + @ApiModelProperty(value = "查询月份") + private Integer month; + + @ApiModelProperty(value = "查询工会id") private List unionId; + @ApiModelProperty(value = "查询单位id") private List unitId; + @ApiModelProperty(value = "查询工会组id") private List unionGroupId; + @ApiModelProperty(value = "查询人员类型") private List personTypes; + @ApiModelProperty(value = "查询编制类型") private List preparedBys; + @ApiModelProperty(value = "查询在职状态") private List userStates; + @ApiModelProperty(value = "查询会员状态") private List memberStatus; + @ApiModelProperty(value = "查询校区") private String campus; + @ApiModelProperty(value = "查询会员类型") private List memberTypes; + @ApiModelProperty(value = "查询性别") private List sexTypes; + @ApiModelProperty(value = "查询角色") private List roleIds; + @ApiModelProperty(value = "查询年龄") private List age; + @ApiModelProperty(value = "是否反选") private Boolean reverseSelection; + @ApiModelProperty(value = "会员查询名称") private String memberSearchName; + @ApiModelProperty(value = "会员查询关键字") private String memberSearchKeyWord; + @ApiModelProperty(value = "开始加入时间(会员)") + private String startJoinDate; + + @ApiModelProperty(value = "结束加入时间(会员)") + private String endJoinDate; + + @ApiModelProperty(value = "开始离会时间(会员)") + private String startLeaveDate; + + @ApiModelProperty(value = "结束离会时间(会员)") + private String endLeaveDate; } diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberStatisticsServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberStatisticsServiceImpl.java index 10a0641..7009c45 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberStatisticsServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberStatisticsServiceImpl.java @@ -60,7 +60,7 @@ public class MemberStatisticsServiceImpl extends BaseServiceImpl imple cnd.orderBy(pageForm.getPageOrderName(), pageForm.getPageOrderBy().equalsIgnoreCase("ascending") ? "ASC" : "DESC"); } - if (Lang.isNotEmpty(pageForm.getAge()) && !"0".equals(pageForm.getAge().get(0)) && !"0".equals(pageForm.getAge().get(1))) { + if (Lang.isNotEmpty(pageForm.getAge()) && !"0".equals(pageForm.getAge().get(1))) { if (reverseSelection) { cnd.andNot("TIMESTAMPDIFF(YEAR, u.birthday, CURDATE())", "between", pageForm.getAge().toArray()); } else { @@ -76,6 +76,22 @@ public class MemberStatisticsServiceImpl extends BaseServiceImpl imple } } + if (StrUtil.isAllNotBlank(pageForm.getStartJoinDate(), pageForm.getEndJoinDate())) { + if (reverseSelection) { + cnd.andNot("DATE(u.memberJoinTime)", "between", new String[]{pageForm.getStartJoinDate(), pageForm.getEndJoinDate()}); + } else { + cnd.and("DATE(u.memberJoinTime)", "between", new String[]{pageForm.getStartJoinDate(), pageForm.getEndJoinDate()}); + } + } + + if (StrUtil.isAllNotBlank(pageForm.getStartLeaveDate(), pageForm.getEndLeaveDate())) { + if (reverseSelection) { + cnd.andNot("DATE(u.memberLeaveTime)", "between", new String[]{pageForm.getStartLeaveDate(), pageForm.getEndLeaveDate()}); + } else { + cnd.and("DATE(u.memberLeaveTime)", "between", new String[]{pageForm.getStartLeaveDate(), pageForm.getEndLeaveDate()}); + } + } + if (Strings.isNotBlank(pageForm.getStartDate()) && Strings.isBlank(pageForm.getEndDate())) { cnd.and("DATE(u.birthday)", GE_OR_NGE_OP, pageForm.getStartDate()); } diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/specialstaff/controller/SpecialStaffManageController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/specialstaff/controller/SpecialStaffManageController.java index 29f8cc4..157ffc6 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/specialstaff/controller/SpecialStaffManageController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/specialstaff/controller/SpecialStaffManageController.java @@ -156,7 +156,7 @@ public class SpecialStaffManageController { select id,username,loginname,unitId,unitName,unionId,unionName from `vw_user` $condition limit 0,10 """); Cnd cnd = Cnd.NEW(); - cnd.where("id", "not in", "(select userId from special_staff)"); + cnd.and("id", "not in", "(select userId from special_staff)"); if (StrUtil.isNotBlank(keyWord)) { SqlExpressionGroup seg = new SqlExpressionGroup(); seg.orLike("username", keyWord); diff --git a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareListController.java b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareListController.java index 963a999..a6d1c14 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareListController.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareListController.java @@ -158,9 +158,12 @@ public class WelfareListController { if (user != null) { WelfareList list = new WelfareList(); list.setUserId(user.getId()); - list.setWelfareUnitId(user.getUnionId()); + list.setWelfareUnitId(user.getUnitId()); + list.setWelfareUnitName(user.getUnitName()); + list.setWelfareUnionId(user.getUnionId()); + list.setWelfareUnionName(user.getUnionName()); list.setProjectId(businessId); - list.setWelfareSecondLevelUnitId(user.getUnitId()); +// list.setWelfareSecondLevelUnitId(user.getUnitId()); list.setPersonType(user.getPersonType()); list.setUserState(user.getUserState()); welfareLists.add(list); diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java index af802de..2208329 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java @@ -370,8 +370,10 @@ public class WelfareListServiceImpl extends BaseServiceImpl impleme WelfareList welfareList = new WelfareList(); welfareList.setProjectId(id); welfareList.setUserId(v.getId()); - welfareList.setWelfareUnitId(v.getUnionId()); - welfareList.setWelfareSecondLevelUnitId(v.getUnitId()); + welfareList.setWelfareUnitId(v.getUnitId()); + welfareList.setWelfareUnitName(v.getUnitName()); + welfareList.setWelfareUnionId(v.getUnionId()); + welfareList.setWelfareUnionName(v.getUnionName()); welfareList.setPersonType(v.getPersonType()); welfareList.setUserState(v.getUserState()); return welfareList; diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareProjectServiceImpl.java b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareProjectServiceImpl.java index 7f103fc..4e48851 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareProjectServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareProjectServiceImpl.java @@ -175,8 +175,10 @@ public class WelfareProjectServiceImpl extends BaseServiceImpl i WelfareList list = new WelfareList(); list.setProjectId(projectId); list.setUserId(user.getString("id")); - list.setWelfareUnitId(user.getString("unionId")); - list.setWelfareSecondLevelUnitId(user.getString("unitId")); + list.setWelfareUnitId(user.getString("unitId")); + list.setWelfareUnitName(user.getString("unitName")); + list.setWelfareUnionId(user.getString("unionId")); + list.setWelfareUnionName(user.getString("unionName")); list.setPersonType(user.getString("personType")); list.setUserState(user.getString("userState")); lists.add(list); diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareSelectionSituationServiceImpl.java b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareSelectionSituationServiceImpl.java index 262fdd0..e02c8df 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareSelectionSituationServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareSelectionSituationServiceImpl.java @@ -14,6 +14,7 @@ import com.budwk.app.base.utils.PageUtil; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.welfare.model.WelfareList; +import com.budwk.app.zhgh.welfare.model.WelfareProject; import com.budwk.app.zhgh.welfare.param.WelfareSelectionSituationPageForm; import com.budwk.app.zhgh.welfare.service.WelfareSelectionSituationService; import lombok.extern.slf4j.Slf4j; @@ -45,8 +46,10 @@ public class WelfareSelectionSituationServiceImpl extends BaseServiceImpl list = listMap(sql); + // 项目 + WelfareProject project = dao().fetch(WelfareProject.class, pageForm.getProjectId()); + // excel列 List entities = new ArrayList<>(); @@ -163,6 +170,10 @@ public class WelfareSelectionSituationServiceImpl extends BaseServiceImpl welfareSelectionList = listMap(sql); @@ -96,11 +97,11 @@ public class WelfareStatisticsServiceImpl extends BaseServiceImpl v.getString("welfareUnionId").equals(union.getString("id"))).count(); + long teacherSum = welfareSelectionList.stream().filter(v -> v.getString("welfareUnionId", "").equals(union.getString("id"))).count(); union.put("teacherSum", teacherSum); // 已选人数 - long selectedNum = welfareSelectionList.stream().filter(v -> v.getString("welfareUnionId").equals(union.getString("id")) && v.getBoolean("has_selected")).count(); + long selectedNum = welfareSelectionList.stream().filter(v -> v.getString("welfareUnionId", "").equals(union.getString("id")) && v.getBoolean("has_selected")).count(); union.put("selectedNum", selectedNum); // 未选人数 @@ -247,7 +248,7 @@ public class WelfareStatisticsServiceImpl extends BaseServiceImpl -
- diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/applyUser.js b/src/main/resources/views/platform/zhgh/activity/culture/common/applyUser.js index 15d3323..bae52ee 100644 --- a/src/main/resources/views/platform/zhgh/activity/culture/common/applyUser.js +++ b/src/main/resources/views/platform/zhgh/activity/culture/common/applyUser.js @@ -34,8 +34,8 @@ const ACTIVITY_CULTURE_APPLY_USER = { - 未报名 已报名 + 未报名 diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/auditActivity.js b/src/main/resources/views/platform/zhgh/activity/culture/common/auditActivity.js index a203a09..2f4f3d7 100644 --- a/src/main/resources/views/platform/zhgh/activity/culture/common/auditActivity.js +++ b/src/main/resources/views/platform/zhgh/activity/culture/common/auditActivity.js @@ -210,8 +210,9 @@ const ACTIVITY_CULTURE_AUDIT_ACTIVITY = { } }, openAudit(row) { - this.$refs.guava.edit() - this.$refs.editInfo.findOne(row.id) + this.$refs.guava.edit(()=>{ + this.$refs.editInfo.findOne(row.id) + }) this.formData = { id: row.id, username: this.$store.state.user.username, @@ -220,8 +221,9 @@ const ACTIVITY_CULTURE_AUDIT_ACTIVITY = { }, openView(row) { const { id } = row - this.$refs.guava.view() - this.$refs.infoActivity.findOne(id) + this.$refs.guava.view(()=>{ + this.$refs.infoActivity.findOne(id) + }) }, pageData() { this.tableLoading = true diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/infoActivity.js b/src/main/resources/views/platform/zhgh/activity/culture/common/infoActivity.js index e80b777..7f07a88 100644 --- a/src/main/resources/views/platform/zhgh/activity/culture/common/infoActivity.js +++ b/src/main/resources/views/platform/zhgh/activity/culture/common/infoActivity.js @@ -42,8 +42,8 @@ const ACTIVITY_CULTURE_INFO_ACTIVITY = { 个人报名 - 分工会报名 - 组队报名 + 组队报名 + 分工会报名 无需报名 diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/singleSignUp.js b/src/main/resources/views/platform/zhgh/activity/culture/common/singleSignUp.js index b85d6d6..e151f99 100644 --- a/src/main/resources/views/platform/zhgh/activity/culture/common/singleSignUp.js +++ b/src/main/resources/views/platform/zhgh/activity/culture/common/singleSignUp.js @@ -42,8 +42,8 @@ const singleSignUp = { 个人报名 - 分工会报名 - 组队报名 + 组队报名 + 分工会报名 无需报名 @@ -153,7 +153,47 @@ const singleSignUp = {
+
选择报名人员 + + ，报名人数 + {{viewData.unionTeamNum}}人 + +
+ + + + + 添加 + + + + + + + + + + + +
@@ -242,6 +282,17 @@ const singleSignUp = { } }) }, + //查询报名人员 + 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() { @@ -300,14 +351,14 @@ const singleSignUp = { //分工会 if (this.viewData.signUpMethod === 3) { - // if (this.teamUsers.length === 0) { - // this.$message.warning("请添加报名人员后再提交！") - // return - // } - // if (this.teamUsers.length > this.viewData.teamNum) { - // this.$message.warning("您选择的人数大于" + this.viewData.teamNum + "人，请重新选择！") - // return - // } + if (this.teamUsers.length === 0) { + this.$message.warning("请添加报名人员后再提交！") + return + } + if (this.viewData.teamNum && this.teamUsers.length > this.viewData.teamNum) { + this.$message.warning("您选择的人数大于" + this.viewData.teamNum + "人，请重新选择！") + return + } } let formData = { @@ -368,7 +419,7 @@ const singleSignUp = { this.$message.warning("请添加报名人员后再提交！") return } - if (this.teamUsers.length > this.viewData.teamNum) { + if (this.viewData.teamNum && this.teamUsers.length > this.viewData.teamNum) { this.$message.warning("您选择的人数大于" + this.viewData.teamNum + "人，请重新选择！") return } @@ -420,7 +471,10 @@ const singleSignUp = { //查询队友信息 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) this.teammateOptions = res.data @@ -439,7 +493,7 @@ const singleSignUp = { this.$message.error("请勿重复添加") return } - if (this.teamUsers.length >= this.viewData.teamNum) { + if (this.viewData.teamNum && this.teamUsers.length >= this.viewData.teamNum) { this.$message.error("已满员") return } @@ -457,11 +511,22 @@ const singleSignUp = { this.$axios.post("/platform/activity/culture/infoManage/activityInfo", {id: this.id}).then((res) => { 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() } }) } diff --git a/src/main/resources/views/platform/zhgh/activity/sports/applyUser/applyUser.js b/src/main/resources/views/platform/zhgh/activity/sports/applyUser/applyUser.js index a16d1f5..a484838 100644 --- a/src/main/resources/views/platform/zhgh/activity/sports/applyUser/applyUser.js +++ b/src/main/resources/views/platform/zhgh/activity/sports/applyUser/applyUser.js @@ -12,225 +12,319 @@ const groupBy = (list, fn) => { }) } var ACTIVITY_SPORTS_APPLY_USER = { - template: /*language=HTML*/ ` -
- - - - - - + template: ` +
+ + + + + + - - - - 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 = { - + -