|
@@ -557,6 +557,9 @@ public class CreatePdfUtil {
|
|
|
if (Objects.nonNull(examDetailCourse.getPaperType())) {
|
|
|
studentHtml = studentHtml.replaceAll("\\$\\{paperType\\}", GoogleBarCodeUtil.createBarCode(SystemConstant.convertPaperType(examDetailCourse.getPaperType()), false));
|
|
|
}
|
|
|
+ Map<String, Object> map = ConvertUtil.analyzeDateAndTime(examDetail.getExamStartTime(), examDetail.getExamEndTime());
|
|
|
+ studentHtml = studentHtml.replaceAll("\\$\\{examData\\}", Objects.nonNull(map.get("date")) ? (String) map.get("date") : "");
|
|
|
+ studentHtml = studentHtml.replaceAll("\\$\\{examTime\\}", Objects.nonNull(map.get("time")) ? (String) map.get("time") : "");
|
|
|
studentHtml = studentHtml.replaceAll("\\$\\{ticketNumber\\}", t.getTicketNumber());
|
|
|
studentHtml = studentHtml.replaceAll("\\$\\{siteNumber\\}", t.getSiteNumber());
|
|
|
studentHtml = studentHtml.replaceAll("\\$\\{paperTypeName\\}", examDetailCourse.getPaperType());
|