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;