diff --git a/src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyActivityApplyController.java b/src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyActivityApplyController.java index 36a66632..9dfdc706 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyActivityApplyController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/family/controller/manage/FamilyActivityApplyController.java @@ -118,6 +118,7 @@ public class FamilyActivityApplyController { @Param(value = "activityId") String activityId, @Param(value = "assortTypes") String[] assortTypes, @Param(value = "dataType") String dataType) { + FamilyActivity activity = dao.fetch(FamilyActivity.class, activityId); Sql sql = Sqls.create(""" SELECT tsuc.*, @@ -167,6 +168,21 @@ public class FamilyActivityApplyController { } } } + + List userList = dao.query(FamilyUser.class, Cnd.where("courseId", "=", c.getString("id")).and("userId", "=", SecurityUtil.getUserId())); + List values = new ArrayList<>(); + if(Lang.isNotEmpty(userList)) { + for (FamilyUser familyUser : userList) { + List> mobileColumnsValue = familyUser.getMobileColumnsValue(); + for (List 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); } diff --git a/src/main/resources/views/platform/zhghh5/activity/family/list/index.html b/src/main/resources/views/platform/zhghh5/activity/family/list/index.html index 4666bd9d..dad57aa7 100644 --- a/src/main/resources/views/platform/zhghh5/activity/family/list/index.html +++ b/src/main/resources/views/platform/zhghh5/activity/family/list/index.html @@ -12,6 +12,12 @@ layout("/layouts/platform_h5.html"){ font-size: 14px; border-radius: 6px; } + .sign-success .label{ + color: #0e9558; + } + .sign-success .value{ + color: #0e9558; + }
@@ -53,6 +59,7 @@ layout("/layouts/platform_h5.html"){ 点我查看 + {{row.signValue}}