commit
This commit is contained in:
+16
@@ -118,6 +118,7 @@ public class FamilyActivityApplyController {
|
|||||||
@Param(value = "activityId") String activityId,
|
@Param(value = "activityId") String activityId,
|
||||||
@Param(value = "assortTypes") String[] assortTypes,
|
@Param(value = "assortTypes") String[] assortTypes,
|
||||||
@Param(value = "dataType") String dataType) {
|
@Param(value = "dataType") String dataType) {
|
||||||
|
FamilyActivity activity = dao.fetch(FamilyActivity.class, activityId);
|
||||||
Sql sql = Sqls.create("""
|
Sql sql = Sqls.create("""
|
||||||
SELECT
|
SELECT
|
||||||
tsuc.*,
|
tsuc.*,
|
||||||
@@ -167,6 +168,21 @@ public class FamilyActivityApplyController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
List<FamilyUser> userList = dao.query(FamilyUser.class, Cnd.where("courseId", "=", c.getString("id")).and("userId", "=", SecurityUtil.getUserId()));
|
||||||
|
List<String> values = new ArrayList<>();
|
||||||
|
if(Lang.isNotEmpty(userList)) {
|
||||||
|
for (FamilyUser familyUser : userList) {
|
||||||
|
List<List<NutMap>> mobileColumnsValue = familyUser.getMobileColumnsValue();
|
||||||
|
for (List<NutMap> listMap : mobileColumnsValue) {
|
||||||
|
NutMap nutMap = listMap.stream().filter(o -> Objects.equals(o.getString("columnCode"), activity.getOnlyKey())).findFirst().orElse(null);
|
||||||
|
if(nutMap != null) {
|
||||||
|
values.add(nutMap.getString("columnValue"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
c.put("signValue", String.join(",", values));
|
||||||
|
}
|
||||||
});
|
});
|
||||||
return Result.success(pagination);
|
return Result.success(pagination);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,6 +12,12 @@ layout("/layouts/platform_h5.html"){
|
|||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
border-radius: 6px;
|
border-radius: 6px;
|
||||||
}
|
}
|
||||||
|
.sign-success .label{
|
||||||
|
color: #0e9558;
|
||||||
|
}
|
||||||
|
.sign-success .value{
|
||||||
|
color: #0e9558;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<div id="app">
|
<div id="app">
|
||||||
@@ -53,6 +59,7 @@ layout("/layouts/platform_h5.html"){
|
|||||||
<table-column v-if="row.introduce?.trim()" label="详细信息">
|
<table-column v-if="row.introduce?.trim()" label="详细信息">
|
||||||
<span @click="introduceRow = row; introduceVisible = true" class="primary-color">点我查看</span>
|
<span @click="introduceRow = row; introduceVisible = true" class="primary-color">点我查看</span>
|
||||||
</table-column>
|
</table-column>
|
||||||
|
<table-column label="报名成功" v-if="row.signValue" class="sign-success">{{row.signValue}}</table-column>
|
||||||
</template>
|
</template>
|
||||||
<template #actions="{index,row}">
|
<template #actions="{index,row}">
|
||||||
<div v-if="activity.wechat && row.isSign" class="action-btn" @click="this.vant.ImagePreview([activity.wechat])">
|
<div v-if="activity.wechat && row.isSign" class="action-btn" @click="this.vant.ImagePreview([activity.wechat])">
|
||||||
|
|||||||
Reference in New Issue
Block a user