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

..

Browse Source
This commit is contained in:
server
2025-09-17 14:48:40 +08:00
parent ebd8d4b967
commit cc6bdcc48c
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/activity/family/service/impl/FamilyActivityStatisticsServiceImpl.java
+2 -2
View File
@@ -97,7 +97,7 @@ public class FamilyActivityStatisticsServiceImpl extends BaseServiceImpl<FamilyU
family_user tsuu
LEFT JOIN `vw_user` u ON u.id = tsuu.userId
$condition
ORDER BY FIELD( tsuu.state, 1, 3, 2, 4 ),u.unionid desc, u.unitid desc
ORDER BY FIELD( tsuu.state, 1, 3, 2, 4 ),tsuu.signUpTime desc, u.unionid desc, u.unitid desc
""");
Cnd cnd = Cnd.NEW();
cnd.andEX("tsuu.courseId", "=", courseId);
@@ -149,7 +149,7 @@ public class FamilyActivityStatisticsServiceImpl extends BaseServiceImpl<FamilyU
family_user tsuu
LEFT JOIN `vw_user` u ON u.id = tsuu.userId
$condition
ORDER BY FIELD( tsuu.state, 1, 3, 2, 4 ),u.unionid desc, u.unitid desc
ORDER BY FIELD( tsuu.state, 1, 3, 2, 4 ),tsuu.signUpTime desc,u.unionid desc, u.unitid desc
""");
Cnd cnd = Cnd.NEW();
cnd.andEX("tsuu.courseId", "=", courseId);
src/main/resources/views/platform/zhgh/activity/family/apply/signForm.js
+5 -5
View File
@@ -59,13 +59,13 @@ const signForm = {
<div class="left-span-label"
style="display: flex; justify-content: space-between; align-items: center">
<div>家属信息</div>
<div>{{activity.keyWord}}信息</div>
<div>
<el-button type="danger" size="mini" @click="delFamily">
删除家属
删除{{activity.keyWord}}
</el-button>
<el-button type="primary" size="mini" @click="addFamily">
添加家属
添加{{activity.keyWord}}
</el-button>
</div>
</div>
@@ -74,7 +74,7 @@ const signForm = {
<el-tabs v-model="active" type="card">
<el-tab-pane v-for="(item, index) in formData.mobileColumnsValue"
:name="index + ''"
:label="'家属' + (index + 1)"
:label="activity.keyWord + (index + 1)"
:key="index">
<el-row class="mt20">
<el-col :span="24">
@@ -130,7 +130,7 @@ const signForm = {
</el-tabs>
</div>
<div v-if="formData.mobileColumnsValue.length === 0" style="text-align: center">
<span style="font-size: 15px;color: grey">如有家属，请添加家属</span>
<span style="font-size: 15px;color: grey">如有{{activity.keyWord}}，请添加{{activity.keyWord}}</span>
</div>
</el-form>