update

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/PrintingProjectService.java

@@ -36,7 +36,7 @@ public interface PrintingProjectService {
     PrintingProjectInfo getPrintingProjectById(Long id);
 
     /**
-     * 获取某印刷项目的信息(By orgId & examId)
+     * 获取某印刷项目的信息
      */
     PrintingProject getPrintingProjectByOrgIdAndExamId(Long orgId, Long examId);
 

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/StatisticService.java

@@ -20,11 +20,6 @@ import java.util.List;
  */
 public interface StatisticService {
 
-    /**
-     * 获取所有"传统"考试列表
-     */
-    List<ExamInfo> findExams(String examType);
-
     /**
      * 获取考试所有开考的课程列表(含试卷类型、考生数量)
      */
@@ -85,4 +80,9 @@ public interface StatisticService {
      */
     int countExamTotalStudentBySite(Long examId, String site);
 
+    /**
+     * 获取"传统"考试列表
+     */
+    List<ExamInfo> findTraditionExams();
+
 }

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/impl/CourseStatisticServiceImpl.java

@@ -53,6 +53,7 @@ public class CourseStatisticServiceImpl implements CourseStatisticService {
     @Override
     public Page<CourseStatisticInfo> getCourseStatisticList(CourseStatisticQuery query) {
         Check.isNull(query, "查询参数不能为空！");
+
         //查询条件
         SearchBuilder searches = new SearchBuilder();
         if (query.getOrgId() != null) {
@@ -73,8 +74,10 @@ public class CourseStatisticServiceImpl implements CourseStatisticService {
         Specification<CourseStatistic> spec = SpecUtils.buildSearchers(CourseStatistic.class, searches.build());
         //排序条件
         OrderBuilder orders = new OrderBuilder().desc("id");
+
         //分页条件
         Pageable pageable = SpecUtils.buildPageable(query.getPageNo(), query.getPageSize(), orders.build());
+
         Page<CourseStatistic> page = courseStatisticRepository.findAll(spec, pageable);
         return CourseStatisticConvert.ofPage(page);
     }
@@ -89,6 +92,9 @@ public class CourseStatisticServiceImpl implements CourseStatisticService {
 
     @Override
     public List<CourseStatisticLessInfo> getCourseStatisticLessInfoList(Long orgId, Long examId) {
+        Check.isNull(orgId, "学校ID不能为空！");
+        Check.isNull(examId, "考试ID不能为空！");
+
         SqlWrapper sql = new SqlWrapper()
                 .select("cs.id,cs.total_student,cp.paper_p").from("ec_prt_course_statistic cs")
                 .innerJoin("ec_prt_course_paper cp").on("cp.id", "cs.course_paper_id")
@@ -185,8 +191,7 @@ public class CourseStatisticServiceImpl implements CourseStatisticService {
             return;
         }
         //仅更新total_student字段
-        courseStatisticRepository.updateTotalStudentByOrgExamCourse(info.getOrgId(), info.getExamId(), info.getCourseId(), info.getPaperType(),
-                info.getTotalStudent());
+        courseStatisticRepository.updateTotalStudentByOrgExamCourse(info.getOrgId(), info.getExamId(), info.getCourseId(), info.getPaperType(), info.getTotalStudent());
     }
 
 }

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/impl/PrintingProjectServiceImpl.java

@@ -14,7 +14,6 @@ import cn.com.qmth.examcloud.core.print.common.jpa.SpecUtils;
 import cn.com.qmth.examcloud.core.print.common.jpa.SqlWrapper;
 import cn.com.qmth.examcloud.core.print.common.utils.Check;
 import cn.com.qmth.examcloud.core.print.entity.PrintingProject;
-import cn.com.qmth.examcloud.core.print.enums.ExamType;
 import cn.com.qmth.examcloud.core.print.repository.PrintingProjectRepository;
 import cn.com.qmth.examcloud.core.print.service.PrintingProjectService;
 import cn.com.qmth.examcloud.core.print.service.StatisticService;
@@ -27,7 +26,6 @@ import cn.com.qmth.examcloud.core.print.service.bean.printingproject.PrintingPro
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -157,7 +155,10 @@ public class PrintingProjectServiceImpl implements PrintingProjectService {
 
         //新增印刷项目信息
         project = new PrintingProject();
-        BeanUtils.copyProperties(examInfo, project);
+        project.setOrgId(examInfo.getOrgId());
+        project.setOrgName(examInfo.getOrgName());
+        project.setExamId(examInfo.getExamId());
+        project.setExamName(examInfo.getExamName());
         project.setCompleted(false);
         printingProjectRepository.save(project);
     }
@@ -166,7 +167,7 @@ public class PrintingProjectServiceImpl implements PrintingProjectService {
     public void initAllPrintingProject() {
         //获取所有"传统"考试列表
         log.debug("initAllPrintingProject...");
-        List<ExamInfo> list = statisticService.findExams(ExamType.TRADITION.name());//todo
+        List<ExamInfo> list = statisticService.findTraditionExams();
         if (list != null && !list.isEmpty()) {
             for (ExamInfo info : list) {
                 syncPrintingProject(info);

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/impl/PrintingTemplateServiceImpl.java

@@ -86,6 +86,7 @@ public class PrintingTemplateServiceImpl implements PrintingTemplateService {
             printingTemplateRepository.save(template);
             return;
         }
+
         //否则，新增记录
         printingTemplateRepository.save(PrintingTemplateConvert.of(info));
     }

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/impl/ProjectBackupSettingServiceImpl.java

@@ -69,6 +69,7 @@ public class ProjectBackupSettingServiceImpl implements ProjectBackupSettingServ
             info.setCreationTime(setting.getCreationTime());
             info.setUpdateTime(new Date());
         }
+
         //否则，新增记录
         projectBackupSettingRepository.save(info);
     }

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/impl/StatisticServiceImpl.java

@@ -8,6 +8,7 @@
 package cn.com.qmth.examcloud.core.print.service.impl;
 
 import cn.com.qmth.examcloud.core.print.common.jpa.SqlWrapper;
+import cn.com.qmth.examcloud.core.print.enums.ExamType;
 import cn.com.qmth.examcloud.core.print.service.StatisticService;
 import cn.com.qmth.examcloud.core.print.service.bean.common.ExamCourseInfo;
 import cn.com.qmth.examcloud.core.print.service.bean.common.ExamInfo;
@@ -43,22 +44,9 @@ import java.util.Set;
 public class StatisticServiceImpl implements StatisticService {
     private static final Logger log = LoggerFactory.getLogger(StatisticServiceImpl.class);
     @Autowired
-    private JdbcTemplate jdbcTemplate;
-    @Autowired
     private ExamCloudService examCloudService;
-
-    @Override
-    public List<ExamInfo> findExams(String examType) {
-        //暂时直接查库，待“考务”接口提供后改为通过接口获取数据
-        SqlWrapper sql = new SqlWrapper()
-                .select("em.id examId,em.name examName,em.root_org_id orgId,org.name orgName").from("ec_e_exam em")
-                .innerJoin("ec_b_org org").on("org.id", "em.root_org_id");
-        if (StringUtils.isNotBlank(examType)) {
-            //sql.where().eq("em.exam_type", examType); todo 仅测试，临时注释
-        }
-        sql.orderBy("em.id", false);
-        return jdbcTemplate.query(sql.build(), new BeanPropertyRowMapper(ExamInfo.class));
-    }
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
 
     @Override
     public List<ExamCourseInfo> findExamCourses(Long orgId, Long examId) {
@@ -221,4 +209,14 @@ public class StatisticServiceImpl implements StatisticService {
         return properties;
     }
 
+    @Override
+    public List<ExamInfo> findTraditionExams() {
+        SqlWrapper sql = new SqlWrapper()
+                .select("em.id examId,em.name examName,em.root_org_id orgId,org.name orgName").from("ec_e_exam em")
+                .innerJoin("ec_b_org org").on("org.id", "em.root_org_id")
+                .where().eq("em.exam_type", ExamType.TRADITION.name())
+                .orderBy("em.id", false);
+        return jdbcTemplate.query(sql.build(), new BeanPropertyRowMapper(ExamInfo.class));
+    }
+
 }