Merge branch 'dev' of http://git.qmth.com.cn/wangliang/distributed-print-service into dev

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/AsyncCreatePdfTempleteService.java

@@ -50,7 +50,7 @@ public class AsyncCreatePdfTempleteService extends AsyncCreateTaskTemplete {
         StringJoiner stringJoinerSummary = new StringJoiner("\n").add(MessageFormat.format("{0}{1}{2}", DateUtil.format(new Date(), SystemConstant.DEFAULT_DATE_PATTERN), BEGIN_TITLE, OBJ_TITLE));
         TBTaskService tbTaskService = SpringContextHolder.getBean(TBTaskService.class);
         TBTask dbTask = tbTaskService.getById(tbTask.getId());
-        if (Objects.isNull(manual) && (dbTask.getStatus() == TaskStatusEnum.FINISH && Objects.nonNull(dbTask.getResult()))) {//无需重新生成pdf
+        if (Objects.isNull(manual) && (Objects.nonNull(dbTask) && dbTask.getStatus() == TaskStatusEnum.FINISH && Objects.nonNull(dbTask.getResult()))) {//无需重新生成pdf
             return ResultUtil.ok();
         }
         tbTask.setStatus(TaskStatusEnum.RUNNING);

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

@@ -105,9 +105,16 @@ public class CreatePdfUtil {
         }
         Map<String, Object> htmlMap = new HashMap<>();
         if (Objects.nonNull(examStudentList) && examStudentList.size() > 0) {
-            htmlMap.put("examDetailCourseId", examStudentList.get(0).getExamDetailCourseId());
-            htmlMap.put("courseName", examStudentList.get(0).getCourseName());
-            htmlMap.put("courseCode", examStudentList.get(0).getCourseCode());
+            Set<Long> examDetailCourseIds = new HashSet<>();
+            Set<String> courseCodes = new HashSet<>(), courseNames = new HashSet<>();
+            for (ExamStudentCourseDto examStudentCourseDto : examStudentList) {
+                examDetailCourseIds.add(examStudentCourseDto.getExamDetailCourseId());
+                courseCodes.add(examStudentCourseDto.getCourseCode());
+                courseNames.add(examStudentCourseDto.getCourseName());
+            }
+            htmlMap.put("examDetailCourseId", StringUtils.join(examDetailCourseIds, ", "));
+            htmlMap.put("courseName", String.join(", ", courseNames));
+            htmlMap.put("courseCode", String.join(", ", courseCodes));
         } else {
             htmlMap.put("examDetailCourseId", "");
             htmlMap.put("courseName", "");