From 80b27850f3c2e3298dbfdb598edbb30a455c4d56 Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Tue, 22 Apr 2025 15:29:54 +0800 Subject: [PATCH] commit --- .../school/ActivityApplyController.java | 63 +- .../school/ActivityCommonController.java | 5 +- .../school/ActivityReadingController.java | 2 + .../activity/school/AddActivity.vue | 1 + .../activity/school/ActivityApply.html | 627 +++++++++--------- .../activity/school/ActivityManage.html | 5 +- 6 files changed, 364 insertions(+), 339 deletions(-) diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityApplyController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityApplyController.java index c75e965..0889403 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityApplyController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityApplyController.java @@ -151,8 +151,8 @@ public class ActivityApplyController { au.files promiseBookFiles, (SELECT count( 1 ) FROM activity_school_apply app WHERE app.activityId = school.id AND app.`status` = 2 ) apply_num, (SELECT count( 1 ) FROM activity_school_apply app WHERE app.activityId = school.id AND ( app.applyUser = @userid OR app.userId = @userid )) > 0 applyed, - (SELECT COUNT(1) FROM activity_school_apply app WHERE app.activityId=school.id AND app.unionId=@unionId AND app.unionLeader=TRUE) LeaderCount, - (SELECT COUNT(1) FROM activity_school_apply app WHERE app.activityId=school.id AND app.unionId=@unionId AND app.unionCoach=TRUE) CoachCount + (SELECT COUNT(1) FROM activity_school_apply app WHERE app.activityId=school.id AND app.activityUnionId=@unionId AND app.unionLeader=TRUE) LeaderCount, + (SELECT COUNT(1) FROM activity_school_apply app WHERE app.activityId=school.id AND app.activityUnionId=@unionId AND app.unionCoach=TRUE) CoachCount FROM activity_school school LEFT JOIN activity_basic_settings ba ON ba.`code` = school.activityLevel @@ -168,8 +168,7 @@ public class ActivityApplyController { switch (isActivity) { //报名中 - case 2 -> - cnd.and(new Static("now() > school.applyStartTime and now() < school.applyEndTime")); + case 2 -> cnd.and(new Static("now() > school.applyStartTime and now() < school.applyEndTime")); //已结束 case 3 -> cnd.and(new Static("now() > school.applyEndTime")); //进行中 @@ -269,7 +268,7 @@ public class ActivityApplyController { Sql applySql = Sqls.create(""" SELECT asa.* - + FROM activity_school_apply asa LEFT JOIN activity_school_team team ON asa.teamId = team.id @@ -500,7 +499,7 @@ public class ActivityApplyController { public Object getActivityCount(String teamId) { Sql sql = Sqls.create(""" SELECT COUNT(*) FROM activity_school_apply WHERE teamId=@teamId and activityUnionId=@unionId - """); + """); sql.setParam("teamId", teamId); sql.setParam("unionId", getUnionId()); return activitySchoolApplyService.count(sql); @@ -517,7 +516,7 @@ public class ActivityApplyController { public Object getActivityUserCount(String eventId) { Sql sql = Sqls.create(""" SELECT COUNT(*) FROM activity_school_apply WHERE userId=@userId and eventId=@eventId - """); + """); sql.setParam("userId", ShiroUtil.getPrincipalProperty("id")); sql.setParam("eventId", eventId); return activitySchoolApplyService.count(sql); @@ -538,7 +537,10 @@ public class ActivityApplyController { group.orLike("u.loginname", query); cnd.and(group); } - cnd.and("un.unionid", "=", union_id); + SqlExpressionGroup group = new SqlExpressionGroup(); + group.or("un.unionid", "=", union_id); + group.or("un.id", "=", "223"); + cnd.and(group); sql.setCondition(cnd); return sysUserService.list(sql); } @@ -696,50 +698,54 @@ public class ActivityApplyController { public Object doLeaderCoachHead(@Param(value = "staffData", required = false) ActivitySchoolApply staffData, @Param(value = "LeaderData", required = false) ActivitySchoolApply LeaderData, @Param(value = "CoachData", required = false) ActivitySchoolApply CoachData, - @Param(value = "headData", required = false) ActivitySchoolApply headData) { - + @Param(value = "headData", required = false) ActivitySchoolApply headData, + @Param(value = "headData") String activityId) { + ActivityBasicUnit thisBasicUnit = activitySchoolService.dao().fetch(ActivityBasicUnit.class, Cnd.where("id", "=",ShiroUtil.getUnitId())); + ActivityBasicUnion thisBasicUnion = activitySchoolService.dao().fetch(ActivityBasicUnion.class, Cnd.where("id", "=", thisBasicUnit.getUnionid())); + Cnd cnd = Cnd.NEW(); + cnd.and("activityId", "=", activityId); + cnd.and("activityUnionId", "=", getUnionId()); + SqlExpressionGroup group = new SqlExpressionGroup(); + group.or("unionStaff", "=", 1); + group.or("unionLeader", "=", 1); + group.or("unionCoach", "=", 1); + group.or("unionHead", "=", 1); + cnd.and(group); + activitySchoolApplyService.clear(cnd); if (staffData.getUserId() != null) { ActivityBasicUnit basicUnit = activitySchoolService.dao().fetch(ActivityBasicUnit.class, Cnd.where("id", "=", staffData.getUnitId())); - ActivityBasicUnion basicUnion = activitySchoolService.dao().fetch(ActivityBasicUnion.class, Cnd.where("id", "=", basicUnit.getUnionid())); - activitySchoolApplyService.clear(Cnd.where("activityId", "=", staffData.getActivityId()).and("unionStaff", "=", true).and("unionId", "=", getUnionId())); staffData.setApplyUser(ShiroUtil.getPrincipalProperty("id").toString()); staffData.setApplyDate(DateUtil.getDate()); staffData.setUnitname(basicUnit.getName()); - staffData.setActivityUnionId(basicUnion.getId()); - staffData.setActivityUnionName(basicUnion.getUnionname()); + staffData.setActivityUnionId(thisBasicUnion.getId()); + staffData.setActivityUnionName(thisBasicUnion.getUnionname()); activitySchoolApplyService.insert(staffData); } if (LeaderData.getUserId() != null) { ActivityBasicUnit basicUnit = activitySchoolService.dao().fetch(ActivityBasicUnit.class, Cnd.where("id", "=", LeaderData.getUnitId())); - ActivityBasicUnion basicUnion = activitySchoolService.dao().fetch(ActivityBasicUnion.class, Cnd.where("id", "=", basicUnit.getUnionid())); - activitySchoolApplyService.clear(Cnd.where("activityId", "=", LeaderData.getActivityId()).and("unionLeader", "=", true).and("unionId", "=", getUnionId())); LeaderData.setApplyUser(ShiroUtil.getPrincipalProperty("id").toString()); LeaderData.setApplyDate(DateUtil.getDate()); LeaderData.setUnitname(basicUnit.getName()); - LeaderData.setActivityUnionId(basicUnion.getId()); - LeaderData.setActivityUnionName(basicUnion.getUnionname()); + LeaderData.setActivityUnionId(thisBasicUnion.getId()); + LeaderData.setActivityUnionName(thisBasicUnion.getUnionname()); activitySchoolApplyService.insert(LeaderData); } if (CoachData.getUserId() != null) { ActivityBasicUnit basicUnit = activitySchoolService.dao().fetch(ActivityBasicUnit.class, Cnd.where("id", "=", CoachData.getUnitId())); - ActivityBasicUnion basicUnion = activitySchoolService.dao().fetch(ActivityBasicUnion.class, Cnd.where("id", "=", basicUnit.getUnionid())); - activitySchoolApplyService.clear(Cnd.where("activityId", "=", CoachData.getActivityId()).and("unionCoach", "=", true).and("unionId", "=", getUnionId())); CoachData.setApplyUser(ShiroUtil.getPrincipalProperty("id").toString()); CoachData.setApplyDate(DateUtil.getDate()); CoachData.setUnitname(basicUnit.getName()); - CoachData.setActivityUnionId(basicUnion.getId()); - CoachData.setActivityUnionName(basicUnion.getUnionname()); + CoachData.setActivityUnionId(thisBasicUnion.getId()); + CoachData.setActivityUnionName(thisBasicUnion.getUnionname()); activitySchoolApplyService.insert(CoachData); } if (headData.getUserId() != null) { ActivityBasicUnit basicUnit = activitySchoolService.dao().fetch(ActivityBasicUnit.class, Cnd.where("id", "=", headData.getUnitId())); - ActivityBasicUnion basicUnion = activitySchoolService.dao().fetch(ActivityBasicUnion.class, Cnd.where("id", "=", basicUnit.getUnionid())); - activitySchoolApplyService.clear(Cnd.where("activityId", "=", headData.getActivityId()).and("unionHead", "=", true).and("unionId", "=", getUnionId())); headData.setApplyUser(ShiroUtil.getPrincipalProperty("id").toString()); headData.setApplyDate(DateUtil.getDate()); headData.setUnitname(basicUnit.getName()); - headData.setActivityUnionId(basicUnion.getId()); - headData.setActivityUnionName(basicUnion.getUnionname()); + headData.setActivityUnionId(thisBasicUnion.getId()); + headData.setActivityUnionName(thisBasicUnion.getUnionname()); activitySchoolApplyService.insert(headData); } @@ -755,9 +761,9 @@ public class ActivityApplyController { public Object getUnionCoachLeaderHead(@Param(value = "activityId", required = false) String activityId) { Map result = new HashMap(); Sql sql = Sqls.create(""" - SELECT apply.*,us.unitname FROM activity_school_apply apply LEFT JOIN `user` us ON us.id=apply.userId WHERE apply.activityId=@activityId and apply.unionId=@unionId + SELECT apply.*,us.unitname FROM activity_school_apply apply LEFT JOIN `user` us ON us.id=apply.userId WHERE apply.activityId=@activityId and apply.activityUnionId=@activityUnionId """); - sql.setParam("unionId", getUnionId()); + sql.setParam("activityUnionId", getUnionId()); sql.setParam("activityId", activityId); List list = activitySchoolApplyService.listMap(sql); NutMap unionCoach = list.stream().filter(v -> { @@ -897,6 +903,7 @@ public class ActivityApplyController { /** * 下载签名告知书 + * * @param activityId * @param response */ diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityCommonController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityCommonController.java index ee1a7cc..2bb068e 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityCommonController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityCommonController.java @@ -304,6 +304,7 @@ public class ActivityCommonController { LEFT JOIN activity_school sc ON sc.id=app.activityId WHERE activityId = @id + and app.status=2 $cnd ORDER BY app.applyUser DESC, @@ -323,7 +324,7 @@ public class ActivityCommonController { list.forEach(z -> { List identity = Json.fromJsonAsList(String.class, z.getString("identity")); String s = identity.stream().map(personType::getName).collect(Collectors.toList()).toString(); - z.addv("sf", s); + z.addv("sf", s.replaceAll("[\\[\\]]", "")); }); List exportEntities = new ArrayList<>(); exportEntities.add(new ExcelExportEntity("小队名称", "team", 20)); @@ -336,7 +337,7 @@ public class ActivityCommonController { exportEntities.add(new ExcelExportEntity("身份", "sf", 20)); exportEntities.add(new ExcelExportEntity("报名人", "applyUserName", 20)); - Map> listMap = list.stream().collect(Collectors.groupingBy(v -> v.getString("allName"))); + Map> listMap = list.stream().collect(Collectors.groupingBy(v -> v.getString("unionname"))); Workbook workbook = new XSSFWorkbook(); listMap.forEach((k, v) -> { ExcelExportService service = new ExcelExportService(); diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityReadingController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityReadingController.java index 835e774..0b8f395 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityReadingController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityReadingController.java @@ -133,6 +133,8 @@ public class ActivityReadingController { """); cnd.and("app.activityId", "=", id); + cnd.and("app.status", "=", 2); + // cnd.and("YEAR(app.applyDate)", "=", year); sql.setCondition(cnd); if (!ShiroUtil.hasAnyRoles("sysadmin,A06,SCHOOL_UNION_SPORTS_ADMIN")) { diff --git a/src/main/resources/static/components/activity/school/AddActivity.vue b/src/main/resources/static/components/activity/school/AddActivity.vue index ae064ba..fd1b71f 100644 --- a/src/main/resources/static/components/activity/school/AddActivity.vue +++ b/src/main/resources/static/components/activity/school/AddActivity.vue @@ -1,3 +1,4 @@ +