又拍云修改

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/temp/DdExcelService.java

@@ -397,11 +397,36 @@ public class DdExcelService {
 		System.out.println("开始导出试卷具体信息。。。。");
 		//导出Excel对象集合
 		List<DdPaperDto> excelDtoList = new ArrayList<DdPaperDto>();
+		//根据课程查询试卷
+	    Query query = new Query();
+        query.addCriteria(Criteria.where("orgId").is(orgId));
+        query.addCriteria(Criteria.where("paperType").is(PaperType.IMPORT));
+        List<Paper> paperList = this.mongoTemplate.find(query, Paper.class);
+        if(paperList != null && paperList.size()>0){
+        	int j = 1;
+        	for(Paper paper : paperList){
+        		//查询大题集合
+        		List<PaperDetail> details = paperDetailRepo.findByPaperOrderByNumber(paper);
+        		if(details != null && details.size()>0){
+        			for(PaperDetail detail:details){
+        				DdPaperDto ddPaperDto = new DdPaperDto();
+	        			ddPaperDto.setCode(paper.getCourse().getCode());
+	        			ddPaperDto.setDetailName(detail.getName());
+	        			ddPaperDto.setName(paper.getCourse().getName());
+	        			ddPaperDto.setNumber(detail.getUnitCount());
+	        			ddPaperDto.setPaperName(paper.getName());
+	        			excelDtoList.add(ddPaperDto);
+        			}
+        		}
+        		System.out.println("处理完第"+ j + "套试卷。。。");
+        		j++;
+        	}
+        }
 		//查询所有课程
 		//List<Course> courses = courseRepo.findByOrgId(orgId);
-		List<Course> courses = new ArrayList<Course>();
-		System.out.println("查询课程总数："+ courses.size());
-		if(courses != null && courses.size()>0){
+		//List<Course> courses = new ArrayList<Course>();
+		//System.out.println("查询课程总数："+ courses.size());
+		/*if(courses != null && courses.size()>0){
 			int i = 1;
 			for(Course course : courses){
 				//根据课程查询试卷
@@ -435,7 +460,7 @@ public class DdExcelService {
 		        System.out.println("处理完第"+ i + "个课程。。。");
         		i++;
 			}
-		}
+		}*/
 		//生成Excel对象
 		File ddExcelFile = new File("H:\\ddPaperDto.xlsx");
 		Workbook workBook = new XSSFWorkbook(ddExcelFile);

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/temp/UpdatePaperStruct.java

@@ -1,5 +1,6 @@
 package cn.com.qmth.examcloud.core.questions.service.temp;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,10 +33,13 @@ public class UpdatePaperStruct {
 
 	public void updatePaperStruct(String orgId){
 		//根据orgId查询所有精确试卷结构
-		Query query = new Query();
-        query.addCriteria(Criteria.where("orgId").is(orgId));
+		//Query query = new Query();
+        /*query.addCriteria(Criteria.where("orgId").is(orgId));
         query.addCriteria(Criteria.where("type").is("EXACT"));
-        List<PaperStruct> paperStructList = this.mongoTemplate.find(query, PaperStruct.class);
+        List<PaperStruct> paperStructList = this.mongoTemplate.find(query, PaperStruct.class);*/
+		PaperStruct paSruct = paperStructRepo.findOne("5a03ca4e57853f6b94c8e526");
+		List<PaperStruct> paperStructList = new ArrayList<PaperStruct>();
+		paperStructList.add(paSruct);
         int i = 0;
         if(paperStructList!=null && paperStructList.size()>0){
         	for(PaperStruct paperStruct:paperStructList){

examcloud-core-questions-starter/src/main/resources/application-dev.properties

@@ -12,7 +12,7 @@ spring.redis.port=6379
 
 upyun.bucketName=exam-cloud-test
 upyun.userName=examcloud
-upyun.password=examcloud123456
+upyun.password=ecs87863577!@#
 upyun.uploadUrl=/comm-ques-bank/dev/exam-paper-file/
 upyun.audio.uploadUrl=/comm-ques-bank/dev/audio/
 upyun.audio.maxsize=10

examcloud-core-questions-starter/src/main/resources/application-prac.properties

@@ -10,7 +10,7 @@ spring.redis.port=6379
 
 upyun.bucketName=exam-cloud-test
 upyun.userName=examcloud
-upyun.password=examcloud123456
+upyun.password=ecs87863577!@#
 upyun.uploadUrl=/comm-ques-bank/dev/exam-paper-file/
 upyun.audio.uploadUrl=/comm-ques-bank/dev/audio/
 upyun.audio.maxsize=5

examcloud-core-questions-starter/src/main/resources/application-prod.properties

@@ -15,7 +15,7 @@ spring.redis.password=Qmth87863577
 
 upyun.bucketName=exam-cloud-test
 upyun.userName=examcloud
-upyun.password=examcloud123456
+upyun.password=ecs87863577!@#
 upyun.uploadUrl=/comm-ques-bank/prod/exam-paper-file/
 upyun.audio.uploadUrl=/comm-ques-bank/prod/audio/
 upyun.audio.maxsize=5

examcloud-core-questions-starter/src/main/resources/application-test.properties

@@ -8,7 +8,7 @@ spring.redis.port=6379
 
 upyun.bucketName=exam-cloud-test
 upyun.userName=examcloud
-upyun.password=examcloud123456
+upyun.password=ecs87863577!@#
 upyun.uploadUrl=/comm-ques-bank/test/exam-paper-file/
 upyun.audio.uploadUrl=/comm-ques-bank/test/audio/
 upyun.audio.maxsize=10

examcloud-core-questions-starter/src/main/resources/application.properties

@@ -25,4 +25,6 @@ eureka.client.healthcheck.enabled=true
 info.app=${spring.application.name}
 
 $redis.paper.prefix =$_DATA_PROCESS_PJ_PAPERID
+$dir=
+$tempDir=
 

examcloud-core-questions-starter/src/test/java/cn/com/qmth/examcloud/core/questions/starter/DdCollegeUtilTest.java

@@ -103,7 +103,7 @@ public class DdCollegeUtilTest {
 	 public void excelTest(){
 		 try {
 			//ddExcelService.exporExcel("1627");
-			 ddExcelService.exportPaperExcel("1627");
+			 ddExcelService.exportPaperExcel("1387");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}