c-zhouhf1/zhgh_jshvc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

体育活动

Browse Source
This commit is contained in:
=
2025-12-17 11:52:23 +08:00
parent 74970eacb5
commit ad63787532
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/activity/sports/controller/ActivitySportsReadingController.java
+1 -1
View File
@@ -51,7 +51,7 @@ public class ActivitySportsReadingController {
ActivityBasicUnit basicUnit = dao.fetch(ActivityBasicUnit.class, Cnd.where("id", "=", SecurityUtil.getUnitId())); ActivityBasicUnit basicUnit = dao.fetch(ActivityBasicUnit.class, Cnd.where("id", "=", SecurityUtil.getUnitId()));
Cnd cnd = Cnd.NEW(); Cnd cnd = Cnd.NEW();
cnd.and("close", "!=", true); cnd.and("close", "!=", true);
cnd.and("YEAR(startTime)", "=", year); cnd.and("YEAR(applyStartTime)", "=", year);
cnd.and("activityLevel", "=", activityLevel); cnd.and("activityLevel", "=", activityLevel);
if (!AuthUtil.hasRoleOr(RoleConstant.SCHOOL_UNION_ADMIN.name(), RoleConstant.SYSADMIN.name())) { if (!AuthUtil.hasRoleOr(RoleConstant.SCHOOL_UNION_ADMIN.name(), RoleConstant.SYSADMIN.name())) {
if (activityLevel.equals("40002")) { if (activityLevel.equals("40002")) {
src/main/java/com/budwk/app/zhgh/activity/sports/h5Controller/H5ActivitySportsApplyUserController.java
+10 -5
View File
@@ -87,7 +87,10 @@ public class H5ActivitySportsApplyUserController {
ActivitySchoolEvent schoolEvent = dao.fetch(ActivitySchoolEvent.class, schoolEventId); ActivitySchoolEvent schoolEvent = dao.fetch(ActivitySchoolEvent.class, schoolEventId);
ActivityEvent activityEvent = dao.fetch(ActivityEvent.class, eventId); ActivityEvent activityEvent = dao.fetch(ActivityEvent.class, eventId);
ActivitySchool activitySchool = dao.fetch(ActivitySchool.class, activityId); ActivitySchool activitySchool = dao.fetch(ActivitySchool.class, activityId);
ActivitySchoolTeam schoolTeam = dao.fetch(ActivitySchoolTeam.class, teamId); ActivitySchoolTeam schoolTeam = null;
if (teamId != null && !teamId.isEmpty()) {
schoolTeam = dao.fetch(ActivitySchoolTeam.class, teamId);
}
ActivityBasicUnit basicUnit = dao.fetch(ActivityBasicUnit.class, Cnd.where("id", "=", SecurityUtil.getUnitId())); ActivityBasicUnit basicUnit = dao.fetch(ActivityBasicUnit.class, Cnd.where("id", "=", SecurityUtil.getUnitId()));
ActivityBasicUnion basicUnion = dao.fetch(ActivityBasicUnion.class, Cnd.where("id", "=", basicUnit.getUnionId())); ActivityBasicUnion basicUnion = dao.fetch(ActivityBasicUnion.class, Cnd.where("id", "=", basicUnit.getUnionId()));
@@ -105,10 +108,10 @@ public class H5ActivitySportsApplyUserController {
} }
//如果不等于空代表是个人项目 //如果不等于空代表是个人项目
if (ObjectUtil.isNotEmpty(activityEvent.getIsMenWomen())) { if (ObjectUtil.isNotEmpty(activityEvent.getIsMenWomen())) {
if (activityEvent.getIsMenWomen() == 1 && !List.of("男","男性").contains(user.getSex())) { if (activityEvent.getIsMenWomen() == 1 && !List.of("男", "男性").contains(user.getSex())) {
return Result.error("当前项目只能男性能报名！"); return Result.error("当前项目只能男性能报名！");
} }
if (activityEvent.getIsMenWomen() == 2 && !List.of("女","女性").contains(user.getSex())) { if (activityEvent.getIsMenWomen() == 2 && !List.of("女", "女性").contains(user.getSex())) {
return Result.error("当前项目只能女性能报名！"); return Result.error("当前项目只能女性能报名！");
} }
} }
@@ -182,8 +185,10 @@ public class H5ActivitySportsApplyUserController {
schoolApply.setStatus(2); schoolApply.setStatus(2);
} }
schoolApply.setUnitname(user.getUnitName()); schoolApply.setUnitname(user.getUnitName());
schoolApply.setTeamId(schoolTeam.getId()); if (schoolTeam != null){
schoolApply.setTeam(schoolTeam.getName()); schoolApply.setTeamId(schoolTeam.getId());
schoolApply.setTeam(schoolTeam.getName());
}
schoolApply.setLoginname(user.getLoginname()); schoolApply.setLoginname(user.getLoginname());
schoolApply.setUsername(user.getUsername()); schoolApply.setUsername(user.getUsername());
schoolApply.setMobile(user.getMobile()); schoolApply.setMobile(user.getMobile());
src/main/java/com/budwk/app/zhgh/activity/sports/models/ActivitySchool.java
+1 -1
View File
@@ -205,7 +205,7 @@ public class ActivitySchool extends BaseModel implements Serializable , SysHomeC
sysHomeActivity.setName(this.getName()); sysHomeActivity.setName(this.getName());
sysHomeActivity.setCover(this.getImage()); sysHomeActivity.setCover(this.getImage());
sysHomeActivity.setUrl("/platform/activity/apply"); sysHomeActivity.setUrl("/platform/activity/apply");
sysHomeActivity.setH5Url(null); sysHomeActivity.setH5Url("/platform/activity/apply/h5/index?id=" + this.getId());
sysHomeActivity.setStartDate(DateUtil.parseDate(this.getApplyStartTime())); sysHomeActivity.setStartDate(DateUtil.parseDate(this.getApplyStartTime()));
sysHomeActivity.setEndDate(DateUtil.parseDate(this.getApplyEndTime())); sysHomeActivity.setEndDate(DateUtil.parseDate(this.getApplyEndTime()));
sysHomeActivity.setAllowUserGroupId(this.getActivityGroupId()); sysHomeActivity.setAllowUserGroupId(this.getActivityGroupId());