fix

examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/controller/ImportPaperController.java

@@ -194,10 +194,11 @@ public class ImportPaperController extends ControllerSupport {
 	@ApiOperation(value = "云开导入试卷")
 	@PostMapping(value = "/importYunkaiPaper")
 	public void importYunkaiPaper(@RequestPart @NotNull(message = "上传文件不能为空！") MultipartFile dataFile,
-			@RequestParam Long rootOrgId, @RequestParam String courseCodes) {
+			@RequestParam Long rootOrgId, @RequestParam String courseCodes,@RequestParam String batch) {
 		User user = getAccessUser();
 		List<String> cs = Arrays.asList(courseCodes.split(","));
 		YunkaiImportPaperParam p = new YunkaiImportPaperParam(user, dataFile, rootOrgId, cs);
+		p.setBatch(batch);
 		yunkaiService.importYunkaiPaper(p);
 	}
 }

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/yunkai/YunkaiImportPaperParam.java

@@ -14,6 +14,7 @@ public class YunkaiImportPaperParam {
 	private Long rootOrgId;
 	private List<String> courseCodes;
 	private CourseProperty courseProperty;
+	private String batch;
 
 	private Course course;
 
@@ -73,4 +74,12 @@ public class YunkaiImportPaperParam {
 		this.courseCodes = courseCodes;
 	}
 
+	public String getBatch() {
+		return batch;
+	}
+
+	public void setBatch(String batch) {
+		this.batch = batch;
+	}
+
 }

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/yunkai/YunkaiService.java

@@ -233,11 +233,8 @@ public class YunkaiService {
 			c.setName(res.getCourseBean().getName());
 			c.setOrgId(res.getCourseBean().getRootOrgId().toString());
 			p.setCourse(c);
-			List<CourseProperty> cps = coursePropertyRepo.findByOrgIdAndCourseCodeAndEnable(p.getRootOrgId(),
-					courseCode, true);
-			if (CollectionUtils.isNotEmpty(cps)) {
-				p.setCourseProperty(cps.get(0));
-			}
+			CourseProperty cp =coursePropertyRepo.findByOrgIdAndCourseIdAndBatch(p.getRootOrgId(),res.getCourseBean().getId(),p.getBatch());
+			p.setCourseProperty(cp);
 			for (File paperFile : files) {
 				KdPaper kpaper = JSONObject.parseObject(FileUtil.readFileContent(paperFile), KdPaper.class);
 				kpaper.setCourseCode(courseCode);