bug

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/GradeBatchPaperServiceImpl.java

@@ -87,7 +87,7 @@ public class GradeBatchPaperServiceImpl extends ServiceImpl<GradeBatchPaperMappe
                 GradeBatchPaperResult needAdd = new GradeBatchPaperResult();
                 BeanUtils.copyProperties(gradeBatchPaperResult, needAdd);
                 needAdd.setPaperType(paperTypeCell);
-                needAdd.setPaperName(needAdd.getCourseName() + "-" + paperType);
+                needAdd.setPaperName(needAdd.getCourseName() + "-" + paperTypeCell);
                 needAddList.add(needAdd);
             }
         }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/GradeInitializeServiceImpl.java

@@ -33,9 +33,9 @@ public class GradeInitializeServiceImpl implements GradeInitializeService {
         Long schoolId = requestUser.getSchoolId();
         Long userId = requestUser.getId();
         List<String> finished = new ArrayList<>();
-        finished.add(GradeAnalyzePaperStatusEnum.READY_TO_CALCULATE.getDesc());
-        finished.add(GradeAnalyzePaperStatusEnum.CALCULATING.getDesc());
-        finished.add(GradeAnalyzePaperStatusEnum.FINISH_CALCULATE.getDesc());
+        finished.add(GradeAnalyzePaperStatusEnum.READY_TO_CALCULATE.name());
+        finished.add(GradeAnalyzePaperStatusEnum.CALCULATING.name());
+        finished.add(GradeAnalyzePaperStatusEnum.FINISH_CALCULATE.name());
         IPage<GradeInitResult> page = gradeInitializeMapper.findNeedAnalyzedPaper(new Page<>(pageNumber, pageSize), semesterId, examId, courseCode, userId, schoolId);
         for (GradeInitResult record : page.getRecords()) {
             String status = record.getStatus();

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/GradePaperDimensionServiceImpl.java

@@ -218,6 +218,7 @@ public class GradePaperDimensionServiceImpl extends ServiceImpl<GradePaperDimens
      * @return 构建好的维度预新增对象集合
      */
     private List<GradePaperDimension> checkAndBuildGradePaperDimensionList(List<GradePaperDimensionDatasource> gradePaperDimensionDatasourceList, String paperNumber, String paperType, String paperName, DimensionEnum dimensionType, SysUser requestUser) {
+        // TODO: 2022/6/15 校验如果试卷结构不为空，判断试卷结构中是不是存在
         Map<String, String> checkPrimaryCodeNameMap = new HashMap<>();
         List<GradePaperDimension> gradePaperDimensionList = new ArrayList<>();
 

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/AnalyzeDataCalculateServiceImpl.java

@@ -56,8 +56,6 @@ public class AnalyzeDataCalculateServiceImpl implements AnalyzeDataCalculateServ
 
 
         for (String courseCode : courseCodeList) {
-            // TODO: 2022/6/13 测试用全部重算
-//            needRepeatCourseCodeList.add(courseCode);
 
             // 判断是否不需要计算
             if (!needRepeatCourseCodeList.contains(courseCode)) {

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/AnalyzeDataCheckServiceImpl.java

@@ -1,8 +1,6 @@
 package com.qmth.teachcloud.report.business.service.impl;
 
-import cn.hutool.log.Log;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.qmth.teachcloud.common.enums.DimensionEnum;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.service.BasicCourseService;
 import com.qmth.teachcloud.report.business.bean.dto.Answer;