diff --git a/backend/src/main/java/ervu/service/fileupload/EmployeeInfoFileUploadService.java b/backend/src/main/java/ervu/service/fileupload/EmployeeInfoFileUploadService.java index 974e4384..6e33d84b 100644 --- a/backend/src/main/java/ervu/service/fileupload/EmployeeInfoFileUploadService.java +++ b/backend/src/main/java/ervu/service/fileupload/EmployeeInfoFileUploadService.java @@ -338,12 +338,18 @@ public class EmployeeInfoFileUploadService { signerInfoMap.get("O").equalsIgnoreCase(uploadOrgInfo.getOrgName()); if (isSignerValid) { - interactionService.updateStatus(fileInfo.getFileId(), "Направлено в ЕРВУ", ervuId); FileStatusResponse fileStatusResponse = new FileStatusResponse(uploadOrgInfo, new FileInfo[] {fileInfo, signFileInfo}, fileInfo.getFileStatus() ); try { - return sendMessage(fileStatusResponse); + if (sendMessage(fileStatusResponse)) { + interactionService.updateStatus(fileInfo.getFileId(), "Направлено в ЕРВУ", ervuId); + return true; + } + else { + interactionService.delete(fileInfo.getFileId(), ervuId); + return false; + } } catch (JsonProcessingException e) { handeSignError(fileInfo, signFileInfo, uploadOrgInfo, response); @@ -364,9 +370,15 @@ public class EmployeeInfoFileUploadService { validateMchd(mchdFile, accessToken, signerInfoMap.get("SN") + " " + signerInfoMap.get("G"), chiefFirstName, chiefLastName, chiefMiddleName ); - interactionService.updateStatus(fileInfo.getFileId(), "Направлено в ЕРВУ", ervuId); - return sendMessage(fileStatusResponse); + if (sendMessage(fileStatusResponse)) { + interactionService.updateStatus(fileInfo.getFileId(), "Направлено в ЕРВУ", ervuId); + return true; + } + else { + interactionService.delete(fileInfo.getFileId(), ervuId); + return false; + } } catch (JsonProcessingException e) { handleMchdValidationError(uploadOrgInfo, fileInfo, signFileInfo, mchdFileInfo, ervuId, response