|
@@ -1235,7 +1235,7 @@ public class PrintCommonServiceImpl implements PrintCommonService {
|
|
|
examStudent.setCollegeName(basicStudentResult.getCollegeName());
|
|
|
examStudent.setMajorName(basicStudentResult.getMajorName());
|
|
|
String prefix = convertUtil.randomNumberPrefix(examShortCode, courseShortCode, map.get(String.valueOf(basicClazzId)), basicExamRule.getExamNumberDigit());
|
|
|
- SerialNumberParams ticketNumberParams = new SerialNumberParams(SystemConstant.NUMBER_CACHE + "ticketNumber-" + schoolId, prefix, basicExamRule.getExamNumberDigit() -prefix.length());
|
|
|
+ SerialNumberParams ticketNumberParams = new SerialNumberParams(SystemConstant.NUMBER_CACHE + "ticketNumber-" + schoolId, prefix, basicExamRule.getExamNumberDigit() - prefix.length());
|
|
|
examStudent.setTicketNumber(createTempNumber(ticketNumberParams));
|
|
|
examStudent.setSiteNumber(String.valueOf(atomicInteger.getAndIncrement()));
|
|
|
examStudent.setExtendFields(extendFields);
|
|
@@ -1419,6 +1419,7 @@ public class PrintCommonServiceImpl implements PrintCommonService {
|
|
|
|
|
|
/**
|
|
|
* 上传pdf文件
|
|
|
+ *
|
|
|
* @param pdfFile
|
|
|
* @return
|
|
|
*/
|
|
@@ -1429,7 +1430,7 @@ public class PrintCommonServiceImpl implements PrintCommonService {
|
|
|
String pdfDirName = pdfFile.getPath();
|
|
|
|
|
|
String sysConfigPath = dictionaryConfig.fssLocalPdfDomain().getConfig() + File.separator;
|
|
|
- String pdfDirNameStr = pdfDirName.replace("\\", "/").replaceAll(sysConfigPath.replace("\\", "/"),"");
|
|
|
+ String pdfDirNameStr = pdfDirName.replace("\\", "/").replaceAll(sysConfigPath.replace("\\", "/"), "");
|
|
|
|
|
|
byte[] data = ByteArray.fromFile(pdfFile).value();
|
|
|
String md5 = ByteArray.md5(data).toHexString();
|
|
@@ -1446,6 +1447,7 @@ public class PrintCommonServiceImpl implements PrintCommonService {
|
|
|
object.put(SystemConstant.PATH, pdfDirNameStr);
|
|
|
object.put(SystemConstant.TYPE, SystemConstant.OSS);
|
|
|
}
|
|
|
+ object.put(SystemConstant.UPLOAD_TYPE, UploadFileEnum.PDF);
|
|
|
return JSON.toJSONString(object);
|
|
|
} catch (Exception e) {
|
|
|
log.error(SystemConstant.LOG_ERROR, e);
|