From 6c7d41985df35eb6d9ff0fb5761a1a7e429f70c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A3=E4=BA=9B=E8=8A=B1=E5=84=BF?= <1156921458@qq.com> Date: Tue, 13 May 2025 21:01:53 +0800 Subject: [PATCH] .. --- .../controller/ActUserController.java | 6 ++- .../ActivitySignInQueryController.java | 16 ++++++- .../service/impl/ActUserServiceImpl.java | 20 +++++++- .../views/platform/activity/group/index.html | 6 +-- .../activity/signInUserQuery/index.html | 29 +++++++++--- .../views/platform/activity/user/index.html | 47 ++++++++++++++----- .../activity/registration-form/index.vue | 3 +- 7 files changed, 98 insertions(+), 29 deletions(-) diff --git a/backend/src/main/java/com/budwk/app/module/activity/controller/ActUserController.java b/backend/src/main/java/com/budwk/app/module/activity/controller/ActUserController.java index 631c635..e4961e5 100644 --- a/backend/src/main/java/com/budwk/app/module/activity/controller/ActUserController.java +++ b/backend/src/main/java/com/budwk/app/module/activity/controller/ActUserController.java @@ -237,11 +237,15 @@ public class ActUserController { add(new ExcelExportEntity("姓名", "userName", 20)); add(new ExcelExportEntity("性别", "sex", 20)); add(new ExcelExportEntity("身份证号码", "idCard", 20)); - add(new ExcelExportEntity("联系方式", "mobile", 20)); + add(new ExcelExportEntity("联系方式", "phone", 20)); add(new ExcelExportEntity("职务", "position", 20)); add(new ExcelExportEntity("所属单位", "unitName", 20)); add(new ExcelExportEntity("报名时间", "signUpTime2", 20)); add(new ExcelExportEntity("是否签到", "isSignInDesc", 20)); + add(new ExcelExportEntity("是否展示才艺", "isShowSkillDesc", 20)); + add(new ExcelExportEntity("才艺名称", "skillName", 20)); + add(new ExcelExportEntity("所需器材", "equip", 20)); + add(new ExcelExportEntity("是否参加嘉年华", "isPartyDesc", 20)); }}; response.setContentType("application/octet-stream"); response.setHeader("Content-Disposition", "attachment;filename=" + new String((activity.getTitle() + "报名数据表.xlsx").getBytes(StandardCharsets.UTF_8), "ISO8859-1")); diff --git a/backend/src/main/java/com/budwk/app/module/activity/controller/ActivitySignInQueryController.java b/backend/src/main/java/com/budwk/app/module/activity/controller/ActivitySignInQueryController.java index fcd4147..af4c66b 100644 --- a/backend/src/main/java/com/budwk/app/module/activity/controller/ActivitySignInQueryController.java +++ b/backend/src/main/java/com/budwk/app/module/activity/controller/ActivitySignInQueryController.java @@ -120,7 +120,15 @@ public class ActivitySignInQueryController { CASE au.isGrant WHEN 1 THEN '已发放' WHEN 0 THEN '未发放' - END AS isGrantDesc + END AS isGrantDesc, + CASE au.isShowSkill + WHEN 1 THEN '是' + WHEN 0 THEN '' + END AS isShowSkillDesc, + CASE au.isParty + WHEN 1 THEN '是' + WHEN 0 THEN '' + END AS isPartyDesc FROM `act_user` au $condition @@ -148,7 +156,11 @@ public class ActivitySignInQueryController { add(new ExcelExportEntity("参加单位名称", "unitName", 20)); add(new ExcelExportEntity("签到时间", "signInTime", 20)); add(new ExcelExportEntity("是否住宿", "isStayDesc", 20)); - add(new ExcelExportEntity("物资发放", "isGrantDesc", 20)); +// add(new ExcelExportEntity("物资发放", "isGrantDesc", 20)); + add(new ExcelExportEntity("是否展示才艺", "isShowSkillDesc", 20)); + add(new ExcelExportEntity("才艺名称", "skillName", 20)); + add(new ExcelExportEntity("所需器材", "equip", 20)); + add(new ExcelExportEntity("是否参加嘉年华", "isPartyDesc", 20)); }}; response.setContentType("application/octet-stream"); diff --git a/backend/src/main/java/com/budwk/app/module/activity/service/impl/ActUserServiceImpl.java b/backend/src/main/java/com/budwk/app/module/activity/service/impl/ActUserServiceImpl.java index 214d1b1..9ce6ee0 100644 --- a/backend/src/main/java/com/budwk/app/module/activity/service/impl/ActUserServiceImpl.java +++ b/backend/src/main/java/com/budwk/app/module/activity/service/impl/ActUserServiceImpl.java @@ -37,13 +37,29 @@ public class ActUserServiceImpl extends BaseServiceImpl implements ActU public Sql getSignUpSql(ActUserPageForm pageForm) { Sql sql = Sqls.create(""" SELECT - u.*, + u.*, DATE_FORMAT(signUpTime, '%Y-%m-%d %H:%i:%s') signUpTime2, CASE u.isSignIn WHEN 1 THEN '已签到' WHEN 0 THEN '未签到' END AS isSignInDesc, - act.`title` AS activityName + CASE u.isStay + WHEN 1 THEN '住宿' + WHEN 0 THEN '不住宿' + END AS isStayDesc, + CASE u.isGrant + WHEN 1 THEN '已发放' + WHEN 0 THEN '未发放' + END AS isGrantDesc, + CASE u.isShowSkill + WHEN 1 THEN '是' + WHEN 0 THEN '' + END AS isShowSkillDesc, + CASE u.isParty + WHEN 1 THEN '是' + WHEN 0 THEN '' + END AS isPartyDesc, + act.`title` AS activityName FROM act_user u LEFT JOIN activity act ON act.id = u.activityId diff --git a/backend/src/main/resources/views/platform/activity/group/index.html b/backend/src/main/resources/views/platform/activity/group/index.html index 57901a1..fb3148a 100644 --- a/backend/src/main/resources/views/platform/activity/group/index.html +++ b/backend/src/main/resources/views/platform/activity/group/index.html @@ -91,11 +91,11 @@ layout("/layouts/platform_1.html"){ {{row.leaderPhone}} - + diff --git a/backend/src/main/resources/views/platform/activity/signInUserQuery/index.html b/backend/src/main/resources/views/platform/activity/signInUserQuery/index.html index 5f1a2f6..3a356fb 100644 --- a/backend/src/main/resources/views/platform/activity/signInUserQuery/index.html +++ b/backend/src/main/resources/views/platform/activity/signInUserQuery/index.html @@ -85,18 +85,33 @@ layout("/layouts/platform_1.html"){ {{scope.$index+(pageForm.pageNumber - 1) * pageForm.pageSize + 1}} - - - - - - - + + + + + + + + + + + + + + + + diff --git a/backend/src/main/resources/views/platform/activity/user/index.html b/backend/src/main/resources/views/platform/activity/user/index.html index 7f45f3c..f62c474 100644 --- a/backend/src/main/resources/views/platform/activity/user/index.html +++ b/backend/src/main/resources/views/platform/activity/user/index.html @@ -72,31 +72,52 @@ layout("/layouts/platform_1.html"){ 添加报名人员 - 导出 + 导出 - - - - - - - + + + + + + + - + + + + + + + + + + + + + diff --git a/frontend/src/pages/activity/registration-form/index.vue b/frontend/src/pages/activity/registration-form/index.vue index 0d193e1..eb48cb6 100644 --- a/frontend/src/pages/activity/registration-form/index.vue +++ b/frontend/src/pages/activity/registration-form/index.vue @@ -122,7 +122,7 @@ -