deason 6 سال پیش
والد
کامیت
5c440ae5d0

+ 28 - 0
examcloud-core-questions-dao/src/main/java/cn/com/qmth/examcloud/core/questions/dao/CourseRepo.java

@@ -0,0 +1,28 @@
+/*
+ * *************************************************
+ * Copyright (c) 2019 QMTH. All Rights Reserved.
+ * Created by Deason on 2019-05-20 14:42:12.
+ * *************************************************
+ */
+
+package cn.com.qmth.examcloud.core.questions.dao;
+
+import cn.com.qmth.examcloud.core.questions.dao.entity.Course;
+import cn.com.qmth.examcloud.core.questions.dao.entity.ExamFile;
+import org.springframework.data.mongodb.repository.MongoRepository;
+import org.springframework.data.repository.query.QueryByExampleExecutor;
+
+import java.util.List;
+
+/**
+ * @author chenken
+ * @date 2017年7月13日 下午4:54:10
+ * @company QMTH
+ * @description ExamFileRepo.java
+ */
+public interface CourseRepo extends MongoRepository<Course, String>, QueryByExampleExecutor<Course> {
+
+    List<Course> findByOrgId(String orgId);
+
+}
+

+ 2 - 0
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/InitPaperExpService.java

@@ -124,6 +124,8 @@ public class InitPaperExpService {
         }
 
         Course course = courseService.getCourse(Long.valueOf(paper.getOrgId()), paper.getCourse().getCode());
+        //Course course = courseService.getCourse(1407L, paper.getCourse().getCode());//for export
+
         //创建试卷导出的dto
         PaperExp paperExpDto = BeanCopierUtil.copyProperties(paper, PaperExp.class);
         if (paper.getCourse() == null) {

+ 4 - 1
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/ExtractConfigFileServiceImpl.java

@@ -1,7 +1,7 @@
 package cn.com.qmth.examcloud.core.questions.service.impl;
 
-import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
+import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.core.questions.base.CommonUtils;
 import cn.com.qmth.examcloud.core.questions.base.FileDisposeUtil;
 import cn.com.qmth.examcloud.core.questions.base.ImageUtils;
@@ -397,6 +397,7 @@ public class ExtractConfigFileServiceImpl implements ExtractConfigFileService {
         List<ExamCourseRelationBean> examCourseDtoList = new ArrayList<ExamCourseRelationBean>();
         GetExamCourseListReq req = new GetExamCourseListReq();
         req.setExamId(Long.valueOf(examId));
+        //req.setExamId(194L);//for export
         req.setCourseEnable(true);
         Long start = 1l;
         int count = 0;
@@ -418,7 +419,9 @@ public class ExtractConfigFileServiceImpl implements ExtractConfigFileService {
         for (ExamCourseRelationBean examCourseDto : examCourseDtoList) {
             ExtractConfig condition = new ExtractConfig();
             condition.setExamId(examCourseDto.getExamId());
+            //condition.setExamId(510L);//for export
             condition.setCourseCode(examCourseDto.getCourseCode());
+
             ExtractConfig extractConfig = extractConfigService.findConfig(condition);
 //            if (extractConfig == null) {
 //                logger.warn("examId:" + examId + " courseCode:" + examCourseDto.getCourseCode());

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

@@ -45,6 +45,8 @@ public class DdExcelService {
     @Autowired
     private PaperRepo paperRepo;
     @Autowired
+    private CourseRepo courseRepo;
+    @Autowired
     private QuesTypeNameRepo quesTypeRepo;
     @Autowired
     private MongoTemplate mongoTemplate;
@@ -483,9 +485,10 @@ public class DdExcelService {
         //导出Excel对象集合
         List<DdPaperStructDto> excelDtoList = new ArrayList<>();
         //查询所有课程
-        //List<Course> courses = courseRepo.findByOrgId(orgId);
-        List<Course> courses = new ArrayList<Course>();
+        List<Course> courses = courseRepo.findByOrgId(orgId);
+        //List<Course> courses = new ArrayList<Course>();
         System.out.println("查询课程总数:" + courses.size());
+
         if (courses != null && courses.size() > 0) {
             int i = 1;
             for (Course course : courses) {

+ 5 - 5
examcloud-core-questions-starter/src/main/java/cn/com/qmth/examcloud/core/questions/starter/IndexController.java

@@ -38,13 +38,13 @@ public class IndexController {
     public String init(HttpServletRequest request, HttpServletResponse response) throws Exception {
         /* 重庆大学xml转paper对象入库 */
         CqdxService cqdxService = SpringContextHolder.getBean(CqdxService.class);
-//        cqdxService.bulidPaper();
+        //cqdxService.bulidPaper();
 
         DdExcelService ddExcelService = SpringContextHolder.getBean(DdExcelService.class);
-//        ddExcelService.exportPaperStructExcel("371");
+        //ddExcelService.exportPaperStructExcel("1407");
 
-//        exportExtractExcel(response);
-//        exportQuestionExcel();
+        //exportExtractExcel(response);
+        //exportQuestionExcel();
 
         return "ok";
     }
@@ -53,7 +53,7 @@ public class IndexController {
         //用来导出调卷规则中,生成的主观题和客观题的Excel(导出调卷规则)
         ExtractConfigFileService service = SpringContextHolder.getBean(ExtractConfigFileService.class);
         ExportPaperInfoModel model = new ExportPaperInfoModel();
-        model.setExamId("454");
+        model.setExamId("510");
         model.setExportWay(ExportWay.BATCH);
         List<String> list = new ArrayList<>();
         list.add(ExamFileType.PAPER_STRUCTURE_OBJECTIVE.name());