From 692f3dbc3739bb04ac8248d0c4c408ee8784e279 Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Tue, 6 May 2025 18:06:33 +0800 Subject: [PATCH 1/5] commit --- .../controller/ClientGroupController.java | 5 +- .../service/impl/ActUserServiceImpl.java | 4 + .../activity/vo/page/ActUserPageForm.java | 2 + .../views/platform/activity/user/index.html | 786 +++++++++--------- frontend/src/pages/activity/team/index.vue | 22 +- 5 files changed, 427 insertions(+), 392 deletions(-) diff --git a/backend/src/main/java/com/budwk/app/client/module/activity/controller/ClientGroupController.java b/backend/src/main/java/com/budwk/app/client/module/activity/controller/ClientGroupController.java index fc3b372..128a7f8 100644 --- a/backend/src/main/java/com/budwk/app/client/module/activity/controller/ClientGroupController.java +++ b/backend/src/main/java/com/budwk/app/client/module/activity/controller/ClientGroupController.java @@ -90,11 +90,14 @@ public class ClientGroupController { SELECT t1.*, t2.userName, + t2.position, t2.unitName, - t2.sex + t2.sex, + t3.phone FROM `act_group_user` t1 LEFT JOIN act_user t2 ON t1.userId = t2.userId + LEFT JOIN client_user t3 ON t1.userId = t3.id WHERE t1.groupId=@groupId ORDER BY t1.isLeader DESC 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 f3e9e58..f19e1e1 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 @@ -29,6 +29,7 @@ public class ActUserServiceImpl extends BaseServiceImpl implements ActU /** * 获取报名人员列表sql + * * @param pageForm * @return */ @@ -52,6 +53,9 @@ public class ActUserServiceImpl extends BaseServiceImpl implements ActU seg.orLike("u.phone", pageForm.getSearchKeyword()); cnd.and(seg); } + if (pageForm.getIsSignIn() != 1) { + cnd.andEX("u.isSignIn", "=", pageForm.getIsSignIn() == 2 ? 1 : 0); + } // cnd.andEX("u.phone", "like", "%" + pageForm.getPhone() + "%"); if (StrUtil.isNotBlank(pageForm.getUnitName())) { cnd.and("u.unitName", "like", "%" + pageForm.getUnitName() + "%"); diff --git a/backend/src/main/java/com/budwk/app/module/activity/vo/page/ActUserPageForm.java b/backend/src/main/java/com/budwk/app/module/activity/vo/page/ActUserPageForm.java index bf9af17..12a89e0 100644 --- a/backend/src/main/java/com/budwk/app/module/activity/vo/page/ActUserPageForm.java +++ b/backend/src/main/java/com/budwk/app/module/activity/vo/page/ActUserPageForm.java @@ -23,4 +23,6 @@ public class ActUserPageForm extends PageForm { // 所属单位 private String unitName; + // 是否签到1.全部2.已签到3.未签到 + private Integer isSignIn; } 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 75d2ef8..d7fa51f 100644 --- a/backend/src/main/resources/views/platform/activity/user/index.html +++ b/backend/src/main/resources/views/platform/activity/user/index.html @@ -2,400 +2,412 @@ layout("/layouts/platform_1.html"){ #-->
- -
-
-
年度
-
- -
-
-
-
所属活动
-
- - - -
-
- -
-
姓名/电话
-
- -
-
- -
- 搜索 -
-
- - - - - 添加报名人员 - 导出 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- 取 消 - 确 定 -
- - - - - - - - - - - - - - - - - - - - - - - - - - - + +
+
+
年度
+
+ +
+
+
+
所属活动
+
+ + + +
+
+ +
+
姓名/电话
+
+ +
+
+ +
+ 搜索 +
+
+ + + + + 添加报名人员 + 导出 + + 全部 + 已签到 + 未签到 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 取 消 + 确 定 +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + 取消 提交 - +
+
@@ -59,7 +59,8 @@
{{ team.groupUsers.length }}
-
+
{{ member.userName }} 队长 @@ -151,6 +152,16 @@ 成员信息 + + + + {{ userInfo.userName }} + {{userInfo.sex}} + {{userInfo.phone}} + {{userInfo.position}} + {{userInfo.unitName}} + + @@ -185,10 +196,12 @@ let team = ref(null); const leaderConfirmVisible = ref(false) // 用户详情弹框 -const showUserDetailPicker=ref(false) +const showUserDetailPicker = ref(false) +const userInfo = ref({}) // 打开用户详情 const openUserDetail = (val) => { showUserDetailPicker.value = true + userInfo.value = val console.log(val) } @@ -251,7 +264,7 @@ const getListAct = async () => { }; // 点击查看成绩排名 -const queryRank=()=>{ +const queryRank = () => { uni.navigateTo({url: '/pages/activity/rank/index?id=' + pageForm.actId}) } @@ -272,6 +285,7 @@ onLoad(() => { .content-area { padding: 0 16px 24px; } + /*用户弹框*/ .member-picker { background-color: #fff; From 4bac34dd67202e62adab88819c7c58e13978365c Mon Sep 17 00:00:00 2001 From: Paidax Date: Tue, 6 May 2025 19:17:19 +0800 Subject: [PATCH 2/5] commit --- .../controller/ActGroupController.java | 22 ++++++++++ .../controller/ActUserController.java | 2 +- .../views/platform/activity/group/index.html | 16 ++++--- .../views/platform/activity/group/viewInfo.js | 43 +++++++++++++++++++ .../views/platform/activity/user/index.html | 4 +- 5 files changed, 78 insertions(+), 9 deletions(-) create mode 100644 backend/src/main/resources/views/platform/activity/group/viewInfo.js diff --git a/backend/src/main/java/com/budwk/app/module/activity/controller/ActGroupController.java b/backend/src/main/java/com/budwk/app/module/activity/controller/ActGroupController.java index 1ba707c..74806fb 100644 --- a/backend/src/main/java/com/budwk/app/module/activity/controller/ActGroupController.java +++ b/backend/src/main/java/com/budwk/app/module/activity/controller/ActGroupController.java @@ -142,6 +142,28 @@ public class ActGroupController { } + @At + @SaCheckPermission("activity.group") + public Result queryGroupUser(String activityId, String groupId){ + Sql sql = Sqls.create(""" + SELECT + u.*, + agu.isLeader + FROM + act_group_user agu + LEFT JOIN act_user u ON u.userId = agu.userId + WHERE + agu.groupId = @groupId AND agu.activityId = @activityId + ORDER BY + agu.isLeader DESC + """).setParam("groupId", groupId).setParam("activityId", activityId); + sql.setCallback(Sqls.callback.maps()); + dao.execute(sql); + List list = (List) sql.getResult(); + return Result.success(list); + } + + @At @SaCheckPermission("activity.group") @SLog(tag = "活动分组", msg = "随机分组") 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 d36886b..698717e 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 @@ -215,7 +215,7 @@ public class ActUserController { Sql sql = actUserService.getSignUpSql(pageForm); List nutMaps = actUserService.listMap(sql); List entityList = new ArrayList<>() {{ - add(new ExcelExportEntity("报名号", "actUserNo", 20)); +// add(new ExcelExportEntity("报名号", "actUserNo", 20)); add(new ExcelExportEntity("姓名", "userName", 20)); add(new ExcelExportEntity("性别", "sex", 20)); add(new ExcelExportEntity("身份证号码", "idCard", 20)); 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 c5af97b..1343144 100644 --- a/backend/src/main/resources/views/platform/activity/group/index.html +++ b/backend/src/main/resources/views/platform/activity/group/index.html @@ -90,7 +90,7 @@ layout("/layouts/platform_1.html"){ @@ -100,16 +100,20 @@ layout("/layouts/platform_1.html"){ + +
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 bfed59e..51ac18a 100644 --- a/backend/src/main/resources/views/platform/activity/signInUserQuery/index.html +++ b/backend/src/main/resources/views/platform/activity/signInUserQuery/index.html @@ -33,9 +33,39 @@ layout("/layouts/platform_1.html"){
-
姓名/单位
+
发放状态
- + + + + +
+
+
+
住宿状态
+
+ + + + +
+
+
+
姓名/电话
+
+ +
+
+
+
所属单位
+
+ + +
@@ -59,21 +89,28 @@ layout("/layouts/platform_1.html"){ - + + + + -