篮球赛报名
This commit is contained in:
+16
-5
@@ -29,6 +29,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.nutz.boot.starter.ftp.FtpService;
|
||||
import org.nutz.dao.Chain;
|
||||
import org.nutz.dao.Cnd;
|
||||
import org.nutz.dao.Dao;
|
||||
import org.nutz.dao.Sqls;
|
||||
import org.nutz.dao.entity.Record;
|
||||
import org.nutz.dao.sql.Sql;
|
||||
@@ -66,6 +67,8 @@ import java.util.stream.IntStream;
|
||||
@RequiresAuthentication
|
||||
public class ActivityApplyController {
|
||||
|
||||
@Inject
|
||||
private Dao dao;
|
||||
@Inject
|
||||
private ActivitySchoolService activitySchoolService;
|
||||
@Inject
|
||||
@@ -186,7 +189,7 @@ public class ActivityApplyController {
|
||||
// cnd.and(new Static("now() > school.applyEndTime"));
|
||||
// }
|
||||
|
||||
if (!ShiroUtil.hasAnyRoles("H04,sysadmin,SCHOOL_UNION_SPORTS_ADMIN")) {
|
||||
if (!ShiroUtil.hasAnyRoles("H04,sysadmin,SCHOOL_UNION_SPORTS_ADMIN,gh08")) {
|
||||
cnd.and(new Static("JSON_CONTAINS(school.applyWay,JSON_ARRAY( 1))>0"));
|
||||
cnd.and(new Static("(SELECT COUNT(1) FROM activity_user_scope WHERE groupId=school.activityGroupId AND userId='%s') >0".formatted(ShiroUtil.getUserId())));
|
||||
}
|
||||
@@ -236,7 +239,8 @@ public class ActivityApplyController {
|
||||
u.sex,
|
||||
u.birthday,
|
||||
u.mobile,
|
||||
un.`name` unitname
|
||||
un.`name` unitname,
|
||||
position
|
||||
FROM
|
||||
sys_user u
|
||||
LEFT JOIN activity_basic_unit un ON u.unitid = un.id
|
||||
@@ -409,6 +413,9 @@ public class ActivityApplyController {
|
||||
apply.setActivityUnionId(basicUnit.getUnionid());
|
||||
apply.setActivityUnionName(basicUnion.getUnionname());
|
||||
apply.setApplyUnitId(basicUnit.getId());
|
||||
|
||||
dao.update(Sys_user.class, Chain.make("mobile", apply.getMobile()).add("position", apply.getPosition()),
|
||||
Cnd.where("id", "=", apply.getUserId()));
|
||||
}
|
||||
activitySchoolApplyService.doApplies(activityId, basicUnit.getUnionid(), eventId, Arrays.asList(applies));
|
||||
return null;
|
||||
@@ -554,6 +561,7 @@ public class ActivityApplyController {
|
||||
"\tu.loginname,\n" +
|
||||
"\tu.sex,\n" +
|
||||
"\tu.mobile,\n" +
|
||||
"\tu.position,\n" +
|
||||
"\tun.`name` unitname \n" +
|
||||
"FROM\n" +
|
||||
"\tsys_user u\n" +
|
||||
@@ -666,7 +674,7 @@ public class ActivityApplyController {
|
||||
""").setParam("unionId", getUnionId()).setParam("userId", ShiroUtil.getUserId());
|
||||
|
||||
|
||||
if (!ShiroUtil.hasAnyRoles("H04,sysadmin,SCHOOL_UNION_SPORTS_ADMIN")) {
|
||||
if (!ShiroUtil.hasAnyRoles("H04,sysadmin,SCHOOL_UNION_SPORTS_ADMIN,gh08")) {
|
||||
cnd.where().andLike("school.applyWay ", "1");
|
||||
cnd.and(new Static("(SELECT COUNT(1) FROM activity_user_scope WHERE groupId=school.activityGroupId AND userId='%s') >0".formatted(ShiroUtil.getUserId())));
|
||||
}
|
||||
@@ -892,11 +900,14 @@ public class ActivityApplyController {
|
||||
@ViReturn
|
||||
@RequiresPermissions("activity.apply")
|
||||
public Object doPromiseBook(@Param("promiseBookFileList") String promiseBookFileList, @Param("activityId") String activityId) {
|
||||
String unionId = getUnionId();
|
||||
simpleService.dao().clear(ActivityUnion.class, Cnd.where("activityId", "=", activityId).and("unionId", "=", unionId));
|
||||
|
||||
ActivityUnion activityUnion = new ActivityUnion();
|
||||
activityUnion.setActivityId(activityId);
|
||||
activityUnion.setUnionId(getUnionId());
|
||||
activityUnion.setUnionId(unionId);
|
||||
activityUnion.setFiles(Json.fromJsonAsList(Sys_file.class, promiseBookFileList));
|
||||
simpleService.insert(activityUnion);
|
||||
simpleService.dao().insert(activityUnion);
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user