diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityApplyController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityApplyController.java index cf7691c..9131e27 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityApplyController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityApplyController.java @@ -8,6 +8,7 @@ import io.v.nutz.base.service.SimpleService; import io.v.nutz.base.service.ViService; import io.v.nutz.base.utils.DateUtil; import io.v.nutz.base.utils.Vi; +import io.v.nutz.sys.models.Sys_file; import io.v.nutz.sys.models.Sys_unit; import io.v.nutz.sys.models.Sys_user; import io.v.nutz.sys.services.SysUserService; @@ -28,6 +29,7 @@ import org.nutz.dao.util.cri.SqlExpressionGroup; import org.nutz.dao.util.cri.Static; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.json.Json; import org.nutz.lang.Lang; import org.nutz.lang.Strings; import org.nutz.lang.util.NutMap; @@ -135,6 +137,7 @@ public class ActivityApplyController { school.competitionMethod, school.rewardMethod, school.precautions, + au.files promiseBookFiles, (SELECT count( 1 ) FROM activity_school_apply app WHERE app.activityId = school.id AND app.`status` = 2 ) apply_num, (SELECT count( 1 ) FROM activity_school_apply app WHERE app.activityId = school.id AND ( app.applyUser = @userid OR app.userId = @userid )) > 0 applyed, (SELECT COUNT(1) FROM activity_school_apply app WHERE app.activityId=school.id AND app.unionId=@unionId AND app.unionLeader=TRUE) LeaderCount, @@ -142,6 +145,7 @@ public class ActivityApplyController { FROM activity_school school LEFT JOIN activity_basic_settings ba ON ba.`code` = school.activityLevel + LEFT JOIN activity_union au ON au.activityId=school.id AND au.unionId=@unionId $condition """).setParam("userid", ShiroUtil.getPrincipalProperty("id")).setParam("unionId", getUnionId()); @@ -851,5 +855,17 @@ public class ActivityApplyController { return Result.success(); } + @At + @ViReturn + @RequiresPermissions("activity.apply") + public Object doPromiseBook(@Param("promiseBookFileList") String promiseBookFileList, @Param("activityId") String activityId) { + ActivityUnion activityUnion = new ActivityUnion(); + activityUnion.setActivityId(activityId); + activityUnion.setUnionId(getUnionId()); + activityUnion.setFiles(Json.fromJsonAsList(Sys_file.class, promiseBookFileList)); + simpleService.insert(activityUnion); + return null; + } + } diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityInfoManageController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityInfoManageController.java index 17e9cf3..aa3fd64 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityInfoManageController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityInfoManageController.java @@ -144,7 +144,7 @@ public class ActivityInfoManageController { @RequiresPermissions("activity.school.info") public Object doAdd(@Param(value = "data", required = false) ActivitySchool activitySchool, @Param(value = "events", required = false) ActivitySchoolEvent[] events) { - List activityBasicUnions = activitySchoolService.dao().query(ActivityBasicUnion.class, Cnd.where("isEnable", "=", true)); +// List activityBasicUnions = activitySchoolService.dao().query(ActivityBasicUnion.class, Cnd.where("isEnable", "=", true)); ActivityBasicUnit activityBasicUnit = activitySchoolService.dao().fetch(ActivityBasicUnit.class, Cnd.where("id", "=", ShiroUtil.getUnitId())); if (activitySchool.getActivityLevel() == 40002) { @@ -154,13 +154,13 @@ public class ActivityInfoManageController { String id = activitySchoolService.doAdd(activitySchool, events); - activityBasicUnions.forEach(v -> { + /* activityBasicUnions.forEach(v -> { ActivityUnion activityUnion = new ActivityUnion(); activityUnion.setActivityId(id); activityUnion.setUnionname(v.getUnionname()); activitySchoolService.insert(activityUnion); }); - +*/ List image = activitySchool.getImage(); ActivityTissue activityTissue = new ActivityTissue(); diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityReadingController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityReadingController.java index dcc70b0..bebd59b 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityReadingController.java +++ b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityReadingController.java @@ -27,6 +27,7 @@ import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Lang; import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.AdaptBy; import org.nutz.mvc.annotation.At; @@ -162,11 +163,15 @@ public class ActivityReadingController { if (!activityLevel.equals("40003")) { List unions = sysUnionService.dao().query(ActivityBasicUnion.class, unionCnd); + List activityUnions = sysUnionService.dao().query(ActivityUnion.class, Cnd.where("activityId", "=", id)); for (ActivityBasicUnion union : unions) { String unionId = union.getId(); NutMap map = new NutMap(); + ActivityUnion activityUnion = activityUnions.stream().filter(a -> a.getUnionId().equals(unionId)).findFirst().orElse(null); + + List applyList = applies.stream().filter(v -> { return v.getString("activityUnionId").equals(unionId); }).collect(Collectors.toList()); @@ -175,6 +180,7 @@ public class ActivityReadingController { map.setv("unioncode", union.getUnioncode()); map.setv("num", applyList.size()); map.setv("apply", applyList); + map.setv("promiseBookFiles", Lang.isNotEmpty(activityUnion) ? activityUnion.getFiles() : new ArrayList<>()); apply.add(map); } diff --git a/src/main/java/io/v/nutz/zhgh/activity/models/ActivityUnion.java b/src/main/java/io/v/nutz/zhgh/activity/models/ActivityUnion.java index 72de3b9..052910d 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/models/ActivityUnion.java +++ b/src/main/java/io/v/nutz/zhgh/activity/models/ActivityUnion.java @@ -1,9 +1,12 @@ package io.v.nutz.zhgh.activity.models; +import io.v.nutz.sys.models.Sys_file; import lombok.Data; import org.nutz.dao.entity.annotation.*; import org.nutz.dao.interceptor.annotation.PrevInsert; +import java.util.List; + /** * TODO * @@ -12,7 +15,6 @@ import org.nutz.dao.interceptor.annotation.PrevInsert; */ @Data @Table -@Comment("活动工会") public class ActivityUnion { @Column @@ -35,4 +37,15 @@ public class ActivityUnion { private String activityId; + @Column + @Comment("工会id") + @ColDefine(type = ColType.VARCHAR, width = 32) + private String unionId; + + @Column + @Comment("活动id") + @ColDefine(type = ColType.MYSQL_JSON) + private List files; + + } diff --git a/src/main/resources/views/platform/activity/school/ActivityApply.html b/src/main/resources/views/platform/activity/school/ActivityApply.html index 0b95f43..c33afc0 100644 --- a/src/main/resources/views/platform/activity/school/ActivityApply.html +++ b/src/main/resources/views/platform/activity/school/ActivityApply.html @@ -236,9 +236,16 @@ layout("/layouts/platform.html"){ {{moment(item.applyEndTime).format('YYYY/MM/DD HH:mm')}}
- 活动时间： +
+ + 上传参赛承诺书 + +
+
@@ -1110,6 +1117,26 @@ layout("/layouts/platform.html"){ + + + + + 暂无承诺书 + + + 关 闭 + 提 交 + + + +