|
@@ -9,6 +9,8 @@ import cn.com.qmth.examcloud.core.questions.dao.entity.*;
|
|
import cn.com.qmth.examcloud.core.questions.service.AudioTimeConfigService;
|
|
import cn.com.qmth.examcloud.core.questions.service.AudioTimeConfigService;
|
|
import cn.com.qmth.examcloud.core.questions.service.ExtractConfigService;
|
|
import cn.com.qmth.examcloud.core.questions.service.ExtractConfigService;
|
|
import cn.com.qmth.examcloud.core.questions.service.QuesService;
|
|
import cn.com.qmth.examcloud.core.questions.service.QuesService;
|
|
|
|
+
|
|
|
|
+import org.apache.commons.collections4.CollectionUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.data.domain.Example;
|
|
import org.springframework.data.domain.Example;
|
|
@@ -190,9 +192,12 @@ public class AudioTimeConfigServiceImpl implements AudioTimeConfigService {
|
|
List<AudioTimeConfig> newList = new ArrayList<>();
|
|
List<AudioTimeConfig> newList = new ArrayList<>();
|
|
if (list != null && list.size() > 0) {
|
|
if (list != null && list.size() > 0) {
|
|
for (AudioTimeConfig audioTimeConfig : list) {
|
|
for (AudioTimeConfig audioTimeConfig : list) {
|
|
- AudioTimeConfig oldAudioTimeConfig = Model.of(audioTimeConfigRepo.findOne(Example.of(audioTimeConfig)));
|
|
|
|
- if (oldAudioTimeConfig != null) {
|
|
|
|
- newList.add(oldAudioTimeConfig);
|
|
|
|
|
|
+ List<AudioTimeConfig> oldAudioTimeConfig = audioTimeConfigRepo
|
|
|
|
+ .findByExamIdAndCourseCodeAndGroupCodeAndPaperDetailUnit(audioTimeConfig.getExamId()
|
|
|
|
+ , audioTimeConfig.getCourseCode(), audioTimeConfig.getGroupCode()
|
|
|
|
+ , audioTimeConfig.getPaperDetailUnit());
|
|
|
|
+ if (!CollectionUtils.isEmpty(oldAudioTimeConfig)) {
|
|
|
|
+ newList.add(oldAudioTimeConfig.get(0));
|
|
} else {
|
|
} else {
|
|
newList.add(audioTimeConfig);
|
|
newList.add(audioTimeConfig);
|
|
}
|
|
}
|