From 89cd189cb6cd54cac016f01fa2522a849fbbcaea Mon Sep 17 00:00:00 2001 From: zhengziru Date: Mon, 28 Apr 2025 14:40:53 +0800 Subject: [PATCH] server_commit --- .../controller/school/ActivityApplyController.java | 6 +++--- .../controller/school/ActivityCommonController.java | 11 ++++++++--- .../resources/static/components/syr/SyrInfoNew.vue | 4 ++-- .../static/components/sys/union/cadre/Mange.vue | 2 +- .../views/platform/activity/school/ActivityApply.html | 4 ++-- 5 files changed, 16 insertions(+), 11 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 135477f..b84b762 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 @@ -414,8 +414,8 @@ public class ActivityApplyController { apply.setActivityUnionName(basicUnion.getUnionname()); apply.setApplyUnitId(basicUnit.getId()); -// dao.update(Sys_user.class, Chain.make("mobile", apply.getMobile()).add("position", apply.getPosition()), -// Cnd.where("id", "=", apply.getUserId())); + dao.update(Sys_user.class, Chain.make("mobile", apply.getMobile()).add("position", apply.getPosition()), + Cnd.where("id", "=", apply.getUserId())); } activitySchoolApplyService.doApplies(activityId, basicUnit.getUnionid(), eventId, Arrays.asList(applies)); return null; @@ -707,7 +707,7 @@ public class ActivityApplyController { @Param(value = "LeaderData", required = false) ActivitySchoolApply LeaderData, @Param(value = "CoachData", required = false) ActivitySchoolApply CoachData, @Param(value = "headData", required = false) ActivitySchoolApply headData, - @Param(value = "headData") String activityId) { + @Param(value = "activityId") 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(); 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 504794a..45ddb9d 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 @@ -5,6 +5,7 @@ import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.afterturn.easypoi.excel.export.ExcelExportService; +import cn.hutool.core.util.StrUtil; import com.deepoove.poi.XWPFTemplate; import com.deepoove.poi.config.Configure; import com.deepoove.poi.policy.HackLoopTableRenderPolicy; @@ -304,7 +305,7 @@ public class ActivityCommonController { LEFT JOIN activity_event ev ON ev.id = app.eventId LEFT JOIN activity_school sc ON sc.id=app.activityId WHERE - activityId = @id and ev.allName is not null + activityId = @id and app.status=2 $cnd ORDER BY @@ -326,6 +327,9 @@ public class ActivityCommonController { List identity = Json.fromJsonAsList(String.class, z.getString("identity")); String s = identity.stream().map(personType::getName).collect(Collectors.toList()).toString(); z.addv("sf", s.replaceAll("[\\[\\]]", "")); + if (StrUtil.isBlank(z.getString("allName"))) { + z.addv("allName", s.replaceAll("[\\[\\]]", "")); + } }); List exportEntities = new ArrayList<>(); // exportEntities.add(new ExcelExportEntity("小队名称", "team", 20)); @@ -351,7 +355,7 @@ public class ActivityCommonController { }); try { - ViTool.excelResponse(response, activityName+"报名表.xlsx"); + ViTool.excelResponse(response, activityName + "报名表.xlsx"); ServletOutputStream outputStream = response.getOutputStream(); workbook.write(outputStream); outputStream.close(); @@ -366,7 +370,8 @@ public class ActivityCommonController { private static String getName(String v) { switch (v) { case "1": - return "运动员"; +// return "运动员"; + return ""; case "2": return "教练"; case "3": diff --git a/src/main/resources/static/components/syr/SyrInfoNew.vue b/src/main/resources/static/components/syr/SyrInfoNew.vue index c3f4fc6..b2671a2 100644 --- a/src/main/resources/static/components/syr/SyrInfoNew.vue +++ b/src/main/resources/static/components/syr/SyrInfoNew.vue @@ -165,7 +165,7 @@ - +
@@ -571,7 +571,7 @@ - +
diff --git a/src/main/resources/static/components/sys/union/cadre/Mange.vue b/src/main/resources/static/components/sys/union/cadre/Mange.vue index 657a0ba..ccf1e58 100644 --- a/src/main/resources/static/components/sys/union/cadre/Mange.vue +++ b/src/main/resources/static/components/sys/union/cadre/Mange.vue @@ -257,7 +257,7 @@ module.exports = { async created() { this.doSearch() this.roleOptions = await getDictOptions("GrassrootsCadres") - if (!this.$auth.hasRoleOr("sysadmin,A06,wyh01")) { + if (!this.$auth.hasRoleOr("sysadmin,SchoolUnionAdmin,wyh01")) { this.roleOptions = this.roleOptions.filter((i) => !["gh01", "gh02"].includes(i.code)) } console.log(this.roleOptions) diff --git a/src/main/resources/views/platform/activity/school/ActivityApply.html b/src/main/resources/views/platform/activity/school/ActivityApply.html index 6ebbbe1..203e7b2 100644 --- a/src/main/resources/views/platform/activity/school/ActivityApply.html +++ b/src/main/resources/views/platform/activity/school/ActivityApply.html @@ -1214,9 +1214,9 @@ layout("/layouts/platform.html"){ :close-on-click-modal="false" :visible.sync="detailsDialogVisible" title="活动通知" - width="70%" + width="60%" > -
+
关 闭