From c50ae185f5b9d0a2114345dab724a9d5125fe763 Mon Sep 17 00:00:00 2001 From: "adel.ka" Date: Fri, 14 Nov 2025 17:08:55 +0300 Subject: [PATCH] =?UTF-8?q?SUPPORT-9570:=20=D0=BE=D1=87=D0=B8=D1=81=D1=82?= =?UTF-8?q?=D0=BA=D0=B0=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=87=D0=BA=D0=B8?= =?UTF-8?q?=20=D0=BE=D0=B1=D0=B6=D0=B0=D0=BB=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/ru/micord/ervu_dashboard/dao/AppealsDao.java | 9 ++++++--- .../ervu_dashboard/service/AppealsFileUploadService.java | 4 +++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/dao/AppealsDao.java b/backend/src/main/java/ru/micord/ervu_dashboard/dao/AppealsDao.java index da94debc..0d961243 100644 --- a/backend/src/main/java/ru/micord/ervu_dashboard/dao/AppealsDao.java +++ b/backend/src/main/java/ru/micord/ervu_dashboard/dao/AppealsDao.java @@ -26,7 +26,10 @@ public class AppealsDao { this.dslContext = dslContext; } - public void save(List> records) { + public void replaceAll(List> records) { + dslContext.truncate(APPEALS_LIST) + .execute(); + LocalDateTime uploadDate = LocalDateTime.now(); List appealRecords = new ArrayList<>(); @@ -38,8 +41,8 @@ public class AppealsDao { appealRecords.add(appealRecord); } } - dslContext.batchMerge(appealRecords) - .execute(); + dslContext.batchInsert(appealRecords) + .execute(); } private Map createFieldsMap(Map valueMap, LocalDateTime uploadDate) { diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/service/AppealsFileUploadService.java b/backend/src/main/java/ru/micord/ervu_dashboard/service/AppealsFileUploadService.java index adff6ecf..ebd972a7 100644 --- a/backend/src/main/java/ru/micord/ervu_dashboard/service/AppealsFileUploadService.java +++ b/backend/src/main/java/ru/micord/ervu_dashboard/service/AppealsFileUploadService.java @@ -8,6 +8,7 @@ import java.util.*; import org.apache.poi.ss.usermodel.*; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import ru.micord.ervu_dashboard.dao.AppealsDao; import ru.micord.ervu_dashboard.exception.FileUploadException; @@ -28,9 +29,10 @@ public class AppealsFileUploadService { this.requiredHeaders = getRequiredHeaders(rawHeaders); } + @Transactional public void save(MultipartFile file) { List> maps = parseFile(file); - appealsDao.save(maps); + appealsDao.replaceAll(maps); } private List> parseFile(MultipartFile file) {