|
@@ -278,6 +278,8 @@ public class StudentManageController extends BaseController {
|
|
|
Set<Integer> integers = student.getExtSjectNamesMap().keySet();
|
|
|
Set<Integer> extInstrumentIds = Sets.newConcurrentHashSet();
|
|
|
for (Integer integer : integers) {
|
|
|
+ extInstrumentIds.add(integer);
|
|
|
+
|
|
|
if ("5".equals(integer.toString())) {
|
|
|
extInstrumentIds.add(6);
|
|
|
} else if("122".equals(integer.toString())){
|
|
@@ -286,11 +288,8 @@ public class StudentManageController extends BaseController {
|
|
|
extInstrumentIds.add(23);
|
|
|
}
|
|
|
}
|
|
|
- if (CollectionUtils.isNotEmpty(extInstrumentIds)) {
|
|
|
- integers.addAll(extInstrumentIds);
|
|
|
- }
|
|
|
|
|
|
- List<Integer> instrumentIdsBySubjectId = instrumentService.getInstrumentIdsBySubjectId(StringUtils.join(integers,","));
|
|
|
+ List<Integer> instrumentIdsBySubjectId = instrumentService.getInstrumentIdsBySubjectId(StringUtils.join(extInstrumentIds,","));
|
|
|
Map<Integer, InstrumentWrapper.Instrument> mapByIds = instrumentService.getMapByIds(instrumentIdsBySubjectId);
|
|
|
Map<Integer,String> extInstrumentNamesMap = new HashMap<>();
|
|
|
mapByIds.forEach((k,v)->{
|