micord/ervu-account-applications
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/feature/SUPPORT-9498_new_version' into develop

Browse source
This commit is contained in:
adel.ka 2025-10-23 16:16:18 +03:00
commit ad5b0ea38e
2 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
backend/src/main/java/ru/micord/ervu/account_applications/component/service/AuditFormDaoImpl.java
View file

@ -10,6 +10,7 @@ import dao.container.FormDaoImpl;
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 +18,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 +45,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);
}
}

3
backend/src/main/java/ru/micord/ervu/account_applications/enums/ApplicationStatus.java
View file

@ -6,5 +6,6 @@ package ru.micord.ervu.account_applications.enums;
public enum ApplicationStatus {
AGREED,
ACCEPTED,
SENT
SENT,
CREATED
}