|
@@ -283,8 +283,8 @@ public class BandingTaskServiceImpl extends MPJBaseServiceImpl<BandingTaskMapper
|
|
|
if(!Objects.equals(taskClass.getMajorSetId(), newStudent.getFirstAmbitionId()) && !Objects.equals(taskClass.getMajorSetId(), newStudent.getSecondAmbitionId())){
|
|
if(!Objects.equals(taskClass.getMajorSetId(), newStudent.getFirstAmbitionId()) && !Objects.equals(taskClass.getMajorSetId(), newStudent.getSecondAmbitionId())){
|
|
|
continue;
|
|
continue;
|
|
|
}
|
|
}
|
|
|
- //判断该班性别是否已满
|
|
|
|
|
- if(ruleCodes.contains("BR0001")){
|
|
|
|
|
|
|
+ //判断该班性别是否已满,如果设置了排序,即使性别满了班级人数没满继续分班
|
|
|
|
|
+ if(ruleCodes.contains("BR0001") && taskClass.getSortCode() == null){
|
|
|
if(GenderDictionaryEnum.MALE.getCode().equals(newStudent.getGender()) && maleList.size() == maleCount){
|
|
if(GenderDictionaryEnum.MALE.getCode().equals(newStudent.getGender()) && maleList.size() == maleCount){
|
|
|
continue;
|
|
continue;
|
|
|
}else if(GenderDictionaryEnum.FEMALE.getCode().equals(newStudent.getGender()) && femaleList.size() == femaleCount){
|
|
}else if(GenderDictionaryEnum.FEMALE.getCode().equals(newStudent.getGender()) && femaleList.size() == femaleCount){
|