|
@@ -10,6 +10,7 @@ import java.util.Random;
|
|
import java.util.Set;
|
|
import java.util.Set;
|
|
|
|
|
|
|
|
|
|
|
|
+import com.qmth.cqb.base.dao.CourseRepo;
|
|
import com.qmth.cqb.base.model.Course;
|
|
import com.qmth.cqb.base.model.Course;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.nlpcn.commons.lang.util.StringUtil;
|
|
import org.nlpcn.commons.lang.util.StringUtil;
|
|
@@ -104,6 +105,9 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private ExamCourseClient examCourseClient;
|
|
private ExamCourseClient examCourseClient;
|
|
|
|
+
|
|
|
|
+ @Autowired
|
|
|
|
+ private CourseRepo courseRepo;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public ExtractConfig findConfig(ExtractConfig condition) {
|
|
public ExtractConfig findConfig(ExtractConfig condition) {
|
|
@@ -613,6 +617,8 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
|
|
ExtractConfig extractConfig = this.findConfig(condition);
|
|
ExtractConfig extractConfig = this.findConfig(condition);
|
|
if(extractConfig==null){
|
|
if(extractConfig==null){
|
|
extractConfig = new ExtractConfig(examCourseDto);
|
|
extractConfig = new ExtractConfig(examCourseDto);
|
|
|
|
+ Course course = courseRepo.findFirstByCodeAndOrgId(condition.getCourseCode(),condition.getOrgId());
|
|
|
|
+ extractConfig.setCourse(course);
|
|
}
|
|
}
|
|
Course course = extractConfig.getCourse();
|
|
Course course = extractConfig.getCourse();
|
|
if(course != null && course.getEnable().equals("true")){
|
|
if(course != null && course.getEnable().equals("true")){
|