|
|
@@ -51,6 +51,7 @@ import java.time.format.DateTimeFormatter;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Arrays;
|
|
|
import java.util.Date;
|
|
|
+import java.util.HashSet;
|
|
|
import java.util.List;
|
|
|
import java.util.Set;
|
|
|
import java.util.stream.Collectors;
|
|
|
@@ -288,12 +289,12 @@ public class ScheduleController {
|
|
|
List<ClassTime> classTimeList = classTimeService.list();
|
|
|
String courseNames = "";
|
|
|
String timeNumbers = "";
|
|
|
- String classIds = "";
|
|
|
+ Set<Long> classIdSet = new HashSet<>();
|
|
|
+ Set<String> classNameSet = new HashSet<>();
|
|
|
for (int i = 0; i < list.size(); i++) {
|
|
|
if (i > 0) {
|
|
|
courseNames += ",";
|
|
|
timeNumbers += ",";
|
|
|
- classIds += ",";
|
|
|
}
|
|
|
CourseTable courseTable = list.get(i);
|
|
|
|
|
|
@@ -307,11 +308,13 @@ public class ScheduleController {
|
|
|
|
|
|
courseNames += courseName;
|
|
|
timeNumbers += courseTable.getTimeNumber();
|
|
|
- classIds += courseTable.getClassId();
|
|
|
+ classIdSet.add(courseTable.getClassId());
|
|
|
+ classNameSet.add(courseTable.getClassName());
|
|
|
}
|
|
|
resultVo.setCourseNames(courseNames);
|
|
|
resultVo.setTimeNumbers(timeNumbers);
|
|
|
- resultVo.setClassIds(classIds);
|
|
|
+ resultVo.setClassIds(classIdSet.toString().replace("[", "").replace("[", "").replace(" ", ""));
|
|
|
+ resultVo.setClassNames(classNameSet.toString().replace("[", "").replace("[", "").replace(" ", ""));
|
|
|
resultVo.setStatus(1);
|
|
|
|
|
|
return RT.ok(resultVo);
|