commit

2025-05-06 18:06:33 +08:00
parent e6658bd007
commit 692f3dbc37
5 changed files with 427 additions and 392 deletions
@@ -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
@@ -29,6 +29,7 @@ public class ActUserServiceImpl extends BaseServiceImpl<ActUser> implements ActU

    /**
     * 获取报名人员列表sql
+     *
     * @param pageForm
     * @return
     */
@@ -52,6 +53,9 @@ public class ActUserServiceImpl extends BaseServiceImpl<ActUser> 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() + "%");
@@ -23,4 +23,6 @@ public class ActUserPageForm extends PageForm {

    // 所属单位
    private String unitName;
+    // 是否签到1.全部2.已签到3.未签到
+    private Integer isSignIn;
 }
@@ -49,6 +49,11 @@ layout("/layouts/platform_1.html"){
        <el-row type="flex" style="justify-content: flex-end" class="mb-3">
            <el-button icon="el-icon-plus" type="primary" size="small" @click="openAddUser">添加报名人员</el-button>
            <el-button icon="el-icon-plus" type="primary" size="small" @click="doExport">导出</el-button>
+            <el-radio-group v-model="pageForm.isSignIn" type="primary" class="ml-3"@change="doSearch">
+                <el-radio-button :label="1">全部</el-radio-button>
+                <el-radio-button :label="2">已签到</el-radio-button>
+                <el-radio-button :label="3">未签到</el-radio-button>
+            </el-radio-group>
        </el-row>
        <el-table v-loading="tableLoading" show-overflow-tooltip :data="tableData">
            <el-table-column label="序号" type="index" header-align="center" align="center"
@@ -60,8 +65,13 @@ layout("/layouts/platform_1.html"){
            <el-table-column label="职务" prop="position"></el-table-column>
            <el-table-column label="所属单位" prop="unitName"></el-table-column>
            <el-table-column label="报名时间" prop="signUpTime"></el-table-column>
+            <el-table-column label="是否签到" prop="isSignIn">
+                <template slot-scope="{row}">
+                    {{row.isSignIn?'已签到':'未签到'}}
+                </template>
+            </el-table-column>
            <el-table-column label="操作" fixed="right" width="250">
-				<template #default="scope">
+                <template slot-scope="scope">
                    <el-button type="text" @click="openModify">修改</el-button>
                    <el-button type="text" class="text-danger" @click="onTableRowDelete(scope.row.id)">删除</el-button>
                </template>
@@ -82,7 +92,8 @@ layout("/layouts/platform_1.html"){
                <el-input v-model="formData.contactName" placeholder="请输入联系人"></el-input>
            </el-form-item>
            <el-form-item label="联系方式" prop="contactPhone">
-				<el-input v-model="formData.contactPhone" placeholder="请输入联系方式" maxlength="11" type="text" show-word-limit></el-input>
+                <el-input v-model="formData.contactPhone" placeholder="请输入联系方式" maxlength="11" type="text"
+                          show-word-limit></el-input>
            </el-form-item>
            <el-form-item label="报名人员" prop="userList">
                <el-table :data="formData.userList" border size="small" width="100%">
@@ -94,8 +105,8 @@ layout("/layouts/platform_1.html"){
                                             placeholder="请输入内容"
                                             @select="handleSelect($event, row)"
                            ></el-autocomplete>
-<!--							<el-input v-model="row.userName" maxlength="50"-->
-<!--							          placeholder="请输入姓名"></el-input>-->
+                            <!--							<el-input v-model="row.userName" maxlength="50"-->
+                            <!--							          placeholder="请输入姓名"></el-input>-->
                        </template>
                    </el-table-column>
                    <el-table-column label="性别" prop="sex" width="200">
@@ -193,6 +204,7 @@ layout("/layouts/platform_1.html"){
        data() {
            return {
                pageForm: {
+                    isSignIn: 1,
                    year: new Date().getFullYear() + '',
                },
                activityList: [],
@@ -271,7 +283,7 @@ layout("/layouts/platform_1.html"){
            doExport() {
                window.open("/platform/activity/user/doExport?activityId=" + this.pageForm.activityId + "&searchKeyword=" + this.pageForm.searchKeyword)
            },
-			openAddUser(){
+            openAddUser() {
                if (!this.pageForm.activityId) {
                    this.$message.warning('请先选择活动')
                    return
@@ -281,7 +293,7 @@ layout("/layouts/platform_1.html"){
                this.formData.activityId = this.pageForm.activityId
                this.formData.activityName = this.activityList.find(item => item.id === this.formData.activityId).title
            },
-			async queryUserAsync(query, cb){
+            async queryUserAsync(query, cb) {
                const resp = await $.post('/platform/activity/user/queryUser', {
                    query,
                    activityId: this.formData.activityId
@@ -298,13 +310,13 @@ layout("/layouts/platform_1.html"){
                    cb([])
                }
            },
-			handleSelect(item, row){
+            handleSelect(item, row) {
                this.$set(row, 'userId', item.id)
                this.$set(row, 'userName', item.username)
                this.$set(row, 'sex', item.sex)
                this.$set(row, 'phone', item.phone ? item.phone : '')
            },
-			async onAddUserSubmit(){
+            async onAddUserSubmit() {
                const userList = this.formData.userList;
                if (!userList || userList === []) {
                    this.$message.warning("请添加报名人员")
@@ -313,11 +325,11 @@ layout("/layouts/platform_1.html"){

                let errorMessages = [];
                const requiredFields = [
-					{ key: 'userName', message: '姓名不能为空' },
-					{ key: 'sex', message: '性别不能为空' },
-					{ key: 'phone', message: '联系方式不能为空' },
-					{ key: 'idCard', message: '身份证件号不能为空' },
-					{ key: 'position', message: '职务不能为空' }
+                    {key: 'userName', message: '姓名不能为空'},
+                    {key: 'sex', message: '性别不能为空'},
+                    {key: 'phone', message: '联系方式不能为空'},
+                    {key: 'idCard', message: '身份证件号不能为空'},
+                    {key: 'position', message: '职务不能为空'}
                ];

                userList.forEach((user, index) => {
@@ -379,7 +391,7 @@ layout("/layouts/platform_1.html"){
                    }
                })
            },
-			async getActivityList(){
+            async getActivityList() {
                const resp = await $.post('/platform/activity/user/getActivityList', {
                    year: this.pageForm.year
                })
@@ -26,7 +26,7 @@
              <div class="stat-icon"><i class="bi bi-people"></i></div>
              <div class="stat-content">
                <div class="stat-value">成员：{{ team.groupUsers?.length }}</div>
-<!--                <div class="stat-label">成员</div>-->
+                <!--                <div class="stat-label">成员</div>-->
              </div>
            </div>
            <div class="stat-divider"></div>
@@ -59,7 +59,8 @@
            <div class="section-badge">{{ team.groupUsers.length }}</div>
          </div>
          <div class="member-grid">
-            <div class="member-grid-item" v-for="member in team.groupUsers" :key="member.id" @click="openUserDetail(member)">
+            <div class="member-grid-item" v-for="member in team.groupUsers" :key="member.id"
+                 @click="openUserDetail(member)">
              <div class="member-name">
                {{ member.userName }}
                <t-tag theme="danger" size="small" v-if="member.isLeader">队长</t-tag>
@@ -151,6 +152,16 @@
        <text class="picker-title">成员信息</text>
        <t-icon name="close" @click="showUserDetailPicker = false"/>
      </view>
+
+      <view class="member-list">
+        <t-cell-group bordered>
+          <t-cell title="姓名" hover>{{ userInfo.userName }}</t-cell>
+          <t-cell title="性别" hover>{{userInfo.sex}}</t-cell>
+          <t-cell title="联系方式" hover>{{userInfo.phone}}</t-cell>
+          <t-cell title="职务" hover>{{userInfo.position}}</t-cell>
+          <t-cell title="所属单位" hover>{{userInfo.unitName}}</t-cell>
+        </t-cell-group>
+      </view>
    </view>
  </t-popup>
 </template>
@@ -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;