commit
This commit is contained in:
+16
@@ -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<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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user