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

commit

Browse Source
This commit is contained in:
c-zhouhf1
2025-05-06 19:21:24 +08:00
parent a4e8706cf2
commit 4b0dfc8f0e
9 changed files with 601 additions and 439 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
+2 -1
View File
@@ -222,7 +222,8 @@ public class ActUserController {
add(new ExcelExportEntity("联系方式", "mobile", 20));
add(new ExcelExportEntity("职务", "position", 20));
add(new ExcelExportEntity("所属单位", "unitName", 20));
add(new ExcelExportEntity("报名时间", "signUpTime2", 20));
add(new ExcelExportEntity("报名时间", "signUpTime", 20));
add(new ExcelExportEntity("是否签到", "isSignInDesc", 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/ActivityItemApplyQueryController.java
+2 -1
View File
@@ -79,9 +79,10 @@ public class ActivityItemApplyQueryController {
if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
SqlExpressionGroup group = new SqlExpressionGroup();
group.or("au.userName", "LIKE", "%" + pageForm.getSearchKeyword() + "%");
group.or("au.unitName", "LIKE", "%" + pageForm.getSearchKeyword() + "%");
group.or("au.phone", "LIKE", "%" + pageForm.getSearchKeyword() + "%");
cnd.and(group);
}
cnd.andEX("au.unitId","=",pageForm.getUnitId());
cnd.and("au.activityId", "=", pageForm.getActivityId());
cnd.andEX("aiu.itemId", "=", pageForm.getItemId());
cnd.asc("ai.`name`");
backend/src/main/java/com/budwk/app/module/activity/controller/ActivitySignInQueryController.java
+20 -4
View File
@@ -76,9 +76,12 @@ public class ActivitySignInQueryController {
if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
SqlExpressionGroup group = new SqlExpressionGroup();
group.or("au.userName", "LIKE", "%" + pageForm.getSearchKeyword() + "%");
group.or("au.unitName", "LIKE", "%" + pageForm.getSearchKeyword() + "%");
group.or("au.phone", "LIKE", "%" + pageForm.getSearchKeyword() + "%");
cnd.and(group);
}
cnd.andEX("au.unitId","=",pageForm.getUnitId());
cnd.andEX("au.isStay","=",pageForm.getIsStay());
cnd.andEX("au.isGrant","=",pageForm.getIsGrant());
cnd.and("au.activityId", "=", pageForm.getActivityId());
cnd.and("au.isSignIn", "=", 1);
cnd.desc("au.signInTime");
@@ -109,7 +112,15 @@ public class ActivitySignInQueryController {
Sql sql = Sqls.create("""
SELECT
au.*,
DATE_FORMAT(signInTime, '%Y-%m-%d %H:%i:%s') signInTime
DATE_FORMAT(signInTime, '%Y-%m-%d %H:%i:%s') signInTime,
CASE au.isStay
WHEN 1 THEN '住宿'
WHEN 0 THEN '不住宿'
END AS isStayDesc,
CASE au.isGrant
WHEN 1 THEN '已发放'
WHEN 0 THEN '未发放'
END AS isGrantDesc
FROM
`act_user` au
$condition
@@ -117,9 +128,12 @@ public class ActivitySignInQueryController {
if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
SqlExpressionGroup group = new SqlExpressionGroup();
group.or("au.userName", "LIKE", "%" + pageForm.getSearchKeyword() + "%");
group.or("au.unitName", "LIKE", "%" + pageForm.getSearchKeyword() + "%");
group.or("au.phone", "LIKE", "%" + pageForm.getSearchKeyword() + "%");
cnd.and(group);
}
cnd.andEX("au.isStay","=",pageForm.getIsStay());
cnd.andEX("au.isGrant","=",pageForm.getIsGrant());
cnd.andEX("au.unitId","=",pageForm.getUnitId());
cnd.and("au.activityId", "=", pageForm.getActivityId());
cnd.and("au.isSignIn", "=", 1);
cnd.desc("au.signInTime");
@@ -132,7 +146,9 @@ public class ActivitySignInQueryController {
add(new ExcelExportEntity("身份证号码", "idCard", 20));
add(new ExcelExportEntity("联系方式", "mobile", 20));
add(new ExcelExportEntity("参加单位名称", "unitName", 20));
add(new ExcelExportEntity("签到时间", "signUpTime2", 20));
add(new ExcelExportEntity("签到时间", "signInTime", 20));
add(new ExcelExportEntity("是否住宿", "isStayDesc", 20));
add(new ExcelExportEntity("物资发放", "isGrantDesc", 20));
}};
response.setContentType("application/octet-stream");
backend/src/main/java/com/budwk/app/module/activity/service/impl/ActUserServiceImpl.java
+7 -8
View File
@@ -38,7 +38,11 @@ public class ActUserServiceImpl extends BaseServiceImpl<ActUser> implements ActU
Sql sql = Sqls.create("""
SELECT
u.*,
DATE_FORMAT(signUpTime, '%Y-%m-%d %H:%i:%s') signUpTime2,
DATE_FORMAT(signUpTime, '%Y-%m-%d %H:%i:%s') signUpTime,
CASE u.isSignIn
WHEN 1 THEN '已签到'
WHEN 0 THEN '未签到'
END AS isSignInDesc,
act.`title` AS activityName
FROM
act_user u
@@ -53,13 +57,8 @@ 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() + "%");
}
cnd.andEX("u.isSignIn", "=", pageForm.getIsSignIn());
cnd.andEX("u.unitId", "=", pageForm.getUnitId());
sql.setCondition(cnd);
return sql;
}
backend/src/main/java/com/budwk/app/module/activity/vo/page/ActSignInUserPageForm.java
+6
View File
@@ -23,5 +23,11 @@ public class ActSignInUserPageForm extends PageForm {
// 所属单位
private String unitName;
// 发放状态
private Integer isGrant;
// 单位
private Integer unitId;
// 是否住宿
private Integer isStay;
}
backend/src/main/java/com/budwk/app/module/activity/vo/page/ActUserPageForm.java
+3 -1
View File
@@ -23,6 +23,8 @@ public class ActUserPageForm extends PageForm {
// 所属单位
private String unitName;
// 是否签到1.全部2.已签到3.未签到
// 所属单位
private String unitId;
// 是否签到
private Integer isSignIn;
}
backend/src/main/resources/views/platform/activity/itemApplyQuery/index.html
+26 -4
View File
@@ -46,9 +46,23 @@ layout("/layouts/platform_1.html"){
</div>
</div>
<div class="search-item">
<div class="search-item-label">姓名/单位</div>
<div class="search-item-label">姓名/电话</div>
<div class="search-item-option">
<el-input v-model="pageForm.searchKeyword" clearable placeholder="请输入姓名/单位"></el-input>
<el-input v-model="pageForm.searchKeyword" clearable placeholder="请输入姓名/电话"></el-input>
</div>
</div>
<div class="search-item">
<div class="search-item-label">所属单位</div>
<div class="search-item-option">
<el-select placeholder="请选择所属单位"
style="width: 100%;" clearable
filterable
@change="setModifyFormUnit"
v-model="pageForm.unitId">
<el-option :label="item.name" :value="item.id"
v-for="item in units"></el-option>
</el-select>
</div>
</div>
@@ -72,7 +86,7 @@ layout("/layouts/platform_1.html"){
<el-table-column label="性别" prop="sex"width="150"></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="mobile"></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="itemName"></el-table-column>
</el-table>
@@ -92,7 +106,8 @@ layout("/layouts/platform_1.html"){
year: new Date().getFullYear() + ""
},
activityOptions: [],
activityItemOptions: []
activityItemOptions: [],
units: [],
}
},
methods: {
@@ -126,9 +141,16 @@ layout("/layouts/platform_1.html"){
})
},
async getUnits(){
const resp = await $.post('/open/common/units')
if (resp.code === 0) {
this.units = resp.data
}
}
},
created() {
this.getActivityOptions()
this.getUnits()
}
})
</script>
backend/src/main/resources/views/platform/activity/signInUserQuery/index.html
+50 -5
View File
@@ -33,9 +33,39 @@ layout("/layouts/platform_1.html"){
</div>
</div>
<div class="search-item">
<div class="search-item-label">姓名/单位</div>
<div class="search-item-label">发放状态</div>
<div class="search-item-option">
<el-input v-model="pageForm.searchKeyword" clearable placeholder="请输入姓名/单位"></el-input>
<el-select v-model="pageForm.isGrant" placeholder="请选择发放状态" clearable>
<el-option label="已发放" :value="1"></el-option>
<el-option label="未发放" :value="0"></el-option>
</el-select>
</div>
</div>
<div class="search-item">
<div class="search-item-label">住宿状态</div>
<div class="search-item-option">
<el-select v-model="pageForm.isStay" placeholder="请选择住宿状态" clearable>
<el-option label="住宿" :value="1"></el-option>
<el-option label="不住宿" :value="0"></el-option>
</el-select>
</div>
</div>
<div class="search-item">
<div class="search-item-label">姓名/电话</div>
<div class="search-item-option">
<el-input v-model="pageForm.searchKeyword" clearable placeholder="请输入姓名/电话"></el-input>
</div>
</div>
<div class="search-item">
<div class="search-item-label">所属单位</div>
<div class="search-item-option">
<el-select placeholder="请选择所属单位"
style="width: 100%;" clearable
filterable
v-model="pageForm.unitId">
<el-option :label="item.name" :value="item.id"
v-for="item in units"></el-option>
</el-select>
</div>
</div>
@@ -59,9 +89,14 @@ layout("/layouts/platform_1.html"){
<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="mobile"></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="isStay">
<template slot-scope="{row}">
{{row.isStay?'住宿':'不住宿'}}
</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>
@@ -70,7 +105,9 @@ layout("/layouts/platform_1.html"){
</el-table-column>
<el-table-column label="操作" fixed="right" width="200">
<template #default="{row}">
<el-button v-if="!row.isGrant || row.isGrant === 0" type="primary" size="mini" @click="doGrant(row, true)">设为已发放物资</el-button>
<el-button v-if="!row.isGrant || row.isGrant === 0" type="primary" size="mini"
@click="doGrant(row, true)">设为已发放物资
</el-button>
<el-button v-else type="danger" size="mini" @click="doGrant(row, false)">设为未发放物资</el-button>
</template>
</el-table-column>
@@ -90,7 +127,8 @@ layout("/layouts/platform_1.html"){
pageForm: {
year: new Date().getFullYear() + ""
},
activityOptions: []
activityOptions: [],
units: [],
}
},
methods: {
@@ -131,9 +169,16 @@ layout("/layouts/platform_1.html"){
})
},
async getUnits() {
const resp = await $.post('/open/common/units')
if (resp.code === 0) {
this.units = resp.data
}
}
},
created() {
this.getActivityOptions()
this.getUnits()
}
})
</script>
backend/src/main/resources/views/platform/activity/user/index.html
+82 -12
View File
@@ -38,6 +38,30 @@ layout("/layouts/platform_1.html"){
clearable @keyup.enter.native="doSearch"></el-input>
</div>
</div>
<div class="search-item">
<div class="search-item-label">签到状态</div>
<div class="search-item-option">
<el-select v-model="pageForm.isSignIn" placeholder="请选择发放状态" clearable>
<el-option label="已签到" :value="1"></el-option>
<el-option label="未签到" :value="0"></el-option>
</el-select>
</div>
</div>
<div class="search-item">
<div class="search-item-label">所属单位</div>
<div class="search-item-option">
<el-select placeholder="请选择所属单位"
style="width: 100%;" clearable
filterable
@change="setModifyFormUnit"
v-model="pageForm.unitId">
<el-option :label="item.name" :value="item.id"
v-for="item in units"></el-option>
</el-select>
</div>
</div>
<div class="search-query">
<el-button type="primary" icon="el-icon-search" @click="doSearch">搜索</el-button>
@@ -49,11 +73,6 @@ 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"
@@ -72,8 +91,8 @@ layout("/layouts/platform_1.html"){
</el-table-column>
<el-table-column label="操作" fixed="right" width="250">
<template #default="scope">
<el-button type="text" @click="openModify">修改</el-button>
<el-button type="text" class="text-danger" @click="onTableRowDelete(scope.row.id)">删除</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>
</template>
</el-table-column>
</el-table>
@@ -86,7 +105,14 @@ layout("/layouts/platform_1.html"){
<el-input v-model="formData.activityName" readonly></el-input>
</el-form-item>
<el-form-item label="参加单位" prop="unitName">
<el-input v-model="formData.unitName" placeholder="请输入参加单位"></el-input>
<el-select placeholder="请选择所属单位"
style="width: 100%;" clearable
@change="setFormDataUnit"
v-model="formData.unitId">
<el-option :label="item.name" :value="item.id"
v-for="item in units"></el-option>
</el-select>
<!-- <el-input v-model="formData.unitName" placeholder="请输入参加单位"></el-input>-->
</el-form-item>
<el-form-item label="联系人" prop="contactName">
<el-input v-model="formData.contactName" placeholder="请输入联系人"></el-input>
@@ -104,8 +130,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">
@@ -185,7 +211,14 @@ layout("/layouts/platform_1.html"){
<el-input v-model="modifyForm.position"></el-input>
</el-form-item>
<el-form-item label="所属单位" prop="unitName">
<el-input v-model="modifyForm.unitName"></el-input>
<el-select placeholder="请选择所属单位"
style="width: 100%;" clearable
@change="setModifyFormUnit"
v-model="modifyForm.unitId">
<el-option :label="item.name" :value="item.id"
v-for="item in units"></el-option>
</el-select>
<!-- <el-input v-model="modifyForm.unitName"></el-input>-->
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -203,7 +236,6 @@ layout("/layouts/platform_1.html"){
data() {
return {
pageForm: {
isSignIn: 1,
year: new Date().getFullYear() + '',
},
activityList: [],
@@ -276,9 +308,40 @@ layout("/layouts/platform_1.html"){
contactPhone: [{required: true, message: '请填写联系电话', trigger: ['blur', 'change']}],
userList: [{required: true, message: '请添加报名人员', trigger: ['blur', 'change']}]
},
units: [],
}
},
methods: {
setFormDataUnit(val) {
if (!val) {
this.formData.unitName = ''
return
}
this.formData.unitName = this.units.find(item => item.id === this.formData.unitId).name
},
setModifyFormUnit(val) {
if (!val) {
this.modifyForm.unitName = ''
return
}
this.modifyForm.unitName = this.units.find(item => item.id === this.modifyForm.unitId).name
},
doRemove(id) {
this.$confirm('您确定要删除吗？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(async () => {
const resp = await $.post('/platform/activity/user/doDeleteActUser', {id})
if (resp.code === 0) {
this.doSearch()
this.$message.success(resp.msg)
} else {
this.$message.warning('操作失败')
}
})
},
doExport() {
window.open("/platform/activity/user/doExport?activityId=" + this.pageForm.activityId + "&searchKeyword=" + this.pageForm.searchKeyword)
},
@@ -401,10 +464,17 @@ layout("/layouts/platform_1.html"){
this.$set(this.pageForm, 'activityId', '')
}
this.pageData()
},
async getUnits(){
const resp = await $.post('/open/common/units')
if (resp.code === 0) {
this.units = resp.data
}
}
},
created() {
this.getActivityList()
this.getUnits()
}
})
</script>