|
|
@@ -1273,7 +1273,7 @@ public class CreatePdfUtil {
|
|
|
List<File> fileTempList) throws IOException {
|
|
|
String studentHtml = studentContent;
|
|
|
|
|
|
- if (!ExamNumberStyleEnum.FILL.equals(basicCardRule.getExamNumberStyle())) {
|
|
|
+ if (ExamNumberStyleEnum.PRINT.equals(basicCardRule.getExamNumberStyle())) {
|
|
|
// 生成学生考号条码并将图片转成base64
|
|
|
studentHtml = studentHtml.replaceAll("\\$\\{studentCodeBarcode\\}", examStudent != null && examStudent.getStudentCode() != null ? GoogleBarCodeUtil.createBarCode(examStudent.getStudentCode(), false) : "");
|
|
|
studentHtml = studentHtml.replaceAll("\\$\\{ticketNumberBarcode\\}", examStudent != null && examStudent.getTicketNumber() != null ? GoogleBarCodeUtil.createBarCode(examStudent.getTicketNumber(), false) : "");
|
|
|
@@ -1296,7 +1296,7 @@ public class CreatePdfUtil {
|
|
|
studentHtml = studentHtml.replaceAll("\\$\\{packageCodeDom\\}", "");
|
|
|
|
|
|
// 将其它未匹配到值的参数，填入空值
|
|
|
- studentHtml = studentHtml.replaceAll("^\\$\\{[A-Za-z0-9]+\\}$", "");
|
|
|
+ studentHtml = studentHtml.replaceAll("\\$\\{[A-Za-z0-9]+\\}", "");
|
|
|
|
|
|
//学生题卡
|
|
|
BasicAttachment examStudentAttachment = printCommonService.saveAttachmentHtml(examDetail.getSchoolId() + "|" + examDetailCourse.getCourseCode() + (examStudent != null && examStudent.getTicketNumber() != null ? "|" + examStudent.getTicketNumber() : ""), studentHtml, userId, examStudentPdfList, fileTempList);
|
xiaofei