|
|
@@ -549,9 +549,9 @@ public class RoomBedServiceImpl extends MPJBaseServiceImpl<RoomBedMapper, RoomBe
|
|
|
@Override
|
|
|
public Boolean adjustBedBatch(List<AdjustStudentBedDto> dtoList) {
|
|
|
//存分配到女生寝室的男生名字
|
|
|
- List<String> boyStudents = new ArrayList<>();
|
|
|
+ Set<String> boyStudents = new HashSet<>();
|
|
|
//存分配到男生寝室的女生名字
|
|
|
- List<String> girlStudents = new ArrayList<>();
|
|
|
+ Set<String> girlStudents = new HashSet<>();
|
|
|
//需要清空床位的学生
|
|
|
List<AdjustStudentBedDto> todoStudents = new ArrayList<>();
|
|
|
|
|
|
@@ -621,29 +621,33 @@ public class RoomBedServiceImpl extends MPJBaseServiceImpl<RoomBedMapper, RoomBe
|
|
|
}
|
|
|
}else{
|
|
|
String boyMsg = "学生";
|
|
|
- for (int i = 0; i < boyStudents.size(); i ++){
|
|
|
+ int i = 0;
|
|
|
+ for (String boyStudent : boyStudents) {
|
|
|
if(i > 0){
|
|
|
boyMsg += "、";
|
|
|
}
|
|
|
- boyMsg += boyStudents.get(i);
|
|
|
+ boyMsg += boyStudent;
|
|
|
+ i ++;
|
|
|
}
|
|
|
boyMsg += "被分配到女生寝室";
|
|
|
|
|
|
String girlMsg = "学生";
|
|
|
- for (int i = 0; i < girlStudents.size(); i ++){
|
|
|
+ i = 0;
|
|
|
+ for (String girlStudent : girlStudents) {
|
|
|
if(i > 0){
|
|
|
girlMsg += "、";
|
|
|
}
|
|
|
- girlMsg += girlStudents.get(i);
|
|
|
+ girlMsg += girlStudent;
|
|
|
+ i ++;
|
|
|
}
|
|
|
- girlMsg += "被分配到女生寝室";
|
|
|
+ girlMsg += "被分配到男生寝室";
|
|
|
|
|
|
String moreBedMsg = "学生";
|
|
|
- for (int i = 0; i < moreBedStudents.size(); i ++){
|
|
|
- if(i > 0){
|
|
|
+ for (int j = 0; i < moreBedStudents.size(); j ++){
|
|
|
+ if(j > 0){
|
|
|
moreBedMsg += "、";
|
|
|
}
|
|
|
- moreBedMsg += moreBedStudents.get(i);
|
|
|
+ moreBedMsg += moreBedStudents.get(j);
|
|
|
}
|
|
|
moreBedMsg += "被分配多个床位";
|
|
|
throw new MyException(boyMsg + ";" + girlMsg + ";" + moreBedMsg);
|