c-zhouhf1/zhgh_hmc
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-07-16 11:31:48 +08:00
parent 626b3a0713
commit 3e9fdf0584
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationEnrollController.java
+6 -1
View File
@@ -254,8 +254,13 @@ public class TheRapyRecuperationEnrollController {
Map<Boolean, String> resultMap = new HashMap<>(); Map<Boolean, String> resultMap = new HashMap<>();
if("zjxu".equals(config.getConfigValue())) { if("zjxu".equals(config.getConfigValue())) {
resultMap = enrollService.validSignUpInfoForZJXU((String) ShiroUtil.getPrincipalProperty("loginname"), enrollInfo); resultMap = enrollService.validSignUpInfoForZJXU((String) ShiroUtil.getPrincipalProperty("loginname"), enrollInfo);
} else { } else if("zjiet".equals(config.getConfigValue())) {
resultMap = enrollService.validSignUpInfo((String) ShiroUtil.getPrincipalProperty("loginname"), enrollInfo); resultMap = enrollService.validSignUpInfo((String) ShiroUtil.getPrincipalProperty("loginname"), enrollInfo);
} else if("zjnu".equals(config.getConfigValue())) {
resultMap = enrollService.validSignUpInfoForZJNU((String) ShiroUtil.getPrincipalProperty("loginname"), enrollInfo);
} else if("hmc".equals(config.getConfigValue())) {
// HMC酒店提交必须在行锁范围内重新校验名额，避免并发报名超过酒店最大人数。
resultMap = enrollService.validSignUpInfoForHMC((String) ShiroUtil.getPrincipalProperty("loginname"), enrollInfo);
} }
if (resultMap.containsKey(false)) { if (resultMap.containsKey(false)) {
return Result.error(resultMap.get(false)); return Result.error(resultMap.get(false));
src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/impl/TheRapyRecuperationEnrollServiceImpl.java
+2 -1
View File
@@ -1075,7 +1075,8 @@ public class TheRapyRecuperationEnrollServiceImpl extends ViServiceImpl<TheRapyR
} }
Map<Boolean, String> oneYear = this.validCountOneYear(loginName, travelFrequency, editOther); Map<Boolean, String> oneYear = this.validCountOneYear(loginName, travelFrequency, editOther);
if (oneYear != null) { // 酒店年度报名校验仅在失败时提前返回；校验成功后继续判断酒店最大报名人数。
if (oneYear != null && oneYear.containsKey(false)) {
return oneYear; return oneYear;
} }
} }