3.3.1 update

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ExaminationImportDto.java

@@ -101,6 +101,7 @@ public class ExaminationImportDto {
     @ApiModelProperty(value = "任课老师ID")
     private Long teacherId;
 
+    private String coursePaperId;
     public ExaminationImportDto() {
     }
 
@@ -295,4 +296,12 @@ public class ExaminationImportDto {
     public void setErrorMessage(String errorMessage) {
         this.errorMessage = errorMessage;
     }
+
+    public String getCoursePaperId() {
+        return coursePaperId;
+    }
+
+    public void setCoursePaperId(String coursePaperId) {
+        this.coursePaperId = coursePaperId;
+    }
 }

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

@@ -716,7 +716,7 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
             map.put("courseCode", e.getCourseCode());
             map.put("courseName", e.getCourseName());
             map.put("paperNumber", e.getPaperNumber());
-            map.put("sequence", e.getSequence());
+            map.put("coursePaperId", e.getCoursePaperId());
             return Stream.of(map);
         }).distinct().collect(Collectors.toList());
 
@@ -726,7 +726,7 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
             String courseCode = String.valueOf(map.get("courseCode"));
             String courseName = String.valueOf(map.get("courseName"));
             String paperNumber = String.valueOf(map.get("paperNumber"));
-            String sequence = String.valueOf(map.get("sequence"));
+            String coursePaperId = String.valueOf(map.get("coursePaperId"));
 
             // 获取该科目下的考生人数
             List<ExaminationImportDto> examDetailCourseStudentList = examDetailStudentList.stream().filter(e -> e.getCourseCode().equals(courseCode) &&
@@ -739,7 +739,7 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
             examDetailCourse.setCourseCode(courseCode);
             examDetailCourse.setCourseName(courseName);
             examDetailCourse.setPaperNumber(paperNumber);
-            examDetailCourse.setCoursePaperId(courseCode.concat(sequence));
+            examDetailCourse.setCoursePaperId(coursePaperId);
             examDetailCourse.setTotalSubjects(examDetailCourseStudentList.size());
             examDetailCourse.setCreateId(sysUser.getId());
             String clazzName = examDetailCourseStudentList.stream().filter(m -> StringUtils.isNotBlank(m.getClazzName())).map(ExaminationImportDto::getClazzName).collect(Collectors.joining(","));
@@ -760,8 +760,6 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
      * @param sysUser                     用户
      */
     private void disposeExamStudentData(Long examId, Long examDetailCourseId, List<ExaminationImportDto> examDetailCourseStudentList, SysUser sysUser) {
-        BasicPrintConfig basicPrintConfig = basicPrintConfigService.getByExamId(examId);
-
         List<ExamStudent> examStudentList = new ArrayList<>();
         Long schoolId = sysUser.getSchoolId();
         for (ExaminationImportDto examinationImportDto : examDetailCourseStudentList) {
@@ -783,6 +781,7 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
             examStudent.setExamId(examId);
             examStudent.setExamDetailCourseId(examDetailCourseId);
             examStudent.setPaperNumber(paperNumber);
+            examStudent.setCoursePaperId(examinationImportDto.getCoursePaperId());
             examStudent.setStudentCode(studentCode);
             examStudent.setStudentName(studentName);
             examStudent.setRequiredFields(JSON.toJSONString(examinationImportDto.getRequiredFieldList()));

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

@@ -1393,7 +1393,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                         examDetailCourse.setCourseCode(examTask.getCourseCode());
                         examDetailCourse.setCourseName(examTask.getCourseName());
                         examDetailCourse.setPaperNumber(paperNumber);
-                        examDetailCourse.setCoursePaperId(examTask.getCourseCode().concat(examTask.getSequence()));
+                        examDetailCourse.setCoursePaperId(String.valueOf(examTask.getId()));
                         examDetailCourse.setClazzId(examDetailList.getClassId());
                         examDetailCourse.setTotalSubjects(examDetailList.getStudentCount());
                         examDetailCourse.setCreateId(sysUser.getId());

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

@@ -1365,7 +1365,7 @@ public class PrintCommonServiceImpl implements PrintCommonService {
             examStudent.setStudentCode(basicExamStudent.getStudentCode());
             examStudent.setExamId(examId);
             examStudent.setPaperNumber(examTask.getPaperNumber());
-            examStudent.setCoursePaperId(examTask.getCourseCode().concat(examTask.getSequence()));
+            examStudent.setCoursePaperId(String.valueOf(examTask.getId()));
             examStudent.setCollegeName(basicExamStudent.getCollege());
             examStudent.setMajorName(basicExamStudent.getMajor());
             examStudent.setSiteNumber(String.valueOf(atomicInteger.getAndIncrement()));

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

@@ -725,7 +725,6 @@ public class TaskLogicServiceImpl implements TaskLogicService {
         for (ExamTask examTask : examTaskList) {
             String paperNumber = examTask.getPaperNumber();
             String courseCode = examTask.getCourseCode();
-            String sequence = examTask.getSequence();
             paperNumberWithCourseCodeInExamTaskMap.put(paperNumber, courseCode);
             if (paperNumberWithExamTaskMap.containsKey(paperNumber)) {
                 int count = paperNumberWithExamTaskMap.get(paperNumber);
@@ -734,7 +733,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                 paperNumberWithExamTaskMap.put(paperNumber, 1);
             }
 
-            paperNumberCoureseSequenceMap.put(paperNumber, courseCode.concat(sequence));
+            paperNumberCoureseSequenceMap.put(paperNumber, String.valueOf(examTask.getId()));
         }
 
         // 从第三行开始为数据（第一行说明，第二行表头，第三行往后为数据）
@@ -885,7 +884,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                     }
                 }
             }
-            examinationImportDto.setSequence(paperNumber);
+            examinationImportDto.setCoursePaperId(paperNumberCoureseSequenceMap.get(paperNumber));
             examinationImportDto.setErrorMessage(errorRowDate.toString());
             examinationImportDtoList.add(examinationImportDto);
         }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/pdf/CreatePdfNewUtil.java

@@ -179,7 +179,6 @@ public class CreatePdfNewUtil {
         boolean isDateHasTwo = objectList.stream().filter(m -> "examDate".equals(m.getString("code")) || "examTime".equals(m.getString("code"))).count() == 2;
         boolean isCourseFill = false;
         boolean isDateFill = false;
-        boolean paperCount = false, examCount = false, actualExamCount = false;
         // 基础信息
         List<Map<String, String>> basicPlate = new ArrayList<>();
         for (JSONObject jsonObject : objectList) {
@@ -319,21 +318,18 @@ public class CreatePdfNewUtil {
                 basicMap.put("name", "试卷数量");
                 basicMap.put("value", examStudentList.size() + " + " + backupCount);
                 basicPlate.add(basicMap);
-                paperCount = true;
             } else if ("examCount".equals(code)) {
                 Map<String, String> basicMap = new HashMap<>();
                 basicMap.put("code", "examCount");
                 basicMap.put("name", "应考人数");
                 basicMap.put("value", String.valueOf(examStudentList.size()));
                 basicPlate.add(basicMap);
-                examCount = true;
             } else if ("actualExamCount".equals(code)) {
                 Map<String, String> basicMap = new HashMap<>();
                 basicMap.put("code", "actualExamCount");
                 basicMap.put("name", "实考人数");
                 basicMap.put("value", "");
                 basicPlate.add(basicMap);
-                actualExamCount = true;
             } else {
                 // 扩展字段走本校验，进行数据组装
                 Set<String> extendFieldsSet = examStudentList.stream().map(ExamStudentCourseDto::getExtendFields).collect(Collectors.toSet());
@@ -350,30 +346,6 @@ public class CreatePdfNewUtil {
                 basicPlate.add(basicMap);
             }
         }
-        if (!paperCount) {
-            Map<String, String> basicMap1 = new HashMap<>();
-            basicMap1.put("code", "paperCount");
-            basicMap1.put("name", "试卷数量");
-            basicMap1.put("value", examStudentList.size() + " + " + backupCount);
-            basicPlate.add(basicMap1);
-        }
-
-        if (!examCount) {
-            Map<String, String> basicMap2 = new HashMap<>();
-            basicMap2.put("code", "examCount");
-            basicMap2.put("name", "应考人数");
-            basicMap2.put("value", String.valueOf(examStudentList.size()));
-            basicPlate.add(basicMap2);
-        }
-
-        if (!actualExamCount) {
-            Map<String, String> basicMap3 = new HashMap<>();
-            basicMap3.put("code", "actualExamCount");
-            basicMap3.put("name", "实考人数");
-            basicMap3.put("value", "");
-            basicPlate.add(basicMap3);
-        }
-
         pdfPackageDto.setBasicPlate(basicPlate);
         printCommonService.saveAttachmentPackagePdf(pdfPackageDto, examDetail, printCount);
     }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkServiceImpl.java

@@ -280,7 +280,7 @@ public class MarkServiceImpl implements MarkService {
             if (!markTask.getStatus().equals(MarkTaskStatus.PROBLEM)) {
                 finishCount++;
             }
-            if (markTask.getStatus() == MarkTaskStatus.MARKED) {
+            if (markTask.getStatus() == MarkTaskStatus.MARKED && markTask.getHeaderScore() == null) {
                 validCount++;
             }
             // 管理员打分数量（主观题检查，仲裁）

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkUserGroupServiceImpl.java

@@ -221,7 +221,7 @@ public class MarkUserGroupServiceImpl extends ServiceImpl<MarkUserGroupMapper, M
                 qualityDto.setLoginName(sysUser.getLoginName());
                 qualityDto.setName(sysUser.getRealName());
                 qualityDto.setOrgName(sysUser.getOrgName());
-                qualityDto.setAdoptionRate(Calculator.divide2String(Calculator.multiply((qualityDto.getValidCount() - qualityDto.getHeaderFinishCount()), 100), Double.valueOf(qualityDto.getFinishCount()), 2));
+                qualityDto.setAdoptionRate(Calculator.divide2String(Calculator.multiply(qualityDto.getValidCount(), 100), Double.valueOf(qualityDto.getFinishCount()), 2));
                 qualityDto.setAvgScore(Calculator.round(qualityDto.getAvgScore(), 2));
             }
         }