3.2.0-签到表卷袋贴取值bug修复

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

@@ -493,8 +493,6 @@ public class TaskLogicServiceImpl implements TaskLogicService {
             List<Long> examDetailCourseListIds = examDetailCourseList.stream().map(BaseEntity::getId).collect(Collectors.toList());
             List<ExamStudentCourseDto> examStudentCourseDtoList = examStudentService.queryBySchoolIdAndExamDetailCourseIds(basicSchool.getId(), examDetailCourseListIds);
             int count = (int) examStudentCourseDtoList.stream().filter(s -> s.getPaperPageA3() != null && s.getPaperPageA3() > 2).count();
-            boolean tag = count > 0;
-
             //获取变量印品
             JSONArray jsonArrayVariable = JSONArray.parseArray(variableContent);
             for (int i = 0; i < jsonArrayVariable.size(); i++) {

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

@@ -12,6 +12,7 @@ import com.qmth.distributed.print.business.cache.CreatePdfCacheUtil;
 import com.qmth.distributed.print.business.entity.*;
 import com.qmth.distributed.print.business.enums.ExamDetailStatusEnum;
 import com.qmth.distributed.print.business.enums.PrintMethodEnum;
+import com.qmth.distributed.print.business.enums.StudentClazzEnum;
 import com.qmth.distributed.print.business.service.BasicTemplateService;
 import com.qmth.distributed.print.business.service.ExamDetailService;
 import com.qmth.distributed.print.business.service.ExamStudentService;
@@ -345,11 +346,11 @@ public class CreatePdfUtil {
                     basicMap.put("value", String.join(",", stringSet));
                 } else if ("clazzName".equals(code)) {
                     Set<String> stringSet = new HashSet<>();
-                    Set<String> clazzNames = examStudentList.stream().filter(m -> StringUtils.isNotBlank(m.getClazzName())).map(ExamStudent::getClazzName).collect(Collectors.toSet());
+                    Set<String> clazzNames = examStudentList.stream().filter(m -> m.getStudentClazzType().equals(StudentClazzEnum.BASIC_CLAZZ) && StringUtils.isNotBlank(m.getClazzName())).map(ExamStudent::getClazzName).collect(Collectors.toSet());
                     if (!clazzNames.isEmpty()) {
                         stringSet.addAll(clazzNames);
                     }
-                    Set<String> teachClazzNames = examStudentList.stream().filter(m -> StringUtils.isNotBlank(m.getTeachClazzName())).map(ExamStudent::getTeachClazzName).collect(Collectors.toSet());
+                    Set<String> teachClazzNames = examStudentList.stream().filter(m -> m.getStudentClazzType().equals(StudentClazzEnum.TEACH_CLAZZ) && StringUtils.isNotBlank(m.getTeachClazzName())).map(ExamStudent::getTeachClazzName).collect(Collectors.toSet());
                     if (!teachClazzNames.isEmpty()) {
                         stringSet.addAll(teachClazzNames);
                     }
@@ -663,7 +664,7 @@ public class CreatePdfUtil {
                 studentMap.put("studentCode", examStudentCourseDto.getStudentCode());
             }
             if (studentHeadPlateMap.containsKey("clazzName")) {
-                studentMap.put("className", StringUtils.isBlank(examStudentCourseDto.getTeachClazzName()) ? examStudentCourseDto.getClazzName() : examStudentCourseDto.getTeachClazzName());
+                studentMap.put("clazzName", StringUtils.isBlank(examStudentCourseDto.getTeachClazzName()) ? examStudentCourseDto.getClazzName() : examStudentCourseDto.getTeachClazzName());
             }
             if (studentHeadPlateMap.containsKey("ticketNumber")) {
                 studentMap.put("ticketNumber", examStudentCourseDto.getTicketNumber());