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

SUPPORT-9262: fix audit datetime

Browse source
This commit is contained in:
gulnaz 2025-07-11 17:02:57 +03:00
parent bccb7a5962
commit e7d615540e
4 changed files with 35 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
package ru.micord.ervu.account_applications.component.service;
import java.sql.Timestamp;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
import ru.micord.ervu.account_applications.component.dao.AuditDao;
import ru.micord.ervu.account_applications.security.context.SecurityContext;
import ru.micord.ervu.account_applications.security.model.jwt.UserSession;
import utils.DateTimeUtil;
import ru.cg.webbpm.modules.database.api.bean.TableFieldData;
import ru.cg.webbpm.modules.database.bean.entity_graph.EntityColumn;
@ -44,7 +45,7 @@ public class AuditFormDaoImpl extends FormDaoImpl {
.findAny();
if (status.isPresent() && appListId.isPresent() && !status.get().equals(SENT.name())) {
auditDao.insert(appListId.get(), userSession.name(), userSession.userId(), status.get(), Timestamp.valueOf(
LocalDateTime.now()));
DateTimeUtil.dateToLocalDateTimeUtc(new Date())));
}
return tableFieldData;
}

6
backend/src/main/java/ru/micord/ervu/account_applications/service/UserApplicationListService.java
View file

@ -1,7 +1,7 @@
package ru.micord.ervu.account_applications.service;
import java.sql.Timestamp;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
import org.springframework.stereotype.Service;
@ -9,6 +9,7 @@ import ru.micord.ervu.account_applications.component.dao.AuditDao;
import ru.micord.ervu.account_applications.dao.UserApplicationListDao;
import ru.micord.ervu.account_applications.security.context.SecurityContext;
import ru.micord.ervu.account_applications.security.model.jwt.UserSession;
import utils.DateTimeUtil;
import static ru.micord.ervu.account_applications.enums.ApplicationStatus.ACCEPTED;
import static ru.micord.ervu.account_applications.enums.ApplicationStatus.AGREED;
@ -71,7 +72,8 @@ public class UserApplicationListService {
String name = userSession.name();
String userId = userSession.userId();
appIds.forEach(id -> {
auditDao.insert(id, name, userId, status, Timestamp.valueOf(LocalDateTime.now()));
auditDao.insert(id, name, userId, status, Timestamp.valueOf(
DateTimeUtil.dateToLocalDateTimeUtc(new Date())));
});
}
}

19
resources/src/main/resources/business-model/Список заявок на пользователя/Обработка заявки на добавление пользователя.page
View file

@ -4691,7 +4691,19 @@
<name>Дата и время</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="9c5c7a86-dc40-4b30-a5a7-5e7b4c7ea1e1"/>
<scripts id="9c5c7a86-dc40-4b30-a5a7-5e7b4c7ea1e1">
<properties>
<entry>
<key>valueFormatter</key>
<value>
<implRef type="TS">
<className>ClientDateTimeFormatter</className>
<packageName>component.grid.formatters</packageName>
</implRef>
</value>
</entry>
</properties>
</scripts>
<scripts id="fd653fca-12f9-4e35-baa4-b6b5dd3f6d59">
<properties>
<entry>
@ -4715,10 +4727,7 @@
<entry>
<key>formatter</key>
<value>
<implRef type="JAVA">
<className>DateTimeFormatter</className>
<packageName>custom.grid.formatter</packageName>
</implRef>
<implRef/>
</value>
</entry>
</properties>

19
resources/src/main/resources/business-model/Список заявок на пользователя/Обработка заявки на изменение пользователя.page
View file

@ -7534,7 +7534,19 @@
<name>Дата и время</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="9c5c7a86-dc40-4b30-a5a7-5e7b4c7ea1e1"/>
<scripts id="9c5c7a86-dc40-4b30-a5a7-5e7b4c7ea1e1">
<properties>
<entry>
<key>valueFormatter</key>
<value>
<implRef type="TS">
<className>ClientDateTimeFormatter</className>
<packageName>component.grid.formatters</packageName>
</implRef>
</value>
</entry>
</properties>
</scripts>
<scripts id="fd653fca-12f9-4e35-baa4-b6b5dd3f6d59">
<properties>
<entry>
@ -7558,10 +7570,7 @@
<entry>
<key>formatter</key>
<value>
<implRef type="JAVA">
<className>DateTimeFormatter</className>
<packageName>custom.grid.formatter</packageName>
</implRef>
<implRef/>
</value>
</entry>
</properties>