From 32c94c14ffad419cf9246d58db543b48e5a2440b Mon Sep 17 00:00:00 2001 From: "adel.ka" Date: Tue, 21 Oct 2025 19:17:18 +0300 Subject: [PATCH 1/2] =?UTF-8?q?SUPPORT-9498:=20=D0=B7=D0=B0=D1=81=D0=B8?= =?UTF-8?q?=D0=BD=D1=8C=D0=BA=D0=B0=D0=BB=20=D0=B2=D1=80=D0=B5=D0=BC=D1=8F?= =?UTF-8?q?=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F=20=D1=83=20?= =?UTF-8?q?=D0=B7=D0=B0=D1=8F=D0=B2=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/service/AuditFormDaoImpl.java | 19 +++++++++++++++++-- .../enums/ApplicationStatus.java | 3 ++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/component/service/AuditFormDaoImpl.java b/backend/src/main/java/ru/micord/ervu/account_applications/component/service/AuditFormDaoImpl.java index 008fcf22..862b92c6 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/component/service/AuditFormDaoImpl.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/component/service/AuditFormDaoImpl.java @@ -7,9 +7,11 @@ import java.util.Map; import java.util.Optional; import dao.container.FormDaoImpl; +import org.jooq.DSLContext; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import ru.micord.ervu.account_applications.component.dao.AuditDao; +import ru.micord.ervu.account_applications.db_beans.public_.tables.UserApplicationList; import ru.micord.ervu.account_applications.security.context.SecurityContext; import ru.micord.ervu.account_applications.security.model.UserSession; import utils.DateTimeUtil; @@ -17,6 +19,7 @@ import utils.DateTimeUtil; import ru.cg.webbpm.modules.database.api.bean.TableFieldData; import ru.cg.webbpm.modules.database.bean.entity_graph.EntityColumn; +import static ru.micord.ervu.account_applications.enums.ApplicationStatus.CREATED; import static ru.micord.ervu.account_applications.enums.ApplicationStatus.SENT; /** @@ -43,10 +46,22 @@ public class AuditFormDaoImpl extends FormDaoImpl { .filter(data -> data.getField().getName().equals("user_application_list_id")) .map(data -> (Long) data.getData()) .findAny(); + if (status.isPresent() && appListId.isPresent() && !status.get().equals(SENT.name())) { - auditDao.insert(appListId.get(), userSession.name(), userSession.userId(), status.get(), Timestamp.valueOf( - DateTimeUtil.dateToLocalDateTimeUtc(new Date()))); + Timestamp timestamp = status.get().equals(CREATED.name()) + ? getStartDateByApplicationListId(appListId.get()) + : Timestamp.valueOf(DateTimeUtil.dateToLocalDateTimeUtc(new Date())); + + auditDao.insert(appListId.get(), userSession.name(), userSession.userId(), status.get(), timestamp); } return tableFieldData; } + + private Timestamp getStartDateByApplicationListId(Long appListId) { + return getDsl() + .select(UserApplicationList.USER_APPLICATION_LIST.START_DATE) + .from(UserApplicationList.USER_APPLICATION_LIST) + .where(UserApplicationList.USER_APPLICATION_LIST.USER_APPLICATION_LIST_ID.eq(appListId)) + .fetchOne(UserApplicationList.USER_APPLICATION_LIST.START_DATE); + } } diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/enums/ApplicationStatus.java b/backend/src/main/java/ru/micord/ervu/account_applications/enums/ApplicationStatus.java index 9e522257..443a2a65 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/enums/ApplicationStatus.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/enums/ApplicationStatus.java @@ -6,5 +6,6 @@ package ru.micord.ervu.account_applications.enums; public enum ApplicationStatus { AGREED, ACCEPTED, - SENT + SENT, + CREATED } From 6bbe8799be7078f13f3df24efc8bec43e0cd6480 Mon Sep 17 00:00:00 2001 From: "adel.ka" Date: Tue, 21 Oct 2025 19:28:00 +0300 Subject: [PATCH 2/2] =?UTF-8?q?SUPPORT-9498:=20=D1=80=D0=B5=D1=84=D0=B0?= =?UTF-8?q?=D0=BA=D1=82=D0=BE=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account_applications/component/service/AuditFormDaoImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/backend/src/main/java/ru/micord/ervu/account_applications/component/service/AuditFormDaoImpl.java b/backend/src/main/java/ru/micord/ervu/account_applications/component/service/AuditFormDaoImpl.java index 862b92c6..62bd8e1e 100644 --- a/backend/src/main/java/ru/micord/ervu/account_applications/component/service/AuditFormDaoImpl.java +++ b/backend/src/main/java/ru/micord/ervu/account_applications/component/service/AuditFormDaoImpl.java @@ -7,7 +7,6 @@ import java.util.Map; import java.util.Optional; import dao.container.FormDaoImpl; -import org.jooq.DSLContext; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import ru.micord.ervu.account_applications.component.dao.AuditDao;