|
@@ -112,9 +112,9 @@ public class CreatePdfUtil {
|
|
htmlMap.put("examRoom", examDetail.getExamRoom());
|
|
htmlMap.put("examRoom", examDetail.getExamRoom());
|
|
htmlMap.put("startTime", DateUtil.format(new Date(examDetail.getExamStartTime()), SystemConstant.DEFAULT_DATE_PATTERN));
|
|
htmlMap.put("startTime", DateUtil.format(new Date(examDetail.getExamStartTime()), SystemConstant.DEFAULT_DATE_PATTERN));
|
|
htmlMap.put("endTime", DateUtil.format(new Date(examDetail.getExamEndTime()), SystemConstant.DEFAULT_DATE_PATTERN));
|
|
htmlMap.put("endTime", DateUtil.format(new Date(examDetail.getExamEndTime()), SystemConstant.DEFAULT_DATE_PATTERN));
|
|
- htmlMap.put("paperCode", examDetailCourse.getPaperNumber());
|
|
|
|
|
|
+ htmlMap.put("paperCode", examDetail.getPackageCode());
|
|
if (Objects.nonNull(examDetailCourse.getPaperNumber())) {
|
|
if (Objects.nonNull(examDetailCourse.getPaperNumber())) {
|
|
- htmlMap.put("paperCodeImg", GoogleBarCodeUtil.createBarCode(examDetailCourse.getPaperNumber(), false));
|
|
|
|
|
|
+ htmlMap.put("paperCodeImg", GoogleBarCodeUtil.createBarCode(examDetail.getPackageCode(), false));
|
|
}
|
|
}
|
|
|
|
|
|
List<String> extendColumnList = examStudentList.stream().map(m -> m.getExtendFields()).distinct().collect(Collectors.toList());
|
|
List<String> extendColumnList = examStudentList.stream().map(m -> m.getExtendFields()).distinct().collect(Collectors.toList());
|
|
@@ -207,9 +207,9 @@ public class CreatePdfUtil {
|
|
htmlMap.put("classTeacher", String.join(",", classTeacher));
|
|
htmlMap.put("classTeacher", String.join(",", classTeacher));
|
|
htmlMap.put("startTime", DateUtil.format(new Date(examDetail.getExamStartTime()), SystemConstant.DEFAULT_DATE_PATTERN));
|
|
htmlMap.put("startTime", DateUtil.format(new Date(examDetail.getExamStartTime()), SystemConstant.DEFAULT_DATE_PATTERN));
|
|
htmlMap.put("endTime", DateUtil.format(new Date(examDetail.getExamEndTime()), SystemConstant.DEFAULT_DATE_PATTERN));
|
|
htmlMap.put("endTime", DateUtil.format(new Date(examDetail.getExamEndTime()), SystemConstant.DEFAULT_DATE_PATTERN));
|
|
- htmlMap.put("paperCode", examDetailCourse.getPaperNumber());
|
|
|
|
|
|
+ htmlMap.put("paperCode", examDetail.getPackageCode());
|
|
if (Objects.nonNull(examDetailCourse.getPaperNumber())) {
|
|
if (Objects.nonNull(examDetailCourse.getPaperNumber())) {
|
|
- htmlMap.put("paperCodeImg", GoogleBarCodeUtil.createBarCode(examDetailCourse.getPaperNumber(), false));
|
|
|
|
|
|
+ htmlMap.put("paperCodeImg", GoogleBarCodeUtil.createBarCode(examDetail.getPackageCode(), false));
|
|
}
|
|
}
|
|
|
|
|
|
int totalCount = examStudentList.size();
|
|
int totalCount = examStudentList.size();
|