c-zhouhf1/zhgh_cug
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
c-zhouhf1
2026-04-25 18:20:04 +08:00
parent 9edd627390
commit 568dc5e169
115 changed files with 1781 additions and 1093 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/activity/sports/controller/ActivitySportsInfoManageController.java
+2 -28
View File
@@ -27,7 +27,6 @@ import org.nutz.mvc.annotation.Ok;
import org.nutz.mvc.annotation.Param;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* @ClassName ActivitySportsInfoManageController
@@ -152,37 +151,12 @@ public class ActivitySportsInfoManageController {
@SLog(tag = "体育活动", msg = "修改活动")
@SaCheckPermission("activity.sports.info")
public Result doEdit(@Param(value = "data") ActivitySchool activitySchool,
@Param(value = "events") ActivitySchoolEvent[] events,
@Param(value = "forceReduceTeam") boolean forceReduceTeam) {
// 编辑活动减少队伍时，先把即将删除且已有报名人员的队伍返回给前端二次确认；确认后由 service 继续保存。
List<NutMap> teamApplyList = activitySportsService.checkTeamReduceApply(activitySchool.getId(), events);
if (!forceReduceTeam && teamApplyList.size() > 0) {
return Result.NEW().addCode(2).addMsg(buildTeamReduceMsg(teamApplyList)).addData(teamApplyList);
}
activitySportsService.doEdit(activitySchool, events, forceReduceTeam);
@Param(value = "events") ActivitySchoolEvent[] events) {
activitySportsService.doEdit(activitySchool, events);
return Result.success();
}
private String buildTeamReduceMsg(List<NutMap> teamApplyList) {
// 返回给前端确认框的报名占用说明：包含项目名称、队伍名称、报名人数，便于用户判断是否强制删除。
StringBuilder msg = new StringBuilder();
for (NutMap teamApply : teamApplyList) {
if (msg.length() > 0) {
msg.append("；");
}
msg.append("项目【")
.append(teamApply.getString("eventName"))
.append("】的【")
.append(teamApply.getString("teamName"))
.append("】已有")
.append(teamApply.getInt("applyNum"))
.append("名报名人员");
}
msg.append("，确认删除这些队伍并保存吗？");
return msg.toString();
}
@At
@SLog(tag = "体育活动", msg = "添加活动")
src/main/java/com/budwk/app/zhgh/activity/sports/controller/ActivitySportsResultsController.java
+77 -13
View File
@@ -5,21 +5,28 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
import com.budwk.app.base.param.PageForm;
import com.budwk.app.base.result.Result;
import com.budwk.app.base.service.BaseService;
import com.budwk.app.base.utils.DateUtil;
import com.budwk.app.base.utils.PwdUtil;
import com.budwk.app.sys.models.Sys_user;
import com.budwk.app.web.commons.auth.utils.SecurityUtil;
import com.budwk.app.zhgh.activity.basic.models.ActivityBasicUnion;
import com.budwk.app.zhgh.activity.basic.models.ActivityBasicUnit;
import com.budwk.app.zhgh.activity.sports.models.ActivityResults;
import com.budwk.app.zhgh.activity.sports.models.ActivitySchoolApply;
import com.budwk.app.zhgh.activity.sports.models.ActivitySchoolEvent;
import com.budwk.app.zhgh.activity.sports.service.ActivitySportsApplyUserService;
import org.nutz.dao.Cnd;
import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql;
import org.nutz.dao.util.cri.SqlExpressionGroup;
import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.lang.random.R;
import org.nutz.mvc.annotation.At;
import org.nutz.mvc.annotation.Ok;
import org.nutz.mvc.annotation.Param;
import org.nutz.trans.Trans;
import java.util.Arrays;
/**
* @author zhf
@@ -46,12 +53,11 @@ public class ActivitySportsResultsController {
@At
@SaCheckPermission("activity.results.input")
public Result pageData(PageForm page,
public Result pageData(String groupName,
PageForm page,
String activityId,
String eventId,
Integer isMenWomen,
String projectType,
String competitionCategory) {
String[] isMenWomen) {
Cnd cnd = Cnd.NEW();
Sql sql = Sqls.create("""
SELECT
@@ -71,10 +77,24 @@ public class ActivitySportsResultsController {
$condition
""");
cnd.and("ase.activityId", "=", activityId);
cnd.andEX("abs.`name`", "=", groupName);
cnd.andEX("ae.`id`", "=", eventId);
cnd.andEX("ae.isMenWomen", "=", isMenWomen);
cnd.andEX("ae.projectType", "=", projectType);
cnd.andEX("ae.competitionCategory", "=", competitionCategory);
SqlExpressionGroup sqlExpressionGroup = new SqlExpressionGroup();
if (Arrays.stream(isMenWomen).anyMatch(a -> a.equals("2"))) {
sqlExpressionGroup.and("ae.isMenWomen", "=", 1);
}
if (Arrays.stream(isMenWomen).anyMatch(a -> a.equals("3"))) {
sqlExpressionGroup.or("ae.isMenWomen", "=", 2);
}
if (Arrays.stream(isMenWomen).anyMatch(a -> a.equals("4"))) {
sqlExpressionGroup.and("ae.projectType", "=", 1);
}
if (Arrays.stream(isMenWomen).anyMatch(a -> a.equals("5"))) {
sqlExpressionGroup.or("ae.projectType", "=", 2);
}
if (sqlExpressionGroup.getExps().size() > 0) {
cnd.and(sqlExpressionGroup);
}
cnd.desc("allName");
sql.setCondition(cnd);
return Result.success(baseService.listPageMap(page.getPageNumber(), page.getPageSize(), sql));
@@ -94,7 +114,53 @@ public class ActivitySportsResultsController {
@At
@SaCheckPermission("activity.results.input")
public Result doAddUser(ActivitySchoolApply activitySchoolApply) {
activitySchoolApplyViService.doAddTemporaryApplyUser(activitySchoolApply);
Sys_user sysUser = baseService.dao().fetch(Sys_user.class, Cnd.where("loginname", "=", activitySchoolApply.getLoginname()));
if (sysUser != null && sysUser.getLoginname().equals(activitySchoolApply.getLoginname()) && !sysUser.getUsername().equals(activitySchoolApply.getUsername())) {
return Result.error("工号已存在，请检查姓名和工号是否一致！");
}
if (sysUser == null) {
Trans.exec(() -> {
String pwd = "@dd3s#3618!";
String salt = R.UU32();
Sys_user user = new Sys_user();
user.setId(R.UU32());
user.setSalt(R.UU32());
user.setPassword(PwdUtil.getPassword(pwd, salt));
user.setUsername(activitySchoolApply.getUsername());
user.setLoginname(activitySchoolApply.getLoginname());
user.setSex(activitySchoolApply.getSex());
user.setUnitId(activitySchoolApply.getUnitId());
user.setMobile(activitySchoolApply.getMobile());
baseService.insert(user);
ActivityBasicUnit activityBasicUnit = activitySchoolApplyViService.dao().fetch(ActivityBasicUnit.class, Cnd.where("id", "=", user.getUnitId()));
ActivityBasicUnion basicUnion = activitySchoolApplyViService.dao().fetch(ActivityBasicUnion.class, Cnd.where("id", "=", activityBasicUnit.getUnionId()));
activitySchoolApply.setUserId(user.getId());
activitySchoolApply.setApplyDate(DateUtil.getDate());
activitySchoolApply.setSex(user.getSex());
activitySchoolApply.setUnitId(user.getUnitId());
activitySchoolApply.setActivityUnionId(basicUnion.getId());
activitySchoolApply.setActivityUnionName(basicUnion.getName());
activitySchoolApplyViService.insert(activitySchoolApply);
});
return null;
}
sysUser.setSex(activitySchoolApply.getSex());
baseService.update(sysUser);
ActivityBasicUnit activityBasicUnit = activitySchoolApplyViService.dao().fetch(ActivityBasicUnit.class, Cnd.where("id", "=", sysUser.getUnitId()));
ActivityBasicUnion basicUnion = activitySchoolApplyViService.dao().fetch(ActivityBasicUnion.class, Cnd.where("id", "=", activityBasicUnit.getUnionId()));
activitySchoolApply.setUserId(sysUser.getId());
activitySchoolApply.setApplyUser(SecurityUtil.getUserId());
activitySchoolApply.setApplyDate(DateUtil.getDate());
activitySchoolApply.setUnitId(sysUser.getUnitId());
activitySchoolApply.setActivityUnionId(basicUnion.getId());
activitySchoolApply.setActivityUnionName(basicUnion.getName());
activitySchoolApplyViService.insert(activitySchoolApply);
return Result.success();
}
@@ -135,10 +201,8 @@ public class ActivitySportsResultsController {
@At
@SaCheckPermission("activity.results.input")
public Result getUnionDetails(String activityId, String eventId, String unionId) {
// 团体成绩录入的人数按活动项目配置的“每队（项）运动员人数”展示，不再按该分工会实际报名人数统计。
ActivitySchoolEvent schoolEvent = activitySchoolApplyViService.dao().fetch(ActivitySchoolEvent.class,
Cnd.where("activityId", "=", activityId).and("eventId", "=", eventId));
return Result.success(schoolEvent == null || schoolEvent.getAthletesMaxNum() == null ? 0 : schoolEvent.getAthletesMaxNum());
int count = activitySchoolApplyViService.count(Cnd.where("activityId", "=", activityId).and("eventId", "=", eventId).and("unionId", "=", unionId));
return Result.success(count);
}
src/main/java/com/budwk/app/zhgh/activity/sports/models/ActivitySchool.java
-5
View File
@@ -188,11 +188,6 @@ public class ActivitySchool extends BaseModel implements Serializable , SysHomeC
@ColDefine(type = ColType.VARCHAR, width = 32)
private String belongClubId;
@Column
@Comment("报多队工会")
@ColDefine(type = ColType.MYSQL_JSON)
private List<String> moreTeamUnionIds;
@Column
@Comment("创建时间")
@ColDefine(type = ColType.VARCHAR, width = 30)
src/main/java/com/budwk/app/zhgh/activity/sports/service/ActivitySportsApplyUserService.java
-2
View File
@@ -23,8 +23,6 @@ public interface ActivitySportsApplyUserService extends BaseService<ActivityScho
Object getUniteApplyInfo(ActivitySportsApplyUserPageParam applyUserPageParam, Integer isMenWomen);
void doAddTemporaryApplyUser(ActivitySchoolApply activitySchoolApply);
void doApplyUser(ActivitySchoolApply[] userList, String eventId, String activityId, Boolean pass, String unionId);
Pagination applyPageData(PageForm page, String activityId, String eventId, String unionId);
src/main/java/com/budwk/app/zhgh/activity/sports/service/ActivitySportsService.java
+1 -5
View File
@@ -4,10 +4,8 @@ package com.budwk.app.zhgh.activity.sports.service;
import com.budwk.app.base.service.BaseService;
import com.budwk.app.zhgh.activity.sports.models.ActivitySchool;
import com.budwk.app.zhgh.activity.sports.models.ActivitySchoolEvent;
import org.nutz.lang.util.NutMap;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* @author Aaron
@@ -16,9 +14,7 @@ public interface ActivitySportsService extends BaseService<ActivitySchool> {
String doAdd(ActivitySchool activitySchool, ActivitySchoolEvent[] events);
void doEdit(ActivitySchool activitySchool, ActivitySchoolEvent[] events, boolean forceReduceTeam);
List<NutMap> checkTeamReduceApply(String activityId, ActivitySchoolEvent[] events);
void doEdit(ActivitySchool activitySchool, ActivitySchoolEvent[] events);
void doDelete(String id);
src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsApplyUserServiceImpl.java
+3 -102
View File
@@ -6,7 +6,6 @@ import com.budwk.app.base.constant.RoleConstant;
import com.budwk.app.base.page.Pagination;
import com.budwk.app.base.param.PageForm;
import com.budwk.app.base.service.impl.BaseServiceImpl;
import com.budwk.app.base.utils.PwdUtil;
import com.budwk.app.sys.models.Sys_user;
import com.budwk.app.web.commons.auth.utils.AuthUtil;
import com.budwk.app.web.commons.auth.utils.SecurityUtil;
@@ -31,7 +30,6 @@ import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.lang.Lang;
import org.nutz.lang.Strings;
import org.nutz.lang.random.R;
import org.nutz.lang.util.NutMap;
import java.util.ArrayList;
@@ -367,10 +365,9 @@ public class ActivitySportsApplyUserServiceImpl extends BaseServiceImpl<Activity
result.put("awardsModeT", awardsModeT);
result.put("awardsModeG", awardsModeG);
boolean allowMoreTeam = allowMoreTeam(activity);
result.put("allowMoreTeam", allowMoreTeam);
// 团体项目队伍范围按活动“报多队工会”控制：命中的工会返回全部队伍，否则只返回第一队。
result.put("team", getApplyTeamList(applyUserPageParam.getActivityId(), applyUserPageParam.getEventId(), allowMoreTeam));
result.put("team", dao().query(ActivitySchoolTeam.class,
Cnd.where("eventId", "=", applyUserPageParam.getEventId())
.and("activityId", "=", applyUserPageParam.getActivityId()).asc("location")));
result.put("activity", activity);
List<NutMap> events = getEvents(applyUserPageParam.getActivityId());
@@ -380,80 +377,12 @@ public class ActivitySportsApplyUserServiceImpl extends BaseServiceImpl<Activity
return result;
}
@Override
@Aop(TransAop.READ_COMMITTED)
public void doAddTemporaryApplyUser(ActivitySchoolApply activitySchoolApply) {
// 成绩录入临时补报名：单项只补人员和工会，团体还需要补默认第1队，保证后续团体成绩下拉能出现该工会。
Sys_user sysUser = dao().fetch(Sys_user.class, Cnd.where("loginname", "=", activitySchoolApply.getLoginname()));
if (sysUser != null && sysUser.getLoginname().equals(activitySchoolApply.getLoginname()) && !sysUser.getUsername().equals(activitySchoolApply.getUsername())) {
throw Lang.makeThrow("工号已存在，请检查姓名和工号是否一致！");
}
if (sysUser == null) {
sysUser = createTemporaryUser(activitySchoolApply);
} else {
sysUser.setSex(activitySchoolApply.getSex());
update(sysUser);
}
fillTemporaryApplyUser(activitySchoolApply, sysUser);
insert(activitySchoolApply);
}
private Sys_user createTemporaryUser(ActivitySchoolApply activitySchoolApply) {
// 临时人员不存在系统账号时，按原逻辑创建基础账号，保证报名记录能关联 userId。
String pwd = "@dd3s#3618!";
String salt = R.UU32();
Sys_user user = new Sys_user();
user.setId(R.UU32());
user.setSalt(salt);
user.setPassword(PwdUtil.getPassword(pwd, salt));
user.setUsername(activitySchoolApply.getUsername());
user.setLoginname(activitySchoolApply.getLoginname());
user.setSex(activitySchoolApply.getSex());
user.setUnitId(activitySchoolApply.getUnitId());
user.setMobile(activitySchoolApply.getMobile());
dao().insert(user);
return user;
}
private void fillTemporaryApplyUser(ActivitySchoolApply activitySchoolApply, Sys_user sysUser) {
ActivityBasicUnit activityBasicUnit = dao().fetch(ActivityBasicUnit.class, Cnd.where("id", "=", sysUser.getUnitId()));
if (activityBasicUnit == null) {
throw Lang.makeThrow("未找到临时人员所属单位！");
}
ActivityBasicUnion basicUnion = dao().fetch(ActivityBasicUnion.class, Cnd.where("id", "=", activityBasicUnit.getUnionId()));
if (basicUnion == null) {
throw Lang.makeThrow("未找到临时人员所属工会！");
}
activitySchoolApply.setUserId(sysUser.getId());
activitySchoolApply.setApplyUser(SecurityUtil.getUserId());
activitySchoolApply.setApplyDate(DateUtil.now());
activitySchoolApply.setSex(sysUser.getSex());
activitySchoolApply.setUnitId(sysUser.getUnitId());
activitySchoolApply.setUnionId(basicUnion.getId());
activitySchoolApply.setActivityUnionId(basicUnion.getId());
activitySchoolApply.setActivityUnionName(basicUnion.getName());
activitySchoolApply.setStatus(activitySchoolApply.getStatus() == null ? 2 : activitySchoolApply.getStatus());
if ("2".equals(activitySchoolApply.getAwardsMode())) {
ActivitySchoolTeam team = getFirstTeam(activitySchoolApply.getActivityId(), activitySchoolApply.getEventId());
if (team == null) {
throw Lang.makeThrow("当前团体项目未创建队伍，无法添加临时人员！");
}
activitySchoolApply.setTeamId(team.getId());
activitySchoolApply.setTeam(team.getName());
}
}
@Override
@Aop(TransAop.READ_COMMITTED)
public void doApplyUser(ActivitySchoolApply[] userList, String eventId, String activityId, Boolean pass, String unionId) {
ActivityBasicUnit basicUnit = dao().fetch(ActivityBasicUnit.class, Cnd.where("id", "=", SecurityUtil.getUnitId()));
ActivityBasicUnion basicUnion = dao().fetch(ActivityBasicUnion.class, Cnd.where("id", "=", StrUtil.isNotBlank(unionId) ? unionId : basicUnit.getUnionId()));
ActivitySchool activity = dao().fetch(ActivitySchool.class, activityId);
ActivitySchoolTeam firstTeam = null;
if (!allowMoreTeam(activity)) {
firstTeam = getFirstTeam(activityId, eventId);
}
for (ActivitySchoolApply apply : userList) {
@@ -462,11 +391,6 @@ public class ActivitySportsApplyUserServiceImpl extends BaseServiceImpl<Activity
apply.setApplyDate(DateUtil.now());
apply.setActivityUnionId(basicUnion.getId());
apply.setActivityUnionName(basicUnion.getName());
// 未配置为可报多队的工会，保存时统一落到第一队，避免绕过前端提交其他队伍。
if (firstTeam != null) {
apply.setTeamId(firstTeam.getId());
apply.setTeam(firstTeam.getName());
}
}
@@ -487,29 +411,6 @@ public class ActivitySportsApplyUserServiceImpl extends BaseServiceImpl<Activity
}
private boolean allowMoreTeam(ActivitySchool activity) {
// 当前登录人工会在活动“报多队工会”列表中时，才允许选择第一队以外的队伍。
return activity != null
&& activity.getMoreTeamUnionIds() != null
&& activity.getMoreTeamUnionIds().contains(getUnionId());
}
private List<ActivitySchoolTeam> getApplyTeamList(String activityId, String eventId, boolean allowMoreTeam) {
List<ActivitySchoolTeam> teams = dao().query(ActivitySchoolTeam.class,
Cnd.where("eventId", "=", eventId)
.and("activityId", "=", activityId)
.asc("location"));
if (allowMoreTeam || teams.size() <= 1) {
return teams;
}
return teams.subList(0, 1);
}
private ActivitySchoolTeam getFirstTeam(String activityId, String eventId) {
List<ActivitySchoolTeam> teams = getApplyTeamList(activityId, eventId, false);
return teams.size() > 0 ? teams.get(0) : null;
}
@Override
public Pagination applyPageData(PageForm page, String activityId, String eventId, String unionId) {
Cnd cnd = Cnd.NEW();
src/main/java/com/budwk/app/zhgh/activity/sports/service/impl/ActivitySportsServiceImpl.java
+1 -87
View File
@@ -9,7 +9,6 @@ import com.budwk.app.base.utils.CommonDownloadUtil;
import com.budwk.app.base.utils.DateUtil;
import com.budwk.app.sys.models.Sys_home_activity;
import com.budwk.app.web.commons.auth.utils.SecurityUtil;
import com.budwk.app.zhgh.activity.basic.models.ActivityEvent;
import com.budwk.app.zhgh.activity.basic.models.ActivityBasicUnit;
import com.budwk.app.zhgh.activity.culture.models.ActivityTissue;
import com.budwk.app.zhgh.activity.sports.models.ActivitySchool;
@@ -29,7 +28,6 @@ import org.nutz.ioc.aop.Aop;
import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.lang.Lang;
import org.nutz.lang.Strings;
import org.nutz.lang.util.NutMap;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
@@ -98,11 +96,7 @@ public class ActivitySportsServiceImpl extends BaseServiceImpl<ActivitySchool> i
@Override
@Aop(TransAop.READ_COMMITTED)
public void doEdit(ActivitySchool activitySchool, ActivitySchoolEvent[] events, boolean forceReduceTeam) {
// 防止绕过 controller 直接调用编辑逻辑时误删已有报名人员使用的队伍，未确认时直接中断本次保存。
if (!forceReduceTeam && checkTeamReduceApply(activitySchool.getId(), events).size() > 0) {
throw Lang.makeThrow("减少队伍时存在已报名人员，请确认后再保存");
}
public void doEdit(ActivitySchool activitySchool, ActivitySchoolEvent[] events) {
ActivitySchool school = dao().fetch(ActivitySchool.class, activitySchool.getId());
if (school.getActivityLevel() == 40002) {
school.setBelongUnionId(SecurityUtil.getUnionId());
@@ -132,7 +126,6 @@ public class ActivitySportsServiceImpl extends BaseServiceImpl<ActivitySchool> i
}
for (ActivitySchoolEvent event : events) {
update(event);
syncTeam(activitySchool.getId(), event);
}
dao().delete(ActivityTissue.class, activitySchool.getId());
ActivityTissue activityTissue = new ActivityTissue();
@@ -164,85 +157,6 @@ public class ActivitySportsServiceImpl extends BaseServiceImpl<ActivitySchool> i
dao().insertOrUpdate(sysHomeActivity);
}
@Override
public List<NutMap> checkTeamReduceApply(String activityId, ActivitySchoolEvent[] events) {
// 检查“最多创建几队”减少后将被删除的队伍，返回仍有报名人员占用的队伍清单给前端确认。
List<NutMap> result = new ArrayList<>();
if (Strings.isBlank(activityId) || events == null || events.length == 0) {
return result;
}
for (ActivitySchoolEvent event : events) {
if (event == null || Strings.isBlank(event.getEventId()) || "allItems".equals(event.getEventId()) || event.getRestrictTotalTeam() == null) {
continue;
}
List<ActivitySchoolTeam> reduceTeams = getReduceTeams(activityId, event);
if (reduceTeams.size() == 0) {
continue;
}
ActivityEvent activityEvent = dao().fetch(ActivityEvent.class, event.getEventId());
for (ActivitySchoolTeam team : reduceTeams) {
int applyNum = dao().count(ActivitySchoolApply.class, Cnd.where("activityId", "=", activityId)
.and("eventId", "=", event.getEventId())
.and("teamId", "=", team.getId()));
if (applyNum > 0) {
result.add(NutMap.NEW()
.setv("eventId", event.getEventId())
.setv("eventName", activityEvent == null ? "" : activityEvent.getAllName())
.setv("teamId", team.getId())
.setv("teamName", team.getName())
.setv("applyNum", applyNum));
}
}
}
return result;
}
private List<ActivitySchoolTeam> getReduceTeams(String activityId, ActivitySchoolEvent event) {
// 按队伍位置保留前 N 队，超过目标队伍数的部分就是本次减少队伍时需要删除的队伍。
List<ActivitySchoolTeam> teams = dao().query(ActivitySchoolTeam.class, Cnd.where("activityId", "=", activityId)
.and("eventId", "=", event.getEventId())
.asc("location"));
int targetTotalTeam = event.getRestrictTotalTeam() == null ? 0 : Math.max(event.getRestrictTotalTeam(), 0);
List<ActivitySchoolTeam> reduceTeams = new ArrayList<>();
for (int i = targetTotalTeam; i < teams.size(); i++) {
reduceTeams.add(teams.get(i));
}
return reduceTeams;
}
private void syncTeam(String schoolId, ActivitySchoolEvent event) {
// 保存项目时同步 activity_school_team：增加队伍只补插缺少的队伍，减少队伍只删除超过目标数量的后续队伍。
if (event == null || Strings.isBlank(event.getEventId()) || "allItems".equals(event.getEventId()) || event.getRestrictTotalTeam() == null) {
return;
}
List<ActivitySchoolTeam> teams = dao().query(ActivitySchoolTeam.class, Cnd.where("activityId", "=", schoolId)
.and("eventId", "=", event.getEventId())
.asc("location"));
int currentTotalTeam = teams.size();
int targetTotalTeam = Math.max(event.getRestrictTotalTeam(), 0);
for (int i = 0; i < teams.size(); i++) {
ActivitySchoolTeam team = teams.get(i);
team.setMinNum(event.getRestrictMinNum());
team.setMaxNum(event.getRestrictMaxNum());
dao().updateIgnoreNull(team);
}
if (targetTotalTeam > currentTotalTeam) {
for (int i = currentTotalTeam + 1; i <= targetTotalTeam; i++) {
ActivitySchoolTeam team = new ActivitySchoolTeam();
team.setActivityId(schoolId);
team.setEventId(event.getEventId());
team.setName(String.format("第%d队", i));
team.setMinNum(event.getRestrictMinNum());
team.setMaxNum(event.getRestrictMaxNum());
dao().insert(team);
}
} else if (targetTotalTeam < currentTotalTeam) {
for (int i = targetTotalTeam; i < teams.size(); i++) {
dao().delete(ActivitySchoolTeam.class, teams.get(i).getId());
}
}
}
@Aop(TransAop.READ_COMMITTED)
private void addTeam(String schoolId, ActivitySchoolEvent[] events) {
if (events.length > 0) {