|
@@ -557,24 +557,30 @@ public class DdExcelService {
|
|
*/
|
|
*/
|
|
@SuppressWarnings("resource")
|
|
@SuppressWarnings("resource")
|
|
public void exportSubQues(String orgId, Long examId, List<String> codes) throws Exception {
|
|
public void exportSubQues(String orgId, Long examId, List<String> codes) throws Exception {
|
|
|
|
+ System.out.println(String.format("共%s门课程的调卷规则", codes.size()));
|
|
|
|
+
|
|
List<SubQuestionDto> dtos = new ArrayList<SubQuestionDto>();
|
|
List<SubQuestionDto> dtos = new ArrayList<SubQuestionDto>();
|
|
int j = 1;
|
|
int j = 1;
|
|
for (String code : codes) {
|
|
for (String code : codes) {
|
|
Query query = new Query();
|
|
Query query = new Query();
|
|
query.addCriteria(Criteria.where("orgId").is(orgId));
|
|
query.addCriteria(Criteria.where("orgId").is(orgId));
|
|
query.addCriteria(Criteria.where("examId").is(examId));
|
|
query.addCriteria(Criteria.where("examId").is(examId));
|
|
- System.out.println("开始处理第" + j + "个调卷规则。。。。。。。");
|
|
|
|
|
|
+ System.out.println("开始处理第" + j + "门课程的调卷规则");
|
|
|
|
+
|
|
query.addCriteria(Criteria.where("courseCode").is(code));
|
|
query.addCriteria(Criteria.where("courseCode").is(code));
|
|
ExtractConfig tempConfig = this.mongoTemplate.findOne(query, ExtractConfig.class);
|
|
ExtractConfig tempConfig = this.mongoTemplate.findOne(query, ExtractConfig.class);
|
|
//定义试卷集合
|
|
//定义试卷集合
|
|
Set<String> ids = new HashSet<String>();
|
|
Set<String> ids = new HashSet<String>();
|
|
|
|
+
|
|
//获取试卷
|
|
//获取试卷
|
|
List<ExamPaper> examPaperList = tempConfig.getExamPaperList();
|
|
List<ExamPaper> examPaperList = tempConfig.getExamPaperList();
|
|
System.out.println("原试卷数量:" + examPaperList.size());
|
|
System.out.println("原试卷数量:" + examPaperList.size());
|
|
|
|
+
|
|
for (ExamPaper examPaper : examPaperList) {
|
|
for (ExamPaper examPaper : examPaperList) {
|
|
ids.add(examPaper.getPaper().getId());
|
|
ids.add(examPaper.getPaper().getId());
|
|
}
|
|
}
|
|
System.out.println("去重后的试卷数量:" + ids.size());
|
|
System.out.println("去重后的试卷数量:" + ids.size());
|
|
|
|
+
|
|
//循环去重后的试卷
|
|
//循环去重后的试卷
|
|
for (String id : ids) {
|
|
for (String id : ids) {
|
|
Paper basePaper = Model.of(paperRepo.findById(id));
|
|
Paper basePaper = Model.of(paperRepo.findById(id));
|
|
@@ -597,6 +603,7 @@ public class DdExcelService {
|
|
dto.setClearBody(clearBody);
|
|
dto.setClearBody(clearBody);
|
|
dto.setCourseCode(tempConfig.getCourseCode());
|
|
dto.setCourseCode(tempConfig.getCourseCode());
|
|
dto.setCourseName(tempConfig.getCourseName());
|
|
dto.setCourseName(tempConfig.getCourseName());
|
|
|
|
+ dto.setDetailName(paperDetailUnit.getPaperDetail().getName());//大题名称
|
|
dto.setdNumber(paperDetailUnit.getDetailNumber());
|
|
dto.setdNumber(paperDetailUnit.getDetailNumber());
|
|
dto.setNumber(paperDetailUnit.getNumber());
|
|
dto.setNumber(paperDetailUnit.getNumber());
|
|
dto.setPaperId(basePaper.getId());
|
|
dto.setPaperId(basePaper.getId());
|
|
@@ -624,10 +631,11 @@ public class DdExcelService {
|
|
titleRow.createCell(4).setCellValue("大题号");
|
|
titleRow.createCell(4).setCellValue("大题号");
|
|
titleRow.createCell(5).setCellValue("小题号");
|
|
titleRow.createCell(5).setCellValue("小题号");
|
|
titleRow.createCell(6).setCellValue("标准分");
|
|
titleRow.createCell(6).setCellValue("标准分");
|
|
- titleRow.createCell(7).setCellValue("题干");
|
|
|
|
- titleRow.createCell(8).setCellValue("题干(含标签)");
|
|
|
|
- titleRow.createCell(9).setCellValue("标答");
|
|
|
|
- titleRow.createCell(10).setCellValue("标答(含标签)");
|
|
|
|
|
|
+ titleRow.createCell(7).setCellValue("大题名称");
|
|
|
|
+ titleRow.createCell(8).setCellValue("题干");
|
|
|
|
+ titleRow.createCell(9).setCellValue("题干(含标签)");
|
|
|
|
+ titleRow.createCell(10).setCellValue("标答");
|
|
|
|
+ titleRow.createCell(11).setCellValue("标答(含标签)");
|
|
|
|
|
|
//向Excle中写入数据,从第2行开始
|
|
//向Excle中写入数据,从第2行开始
|
|
for (int i = 0; i < dtos.size(); i++) {
|
|
for (int i = 0; i < dtos.size(); i++) {
|
|
@@ -642,13 +650,14 @@ public class DdExcelService {
|
|
row.createCell(4).setCellValue(dto.getdNumber());
|
|
row.createCell(4).setCellValue(dto.getdNumber());
|
|
row.createCell(5).setCellValue(dto.getNumber());
|
|
row.createCell(5).setCellValue(dto.getNumber());
|
|
row.createCell(6).setCellValue(dto.getScore());
|
|
row.createCell(6).setCellValue(dto.getScore());
|
|
- row.createCell(7).setCellValue(dto.getClearBody());
|
|
|
|
- row.createCell(8).setCellValue(dto.getBody());
|
|
|
|
|
|
+ row.createCell(7).setCellValue(dto.getDetailName());
|
|
|
|
+ row.createCell(8).setCellValue(dto.getClearBody());
|
|
|
|
+ row.createCell(9).setCellValue(dto.getBody());
|
|
if (dto.getClearAnswer().length() < 32767) {
|
|
if (dto.getClearAnswer().length() < 32767) {
|
|
- row.createCell(9).setCellValue(dto.getClearAnswer());
|
|
|
|
|
|
+ row.createCell(10).setCellValue(dto.getClearAnswer());
|
|
}
|
|
}
|
|
if (dto.getAnswer().length() < 32767) {
|
|
if (dto.getAnswer().length() < 32767) {
|
|
- row.createCell(10).setCellValue(dto.getAnswer());
|
|
|
|
|
|
+ row.createCell(11).setCellValue(dto.getAnswer());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
File file = new File(quesExcelPathNew);
|
|
File file = new File(quesExcelPathNew);
|