|
@@ -16,7 +16,6 @@ import org.springframework.stereotype.Service;
|
|
|
import javax.annotation.Resource;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
-import java.util.function.Function;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@Service
|
|
@@ -55,6 +54,7 @@ public class CbsSubjectServiceImpl implements CbsSubjectService {
|
|
|
List<InstrumentWrapper.Instrument> instruments = cbsSubject.getInstruments();
|
|
|
if (CollectionUtils.isNotEmpty(instruments)) {
|
|
|
subject.setSubjectName(instruments.stream().map(InstrumentWrapper.Instrument::getName).collect(Collectors.joining(",")));
|
|
|
+ subject.setInstrumentId(instruments.get(0).getId().longValue());
|
|
|
}
|
|
|
}
|
|
|
}
|