c-chengc1/hmc_gbhd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/hmc_gbhd

Browse Source
This commit is contained in:
c-zhouhf1
2025-05-14 11:05:10 +08:00
parent 92cdc62657 6c7d41985d
commit 31709a69f8
7 changed files with 98 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/main/java/com/budwk/app/module/activity/controller/ActUserController.java
+5 -1
View File
@@ -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"));
backend/src/main/java/com/budwk/app/module/activity/controller/ActivitySignInQueryController.java
+14 -2
View File
@@ -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");
backend/src/main/java/com/budwk/app/module/activity/service/impl/ActUserServiceImpl.java
+18 -2
View File
@@ -37,13 +37,29 @@ public class ActUserServiceImpl extends BaseServiceImpl<ActUser> 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
backend/src/main/resources/views/platform/activity/group/index.html
+3 -3
View File
@@ -91,11 +91,11 @@ layout("/layouts/platform_1.html"){
<el-tag v-if="row.leaderPhone">{{row.leaderPhone}}</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="250">
<el-table-column label="操作" fixed="right" width="200">
<template #default="scope">
<el-button type="primary" size="mini" @click="openView(scope.row)">查看</el-button>
<el-button type="text" @click="openView(scope.row)">查看</el-button>
<!-- <el-button type="primary" size="mini" @click="openAdjustGroup(scope.row)">调整</el-button>-->
<el-button type="danger" size="mini" @click="doRemove(scope.row)">删除</el-button>
<el-button type="text" class="text-danger" @click="doRemove(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
backend/src/main/resources/views/platform/activity/signInUserQuery/index.html
+22 -7
View File
@@ -85,18 +85,33 @@ layout("/layouts/platform_1.html"){
<span>{{scope.$index+(pageForm.pageNumber - 1) * pageForm.pageSize + 1}} </span>
</template>
</el-table-column>
<el-table-column label="姓名" prop="userName"></el-table-column>
<el-table-column label="性别" prop="sex"></el-table-column>
<el-table-column label="职务" prop="position"></el-table-column>
<el-table-column label="身份证号码" prop="idCard"></el-table-column>
<el-table-column label="联系方式" prop="phone"></el-table-column>
<el-table-column label="参加单位名称" prop="unitName"></el-table-column>
<el-table-column label="签到时间" prop="signInTime"></el-table-column>
<el-table-column label="姓名" prop="userName" min-width="100px"></el-table-column>
<el-table-column label="性别" prop="sex" min-width="60px"></el-table-column>
<el-table-column label="职务" prop="position" min-width="100px"></el-table-column>
<el-table-column label="身份证号码" prop="idCard" min-width="120px"></el-table-column>
<el-table-column label="联系方式" prop="phone" min-width="100px"></el-table-column>
<el-table-column label="单位" prop="unitName" min-width="100px"></el-table-column>
<el-table-column label="签到时间" prop="signInTime" min-width="120px"></el-table-column>
<el-table-column label="是否住宿" prop="isStay">
<template slot-scope="{row}">
{{row.isStay?'住宿':'不住宿'}}
</template>
</el-table-column>
<el-table-column label="才艺名称" prop="skillName">
<template slot-scope="{row}">
<span>{{row.isShowSkill && row.skillName?row.skillName:'--'}}</span>
</template>
</el-table-column>
<el-table-column label="所需器材" prop="equip">
<template slot-scope="{row}">
<span>{{row.isShowEquip && row.equip?row.equip:'--'}}</span>
</template>
</el-table-column>
<el-table-column label="是否参加嘉年华" prop="isParty">
<template slot-scope="{row}">
{{row.isParty ? '是':''}}
</template>
</el-table-column>
<!-- <el-table-column label="物品发放" prop="isGrant">-->
<!-- <template slot-scope="scope">-->
<!-- <el-tag v-if="scope.row.isGrant" type="success">已发放</el-tag>-->
backend/src/main/resources/views/platform/activity/user/index.html
+34 -13
View File
@@ -72,31 +72,52 @@ layout("/layouts/platform_1.html"){
<el-card shadow="never" class="mt-3">
<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-button icon="el-icon-download" type="primary" size="small" @click="doExport">导出</el-button>
</el-row>
<el-table v-loading="tableLoading" show-overflow-tooltip :data="tableData">
<el-table-column label="序号" type="index" header-align="center" align="center"
fixed="left"
:index="indexMethod"
width="50"></el-table-column>
<el-table-column label="姓名" prop="userName"></el-table-column>
<el-table-column label="性别" prop="sex"></el-table-column>
<el-table-column label="联系方式" prop="phone"></el-table-column>
<el-table-column label="身份证件号" prop="idCard"></el-table-column>
<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="userName" width="100px" fixed="left"></el-table-column>
<el-table-column label="性别" prop="sex" width="60px" fixed="left"></el-table-column>
<el-table-column label="职务" prop="position" width="150px"></el-table-column>
<el-table-column label="身份证号码" prop="idCard" width="180px"></el-table-column>
<el-table-column label="联系方式" prop="phone" width="130px"></el-table-column>
<el-table-column label="单位" prop="unitName" width="150px"></el-table-column>
<el-table-column label="报名时间" prop="signUpTime" width="150px"></el-table-column>
<el-table-column label="是否签到" prop="isSignIn">
<template slot-scope="{row}">
<el-tag v-if="row.isSignIn" size="mini" type="success">已签到</el-tag>
<el-tag v-else size="mini" type="info">未签到</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="300">
<el-table-column label="是否住宿" prop="isStay">
<template slot-scope="{row}">
{{row.isStay?'住宿':'不住宿'}}
</template>
</el-table-column>
<el-table-column label="才艺名称" prop="skillName">
<template slot-scope="{row}">
<span>{{row.isShowSkill && row.skillName?row.skillName:'--'}}</span>
</template>
</el-table-column>
<el-table-column label="所需器材" prop="equip">
<template slot-scope="{row}">
<span>{{row.isShowEquip && row.equip?row.equip:'--'}}</span>
</template>
</el-table-column>
<el-table-column label="是否参加嘉年华" prop="isParty">
<template slot-scope="{row}">
{{row.isParty ? '是':''}}
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="200">
<template #default="scope">
<el-button type="primary" size="mini" @click="proxySignIn(scope.row.id)" v-if="!scope.row.isSignIn">签到</el-button>
<el-button type="primary" size="mini" @click="cancelSignIn(scope.row.id)" v-if="scope.row.isSignIn">取消签到</el-button>
<el-button type="primary" size="mini" @click="openModify(scope.row)">修改</el-button>
<el-button type="danger" size="mini" @click="doRemove(scope.row.id)">删除</el-button>
<el-button type="text" @click="openModify(scope.row)">修改</el-button>
<el-button type="text" @click="proxySignIn(scope.row.id)" v-if="!scope.row.isSignIn">签到</el-button>
<el-button type="text" class="text-danger" @click="cancelSignIn(scope.row.id)" v-if="scope.row.isSignIn">取消签到</el-button>
<el-button type="text" class="text-danger" @click="doRemove(scope.row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
frontend/src/pages/activity/registration-form/index.vue
+2 -1
View File
@@ -122,7 +122,7 @@
<t-radio :block="false" name="radio" :value="false" label="否"/>
</t-radio-group>
</t-form-item>
<template v-if="`userList[${index}].isShowSkill`">
<template v-if="formData.userList[index]?.isShowSkill">
<t-form-item label="才艺名称" :name="`userList[${index}].skillName`" :rules="[{required:user.isShowSkill===true,message: '请填写才艺名称'}]">
<t-input v-model="user.skillName" borderless placeholder="请输入才艺名称"></t-input>
</t-form-item>
@@ -785,6 +785,7 @@ function showAgreementPopup() {
.radio-box {
display: flex;
column-gap: 20px;
}
.footer {