提交 调卷规则 代码

cqb-paper/src/main/java/com/qmth/cqb/paper/model/computerTestModel/ComputerTestPaper.java

@@ -20,6 +20,14 @@ public class ComputerTestPaper {
 	 * 试卷名称
 	 */
 	private String name;
+	/**
+	 * 课程code
+	 */
+	private String courseCode;
+	/**
+	 * 课程名称
+	 */
+	private String courseName;
 	/**
 	 * 总分
 	 */
@@ -45,6 +53,8 @@ public class ComputerTestPaper {
 	public ComputerTestPaper(Paper paper){
 		this.id = paper.getId();
 		this.name = paper.getName();
+		this.courseCode = paper.getCourse().getCode();
+		this.courseName = paper.getCourse().getName();
 		this.totalScore = paper.getTotalScore();
 		this.detailCount = paper.getPaperDetailCount();
 		if(paper.getHasAudioQuestion()==null||!paper.getHasAudioQuestion()){
@@ -90,6 +100,22 @@ public class ComputerTestPaper {
 	public void setDetails(List<ComputerTestPaperDetail> details) {
 		this.details = details;
 	}
+
+	public String getCourseCode() {
+		return courseCode;
+	}
+
+	public void setCourseCode(String courseCode) {
+		this.courseCode = courseCode;
+	}
+
+	public String getCourseName() {
+		return courseName;
+	}
+
+	public void setCourseName(String courseName) {
+		this.courseName = courseName;
+	}
 	
 }
 

cqb-paper/src/main/java/com/qmth/cqb/paper/service/ExtractConfigFileService.java

@@ -14,10 +14,15 @@ import com.qmth.cqb.paper.model.ExtractConfig;
  * @description 调卷规则--文件处理service
  */
 public interface ExtractConfigFileService {
+	
 	/**
 	 * 保存调卷规则，生成试卷文件
+	 * @param extractConfig
+	 * @param isbuildFile	1:生成试卷文件 0:不生成试卷文件
+	 * @param accessUser
+	 * @throws Exception
 	 */
-	public void saveExtractConfigAndBuildPaperFile(ExtractConfig extractConfig,String orgName,AccessUser accessUser)  throws Exception;
+	public void saveExtractConfigAndBuildPaperFile(ExtractConfig extractConfig,Integer isbuildFile,AccessUser accessUser)  throws Exception;
 	
 	/**
 	 * 导出考试下的试卷信息  校验

cqb-paper/src/main/java/com/qmth/cqb/paper/service/ExtractConfigService.java

@@ -39,7 +39,7 @@ public interface ExtractConfigService {
 	 * @param orgName		机构名称
 	 * @throws Exception
 	 */
-	public Map<String, String> saveExtractConfig(ExtractConfig extractConfig,String orgName,AccessUser accessUser) throws Exception;
+	public Map<String, String> saveExtractConfig(ExtractConfig extractConfig,AccessUser accessUser) throws Exception;
 	/**
 	 * 按照设定调卷规则生成一套试卷
 	 * 1.根据ExamPaper集合得出每个类型下应该抽取的试卷，并返回 试卷类型--->试卷的map

cqb-paper/src/main/java/com/qmth/cqb/paper/service/impl/ExtractConfigFileServiceImpl.java

@@ -86,21 +86,22 @@ public class ExtractConfigFileServiceImpl implements ExtractConfigFileService {
 	private String zipDirectory;
 	
 	@Override
-	public void saveExtractConfigAndBuildPaperFile(ExtractConfig extractConfig,String orgName,AccessUser accessUser) throws Exception {
+	public void saveExtractConfigAndBuildPaperFile(ExtractConfig extractConfig,Integer isbuildFile,AccessUser accessUser) throws Exception {
 		//查询试卷导出设置
 		ExportStructure exportStructure = exportStructureService.findStructureByExamId(extractConfig.getExamId()+"");
 		//生成试卷
-		Map<String, String> finishedPaperIdMap = extractConfigService.saveExtractConfig(extractConfig, orgName, accessUser);
+		Map<String, String> finishedPaperIdMap = extractConfigService.saveExtractConfig(extractConfig,accessUser);
 		extractConfig.setFinishedPaperIdMap(finishedPaperIdMap);
     	extractConfig.setIfFinish((short)1);
-    	
-		Set<Entry<String,String>> entry = finishedPaperIdMap.entrySet();
-		Iterator<Entry<String,String>> iterator = entry.iterator();
-		while(iterator.hasNext()){
-			String paperId = iterator.next().getValue();
-			accessUser.setRootOrgName(orgName);
-			uploadPaperFile(extractConfig,paperId,exportStructure,accessUser);
-		}
+    	if(isbuildFile==1){
+    		Set<Entry<String,String>> entry = finishedPaperIdMap.entrySet();
+    		Iterator<Entry<String,String>> iterator = entry.iterator();
+    		while(iterator.hasNext()){
+    			String paperId = iterator.next().getValue();
+    			accessUser.setRootOrgName(extractConfig.getOrgName());
+    			uploadPaperFile(extractConfig,paperId,exportStructure,accessUser);
+    		}
+    	}
     	extractConfigRepo.save(extractConfig);
 	}
 	

cqb-paper/src/main/java/com/qmth/cqb/paper/service/impl/ExtractConfigServiceImpl.java

@@ -122,7 +122,7 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
 	}
 
 	@Override
-	public Map<String, String> saveExtractConfig(ExtractConfig extractConfig,String orgName,AccessUser accessUser) throws Exception {
+	public Map<String, String> saveExtractConfig(ExtractConfig extractConfig,AccessUser accessUser) throws Exception {
 		List<ExamPaper> examPapers = extractConfig.getExamPaperList();
 		for(int i=0;i<examPapers.size();i++){
 			ExamPaper examPaper = examPapers.get(i);
@@ -130,7 +130,6 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
 			paper = paperRepo.findOne(paper.getId());
 			examPaper.setPaper(paper);
 		}
-		extractConfig.setOrgName(orgName);
 		Course course = courseRepo.findFirstByCodeAndOrgId(extractConfig.getCourseCode(),extractConfig.getOrgId());
 		extractConfig.setCourse(course);
 		return makePaperByConfig(extractConfig);

cqb-paper/src/main/java/com/qmth/cqb/paper/web/ExtractConfigController.java

@@ -88,14 +88,16 @@ public class ExtractConfigController {
 	} 
 	
 	@ApiOperation(value = "保存调卷规则", notes = "保存调卷规则")
-    @PutMapping(value = "/extractConfig/{orgName}")
+    @PutMapping(value = "/extractConfig/{orgName}/{isbuildFile}")
 	public ResponseEntity<Object> saveExtractConfig(HttpServletRequest request,
 											@PathVariable String orgName,
+											@PathVariable Integer isbuildFile,
 											@RequestBody ExtractConfig extractConfig){
 		try{
 			AccessUser accessUser = (AccessUser) request.getAttribute("accessUser");
 			extractConfig.setOrgId(accessUser.getRootOrgId()+"");
-			extractConfigFileService.saveExtractConfigAndBuildPaperFile(extractConfig, orgName, accessUser);
+			extractConfig.setOrgName(orgName);
+			extractConfigFileService.saveExtractConfigAndBuildPaperFile(extractConfig,isbuildFile,accessUser);
 			return new ResponseEntity<Object>(HttpStatus.OK);
 		}catch(Exception e){
 			e.printStackTrace();