|
@@ -155,7 +155,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
|
|
JSONArray jsonArrayOrdinary = JSONArray.parseArray(examPrintPlan.getOrdinaryContent());
|
|
JSONArray jsonArrayOrdinary = JSONArray.parseArray(examPrintPlan.getOrdinaryContent());
|
|
for (int i = 0; i < jsonArrayOrdinary.size(); i++) {
|
|
for (int i = 0; i < jsonArrayOrdinary.size(); i++) {
|
|
JSONObject jsonObjectOrdinary = jsonArrayOrdinary.getJSONObject(i);
|
|
JSONObject jsonObjectOrdinary = jsonArrayOrdinary.getJSONObject(i);
|
|
- Long attachmentId = (Long) jsonObjectOrdinary.get("attachmentId");
|
|
|
|
|
|
+ Long attachmentId = Long.parseLong((String) jsonObjectOrdinary.get("attachmentId"));
|
|
BasicAttachment basicAttachment = basicAttachmentService.getById(attachmentId);
|
|
BasicAttachment basicAttachment = basicAttachmentService.getById(attachmentId);
|
|
createPdfUtil.createCheckIn(basicAttachment, ordinaryPdfList, (Integer) jsonObjectOrdinary.get("backupCount"));
|
|
createPdfUtil.createCheckIn(basicAttachment, ordinaryPdfList, (Integer) jsonObjectOrdinary.get("backupCount"));
|
|
}
|
|
}
|
|
@@ -230,7 +230,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
|
|
for (int i = 0; i < jsonArrayVariable.size(); i++) {
|
|
for (int i = 0; i < jsonArrayVariable.size(); i++) {
|
|
JSONObject jsonObjectVariable = jsonArrayVariable.getJSONObject(i);
|
|
JSONObject jsonObjectVariable = jsonArrayVariable.getJSONObject(i);
|
|
String type = (String) jsonObjectVariable.get("type");
|
|
String type = (String) jsonObjectVariable.get("type");
|
|
- Long attachmentId = (Long) jsonObjectVariable.get("attachmentId");
|
|
|
|
|
|
+ Long attachmentId = Long.parseLong((String) jsonObjectVariable.get("attachmentId"));
|
|
BasicAttachment basicAttachment = basicAttachmentService.getById(attachmentId);
|
|
BasicAttachment basicAttachment = basicAttachmentService.getById(attachmentId);
|
|
ftlList.add(commonService.getFile(basicAttachment.getPath(), false));
|
|
ftlList.add(commonService.getFile(basicAttachment.getPath(), false));
|
|
if (Objects.nonNull(type) && Objects.equals(type.toUpperCase(), "SIGN")) {//签到表
|
|
if (Objects.nonNull(type) && Objects.equals(type.toUpperCase(), "SIGN")) {//签到表
|