Merge branch 'feature/SUPPORT-9484_fix_date' into develop

backend/src/main/java/ervu/service/fileupload/EmployeeInfoFileUploadService.java

@@ -182,7 +182,7 @@ public class EmployeeInfoFileUploadService {
     fileStatus.setStatus(uploadSuccess ? "Загрузка" : "Невозможно проверить файл ЛК РП");
     interactionService.setStatus(fileInfo.getFileId(), fileStatus.getStatus(),
         multipartFile.getOriginalFilename(), employeeInfoFileFormType.getFilePatternCode(),
-        Timestamp.valueOf(now), fio, ervuId
+        Timestamp.valueOf(now), fio, ervuId, offset
     );
 
     fileInfo.setFileStatus(fileStatus);

backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Keys.java

@@ -5,14 +5,10 @@ package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_;
 
 
 import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.Databasechangeloglock;
-import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.Files;
 import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OkopfRecords;
-import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OrgOkved;
 import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.Shedlock;
 import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.records.DatabasechangeloglockRecord;
-import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.records.FilesRecord;
 import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.records.OkopfRecordsRecord;
-import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.records.OrgOkvedRecord;
 import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.records.ShedlockRecord;
 
 import org.jooq.TableField;
@@ -33,9 +29,6 @@ public class Keys {
     // -------------------------------------------------------------------------
 
     public static final UniqueKey<DatabasechangeloglockRecord> DATABASECHANGELOGLOCK_PKEY = Internal.createUniqueKey(Databasechangeloglock.DATABASECHANGELOGLOCK, DSL.name("databasechangeloglock_pkey"), new TableField[] { Databasechangeloglock.DATABASECHANGELOGLOCK.ID }, true);
-    public static final UniqueKey<FilesRecord> FILES_PKEY = Internal.createUniqueKey(Files.FILES, DSL.name("files_pkey"), new TableField[] { Files.FILES.FILE_ID }, true);
-    public static final UniqueKey<OkopfRecordsRecord> OKOPF_RECORDS_NAME_KEY = Internal.createUniqueKey(OkopfRecords.OKOPF_RECORDS, DSL.name("okopf_records_name_key"), new TableField[] { OkopfRecords.OKOPF_RECORDS.NAME }, true);
     public static final UniqueKey<OkopfRecordsRecord> OKOPF_RECORDS_PKEY = Internal.createUniqueKey(OkopfRecords.OKOPF_RECORDS, DSL.name("okopf_records_pkey"), new TableField[] { OkopfRecords.OKOPF_RECORDS.OKOPF_RECORDS_ID }, true);
-    public static final UniqueKey<OrgOkvedRecord> ORG_OKVED_PKEY = Internal.createUniqueKey(OrgOkved.ORG_OKVED, DSL.name("org_okved_pkey"), new TableField[] { OrgOkved.ORG_OKVED.ID }, true);
     public static final UniqueKey<ShedlockRecord> SHEDLOCK_PK = Internal.createUniqueKey(Shedlock.SHEDLOCK, DSL.name("shedlock_pk"), new TableField[] { Shedlock.SHEDLOCK.NAME }, true);
 }

backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Public.java

@@ -7,10 +7,8 @@ package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_;
 import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.DefaultCatalog;
 import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.Databasechangelog;
 import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.Databasechangeloglock;
-import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.Files;
 import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.InteractionLog;
 import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OkopfRecords;
-import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OrgOkved;
 import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.Shedlock;
 
 import java.util.Arrays;
@@ -44,11 +42,6 @@ public class Public extends SchemaImpl {
      */
     public final Databasechangeloglock DATABASECHANGELOGLOCK = Databasechangeloglock.DATABASECHANGELOGLOCK;
 
-    /**
-     * The table <code>public.files</code>.
-     */
-    public final Files FILES = Files.FILES;
-
     /**
      * The table <code>public.interaction_log</code>.
      */
@@ -59,11 +52,6 @@ public class Public extends SchemaImpl {
      */
     public final OkopfRecords OKOPF_RECORDS = OkopfRecords.OKOPF_RECORDS;
 
-    /**
-     * The table <code>public.org_okved</code>.
-     */
-    public final OrgOkved ORG_OKVED = OrgOkved.ORG_OKVED;
-
     /**
      * The table <code>public.shedlock</code>.
      */
@@ -87,10 +75,8 @@ public class Public extends SchemaImpl {
         return Arrays.asList(
             Databasechangelog.DATABASECHANGELOG,
             Databasechangeloglock.DATABASECHANGELOGLOCK,
-            Files.FILES,
             InteractionLog.INTERACTION_LOG,
             OkopfRecords.OKOPF_RECORDS,
-            OrgOkved.ORG_OKVED,
             Shedlock.SHEDLOCK
         );
     }

backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Tables.java

@@ -6,10 +6,8 @@ package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_;
 
 import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.Databasechangelog;
 import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.Databasechangeloglock;
-import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.Files;
 import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.InteractionLog;
 import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OkopfRecords;
-import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OrgOkved;
 import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.Shedlock;
 
 
@@ -29,11 +27,6 @@ public class Tables {
      */
     public static final Databasechangeloglock DATABASECHANGELOGLOCK = Databasechangeloglock.DATABASECHANGELOGLOCK;
 
-    /**
-     * The table <code>public.files</code>.
-     */
-    public static final Files FILES = Files.FILES;
-
     /**
      * The table <code>public.interaction_log</code>.
      */
@@ -44,11 +37,6 @@ public class Tables {
      */
     public static final OkopfRecords OKOPF_RECORDS = OkopfRecords.OKOPF_RECORDS;
 
-    /**
-     * The table <code>public.org_okved</code>.
-     */
-    public static final OrgOkved ORG_OKVED = OrgOkved.ORG_OKVED;
-
     /**
      * The table <code>public.shedlock</code>.
      */

backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/Files.java

@@ -1,239 +0,0 @@
-/*
- * This file is generated by jOOQ.
- */
-package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables;
-
-
-import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.Keys;
-import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.Public;
-import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.records.FilesRecord;
-
-import java.util.Collection;
-
-import org.jooq.Condition;
-import org.jooq.Field;
-import org.jooq.Identity;
-import org.jooq.Name;
-import org.jooq.PlainSQL;
-import org.jooq.QueryPart;
-import org.jooq.SQL;
-import org.jooq.Schema;
-import org.jooq.Select;
-import org.jooq.Stringly;
-import org.jooq.Table;
-import org.jooq.TableField;
-import org.jooq.TableOptions;
-import org.jooq.UniqueKey;
-import org.jooq.impl.DSL;
-import org.jooq.impl.SQLDataType;
-import org.jooq.impl.TableImpl;
-
-
-/**
- * This class is generated by jOOQ.
- */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
-public class Files extends TableImpl<FilesRecord> {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * The reference instance of <code>public.files</code>
-     */
-    public static final Files FILES = new Files();
-
-    /**
-     * The class holding records for this type
-     */
-    @Override
-    public Class<FilesRecord> getRecordType() {
-        return FilesRecord.class;
-    }
-
-    /**
-     * The column <code>public.files.file_id</code>.
-     */
-    public final TableField<FilesRecord, Long> FILE_ID = createField(DSL.name("file_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, "");
-
-    /**
-     * The column <code>public.files.file</code>.
-     */
-    public final TableField<FilesRecord, byte[]> FILE = createField(DSL.name("file"), SQLDataType.BLOB, this, "");
-
-    /**
-     * The column <code>public.files.file_name</code>.
-     */
-    public final TableField<FilesRecord, String> FILE_NAME = createField(DSL.name("file_name"), SQLDataType.VARCHAR(10000), this, "");
-
-    /**
-     * The column <code>public.files.interaction_log_id</code>.
-     */
-    public final TableField<FilesRecord, Long> INTERACTION_LOG_ID = createField(DSL.name("interaction_log_id"), SQLDataType.BIGINT, this, "");
-
-    private Files(Name alias, Table<FilesRecord> aliased) {
-        this(alias, aliased, (Field<?>[]) null, null);
-    }
-
-    private Files(Name alias, Table<FilesRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
-    }
-
-    /**
-     * Create an aliased <code>public.files</code> table reference
-     */
-    public Files(String alias) {
-        this(DSL.name(alias), FILES);
-    }
-
-    /**
-     * Create an aliased <code>public.files</code> table reference
-     */
-    public Files(Name alias) {
-        this(alias, FILES);
-    }
-
-    /**
-     * Create a <code>public.files</code> table reference
-     */
-    public Files() {
-        this(DSL.name("files"), null);
-    }
-
-    @Override
-    public Schema getSchema() {
-        return aliased() ? null : Public.PUBLIC;
-    }
-
-    @Override
-    public Identity<FilesRecord, Long> getIdentity() {
-        return (Identity<FilesRecord, Long>) super.getIdentity();
-    }
-
-    @Override
-    public UniqueKey<FilesRecord> getPrimaryKey() {
-        return Keys.FILES_PKEY;
-    }
-
-    @Override
-    public Files as(String alias) {
-        return new Files(DSL.name(alias), this);
-    }
-
-    @Override
-    public Files as(Name alias) {
-        return new Files(alias, this);
-    }
-
-    @Override
-    public Files as(Table<?> alias) {
-        return new Files(alias.getQualifiedName(), this);
-    }
-
-    /**
-     * Rename this table
-     */
-    @Override
-    public Files rename(String name) {
-        return new Files(DSL.name(name), null);
-    }
-
-    /**
-     * Rename this table
-     */
-    @Override
-    public Files rename(Name name) {
-        return new Files(name, null);
-    }
-
-    /**
-     * Rename this table
-     */
-    @Override
-    public Files rename(Table<?> name) {
-        return new Files(name.getQualifiedName(), null);
-    }
-
-    /**
-     * Create an inline derived table from this table
-     */
-    @Override
-    public Files where(Condition condition) {
-        return new Files(getQualifiedName(), aliased() ? this : null, null, condition);
-    }
-
-    /**
-     * Create an inline derived table from this table
-     */
-    @Override
-    public Files where(Collection<? extends Condition> conditions) {
-        return where(DSL.and(conditions));
-    }
-
-    /**
-     * Create an inline derived table from this table
-     */
-    @Override
-    public Files where(Condition... conditions) {
-        return where(DSL.and(conditions));
-    }
-
-    /**
-     * Create an inline derived table from this table
-     */
-    @Override
-    public Files where(Field<Boolean> condition) {
-        return where(DSL.condition(condition));
-    }
-
-    /**
-     * Create an inline derived table from this table
-     */
-    @Override
-    @PlainSQL
-    public Files where(SQL condition) {
-        return where(DSL.condition(condition));
-    }
-
-    /**
-     * Create an inline derived table from this table
-     */
-    @Override
-    @PlainSQL
-    public Files where(@Stringly.SQL String condition) {
-        return where(DSL.condition(condition));
-    }
-
-    /**
-     * Create an inline derived table from this table
-     */
-    @Override
-    @PlainSQL
-    public Files where(@Stringly.SQL String condition, Object... binds) {
-        return where(DSL.condition(condition, binds));
-    }
-
-    /**
-     * Create an inline derived table from this table
-     */
-    @Override
-    @PlainSQL
-    public Files where(@Stringly.SQL String condition, QueryPart... parts) {
-        return where(DSL.condition(condition, parts));
-    }
-
-    /**
-     * Create an inline derived table from this table
-     */
-    @Override
-    public Files whereExists(Select<?> select) {
-        return where(DSL.exists(select));
-    }
-
-    /**
-     * Create an inline derived table from this table
-     */
-    @Override
-    public Files whereNotExists(Select<?> select) {
-        return where(DSL.notExists(select));
-    }
-}

backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/InteractionLog.java

@@ -99,6 +99,11 @@ public class InteractionLog extends TableImpl<InteractionLogRecord> {
      */
     public final TableField<InteractionLogRecord, String> ERVU_ID = createField(DSL.name("ervu_id"), SQLDataType.VARCHAR(36), this, "");
 
+    /**
+     * The column <code>public.interaction_log.offset</code>.
+     */
+    public final TableField<InteractionLogRecord, String> OFFSET = createField(DSL.name("offset"), SQLDataType.VARCHAR(10), this, "");
+
     private InteractionLog(Name alias, Table<InteractionLogRecord> aliased) {
         this(alias, aliased, (Field<?>[]) null, null);
     }

backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/OkopfRecords.java

@@ -8,9 +8,7 @@ import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.Keys;
 import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.Public;
 import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.records.OkopfRecordsRecord;
 
-import java.util.Arrays;
 import java.util.Collection;
-import java.util.List;
 
 import org.jooq.Condition;
 import org.jooq.Field;
@@ -105,11 +103,6 @@ public class OkopfRecords extends TableImpl<OkopfRecordsRecord> {
         return Keys.OKOPF_RECORDS_PKEY;
     }
 
-    @Override
-    public List<UniqueKey<OkopfRecordsRecord>> getUniqueKeys() {
-        return Arrays.asList(Keys.OKOPF_RECORDS_NAME_KEY);
-    }
-
     @Override
     public OkopfRecords as(String alias) {
         return new OkopfRecords(DSL.name(alias), this);

backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/OrgOkved.java

@@ -1,244 +0,0 @@
-/*
- * This file is generated by jOOQ.
- */
-package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables;
-
-
-import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.Keys;
-import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.Public;
-import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.records.OrgOkvedRecord;
-
-import java.util.Collection;
-
-import org.jooq.Condition;
-import org.jooq.Field;
-import org.jooq.Identity;
-import org.jooq.Name;
-import org.jooq.PlainSQL;
-import org.jooq.QueryPart;
-import org.jooq.SQL;
-import org.jooq.Schema;
-import org.jooq.Select;
-import org.jooq.Stringly;
-import org.jooq.Table;
-import org.jooq.TableField;
-import org.jooq.TableOptions;
-import org.jooq.UniqueKey;
-import org.jooq.impl.DSL;
-import org.jooq.impl.SQLDataType;
-import org.jooq.impl.TableImpl;
-
-
-/**
- * This class is generated by jOOQ.
- */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
-public class OrgOkved extends TableImpl<OrgOkvedRecord> {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * The reference instance of <code>public.org_okved</code>
-     */
-    public static final OrgOkved ORG_OKVED = new OrgOkved();
-
-    /**
-     * The class holding records for this type
-     */
-    @Override
-    public Class<OrgOkvedRecord> getRecordType() {
-        return OrgOkvedRecord.class;
-    }
-
-    /**
-     * The column <code>public.org_okved.id</code>.
-     */
-    public final TableField<OrgOkvedRecord, Long> ID = createField(DSL.name("id"), SQLDataType.BIGINT.nullable(false).identity(true), this, "");
-
-    /**
-     * The column <code>public.org_okved.code</code>.
-     */
-    public final TableField<OrgOkvedRecord, String> CODE = createField(DSL.name("code"), SQLDataType.VARCHAR(7), this, "");
-
-    /**
-     * The column <code>public.org_okved.okved</code>.
-     */
-    public final TableField<OrgOkvedRecord, String> OKVED = createField(DSL.name("okved"), SQLDataType.CLOB, this, "");
-
-    /**
-     * The column <code>public.org_okved.organization</code>.
-     */
-    public final TableField<OrgOkvedRecord, String> ORGANIZATION = createField(DSL.name("organization"), SQLDataType.CLOB, this, "");
-
-    /**
-     * The column <code>public.org_okved.main_okved</code>.
-     */
-    public final TableField<OrgOkvedRecord, Boolean> MAIN_OKVED = createField(DSL.name("main_okved"), SQLDataType.BOOLEAN, this, "");
-
-    private OrgOkved(Name alias, Table<OrgOkvedRecord> aliased) {
-        this(alias, aliased, (Field<?>[]) null, null);
-    }
-
-    private OrgOkved(Name alias, Table<OrgOkvedRecord> aliased, Field<?>[] parameters, Condition where) {
-        super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where);
-    }
-
-    /**
-     * Create an aliased <code>public.org_okved</code> table reference
-     */
-    public OrgOkved(String alias) {
-        this(DSL.name(alias), ORG_OKVED);
-    }
-
-    /**
-     * Create an aliased <code>public.org_okved</code> table reference
-     */
-    public OrgOkved(Name alias) {
-        this(alias, ORG_OKVED);
-    }
-
-    /**
-     * Create a <code>public.org_okved</code> table reference
-     */
-    public OrgOkved() {
-        this(DSL.name("org_okved"), null);
-    }
-
-    @Override
-    public Schema getSchema() {
-        return aliased() ? null : Public.PUBLIC;
-    }
-
-    @Override
-    public Identity<OrgOkvedRecord, Long> getIdentity() {
-        return (Identity<OrgOkvedRecord, Long>) super.getIdentity();
-    }
-
-    @Override
-    public UniqueKey<OrgOkvedRecord> getPrimaryKey() {
-        return Keys.ORG_OKVED_PKEY;
-    }
-
-    @Override
-    public OrgOkved as(String alias) {
-        return new OrgOkved(DSL.name(alias), this);
-    }
-
-    @Override
-    public OrgOkved as(Name alias) {
-        return new OrgOkved(alias, this);
-    }
-
-    @Override
-    public OrgOkved as(Table<?> alias) {
-        return new OrgOkved(alias.getQualifiedName(), this);
-    }
-
-    /**
-     * Rename this table
-     */
-    @Override
-    public OrgOkved rename(String name) {
-        return new OrgOkved(DSL.name(name), null);
-    }
-
-    /**
-     * Rename this table
-     */
-    @Override
-    public OrgOkved rename(Name name) {
-        return new OrgOkved(name, null);
-    }
-
-    /**
-     * Rename this table
-     */
-    @Override
-    public OrgOkved rename(Table<?> name) {
-        return new OrgOkved(name.getQualifiedName(), null);
-    }
-
-    /**
-     * Create an inline derived table from this table
-     */
-    @Override
-    public OrgOkved where(Condition condition) {
-        return new OrgOkved(getQualifiedName(), aliased() ? this : null, null, condition);
-    }
-
-    /**
-     * Create an inline derived table from this table
-     */
-    @Override
-    public OrgOkved where(Collection<? extends Condition> conditions) {
-        return where(DSL.and(conditions));
-    }
-
-    /**
-     * Create an inline derived table from this table
-     */
-    @Override
-    public OrgOkved where(Condition... conditions) {
-        return where(DSL.and(conditions));
-    }
-
-    /**
-     * Create an inline derived table from this table
-     */
-    @Override
-    public OrgOkved where(Field<Boolean> condition) {
-        return where(DSL.condition(condition));
-    }
-
-    /**
-     * Create an inline derived table from this table
-     */
-    @Override
-    @PlainSQL
-    public OrgOkved where(SQL condition) {
-        return where(DSL.condition(condition));
-    }
-
-    /**
-     * Create an inline derived table from this table
-     */
-    @Override
-    @PlainSQL
-    public OrgOkved where(@Stringly.SQL String condition) {
-        return where(DSL.condition(condition));
-    }
-
-    /**
-     * Create an inline derived table from this table
-     */
-    @Override
-    @PlainSQL
-    public OrgOkved where(@Stringly.SQL String condition, Object... binds) {
-        return where(DSL.condition(condition, binds));
-    }
-
-    /**
-     * Create an inline derived table from this table
-     */
-    @Override
-    @PlainSQL
-    public OrgOkved where(@Stringly.SQL String condition, QueryPart... parts) {
-        return where(DSL.condition(condition, parts));
-    }
-
-    /**
-     * Create an inline derived table from this table
-     */
-    @Override
-    public OrgOkved whereExists(Select<?> select) {
-        return where(DSL.exists(select));
-    }
-
-    /**
-     * Create an inline derived table from this table
-     */
-    @Override
-    public OrgOkved whereNotExists(Select<?> select) {
-        return where(DSL.notExists(select));
-    }
-}

backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/records/FilesRecord.java

@@ -1,109 +0,0 @@
-/*
- * This file is generated by jOOQ.
- */
-package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.records;
-
-
-import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.Files;
-
-import org.jooq.Record1;
-import org.jooq.impl.UpdatableRecordImpl;
-
-
-/**
- * This class is generated by jOOQ.
- */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
-public class FilesRecord extends UpdatableRecordImpl<FilesRecord> {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * Setter for <code>public.files.file_id</code>.
-     */
-    public void setFileId(Long value) {
-        set(0, value);
-    }
-
-    /**
-     * Getter for <code>public.files.file_id</code>.
-     */
-    public Long getFileId() {
-        return (Long) get(0);
-    }
-
-    /**
-     * Setter for <code>public.files.file</code>.
-     */
-    public void setFile(byte[] value) {
-        set(1, value);
-    }
-
-    /**
-     * Getter for <code>public.files.file</code>.
-     */
-    public byte[] getFile() {
-        return (byte[]) get(1);
-    }
-
-    /**
-     * Setter for <code>public.files.file_name</code>.
-     */
-    public void setFileName(String value) {
-        set(2, value);
-    }
-
-    /**
-     * Getter for <code>public.files.file_name</code>.
-     */
-    public String getFileName() {
-        return (String) get(2);
-    }
-
-    /**
-     * Setter for <code>public.files.interaction_log_id</code>.
-     */
-    public void setInteractionLogId(Long value) {
-        set(3, value);
-    }
-
-    /**
-     * Getter for <code>public.files.interaction_log_id</code>.
-     */
-    public Long getInteractionLogId() {
-        return (Long) get(3);
-    }
-
-    // -------------------------------------------------------------------------
-    // Primary key information
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Record1<Long> key() {
-        return (Record1) super.key();
-    }
-
-    // -------------------------------------------------------------------------
-    // Constructors
-    // -------------------------------------------------------------------------
-
-    /**
-     * Create a detached FilesRecord
-     */
-    public FilesRecord() {
-        super(Files.FILES);
-    }
-
-    /**
-     * Create a detached, initialised FilesRecord
-     */
-    public FilesRecord(Long fileId, byte[] file, String fileName, Long interactionLogId) {
-        super(Files.FILES);
-
-        setFileId(fileId);
-        setFile(file);
-        setFileName(fileName);
-        setInteractionLogId(interactionLogId);
-        resetChangedOnNotNull();
-    }
-}

backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/records/InteractionLogRecord.java

@@ -159,6 +159,20 @@ public class InteractionLogRecord extends TableRecordImpl<InteractionLogRecord>
         return (String) get(9);
     }
 
+    /**
+     * Setter for <code>public.interaction_log.offset</code>.
+     */
+    public void setOffset(String value) {
+        set(10, value);
+    }
+
+    /**
+     * Getter for <code>public.interaction_log.offset</code>.
+     */
+    public String getOffset() {
+        return (String) get(10);
+    }
+
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------
@@ -173,7 +187,7 @@ public class InteractionLogRecord extends TableRecordImpl<InteractionLogRecord>
     /**
      * Create a detached, initialised InteractionLogRecord
      */
-    public InteractionLogRecord(Long id, Timestamp sentDate, String form, String sender, String status, String fileName, Integer recordsSent, Integer recordsAccepted, String fileId, String ervuId) {
+    public InteractionLogRecord(Long id, Timestamp sentDate, String form, String sender, String status, String fileName, Integer recordsSent, Integer recordsAccepted, String fileId, String ervuId, String offset) {
         super(InteractionLog.INTERACTION_LOG);
 
         setId(id);
@@ -186,6 +200,7 @@ public class InteractionLogRecord extends TableRecordImpl<InteractionLogRecord>
         setRecordsAccepted(recordsAccepted);
         setFileId(fileId);
         setErvuId(ervuId);
+        setOffset(offset);
         resetChangedOnNotNull();
     }
 }

backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/records/OrgOkvedRecord.java

@@ -1,124 +0,0 @@
-/*
- * This file is generated by jOOQ.
- */
-package ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.records;
-
-
-import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.OrgOkved;
-
-import org.jooq.Record1;
-import org.jooq.impl.UpdatableRecordImpl;
-
-
-/**
- * This class is generated by jOOQ.
- */
-@SuppressWarnings({ "all", "unchecked", "rawtypes" })
-public class OrgOkvedRecord extends UpdatableRecordImpl<OrgOkvedRecord> {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * Setter for <code>public.org_okved.id</code>.
-     */
-    public void setId(Long value) {
-        set(0, value);
-    }
-
-    /**
-     * Getter for <code>public.org_okved.id</code>.
-     */
-    public Long getId() {
-        return (Long) get(0);
-    }
-
-    /**
-     * Setter for <code>public.org_okved.code</code>.
-     */
-    public void setCode(String value) {
-        set(1, value);
-    }
-
-    /**
-     * Getter for <code>public.org_okved.code</code>.
-     */
-    public String getCode() {
-        return (String) get(1);
-    }
-
-    /**
-     * Setter for <code>public.org_okved.okved</code>.
-     */
-    public void setOkved(String value) {
-        set(2, value);
-    }
-
-    /**
-     * Getter for <code>public.org_okved.okved</code>.
-     */
-    public String getOkved() {
-        return (String) get(2);
-    }
-
-    /**
-     * Setter for <code>public.org_okved.organization</code>.
-     */
-    public void setOrganization(String value) {
-        set(3, value);
-    }
-
-    /**
-     * Getter for <code>public.org_okved.organization</code>.
-     */
-    public String getOrganization() {
-        return (String) get(3);
-    }
-
-    /**
-     * Setter for <code>public.org_okved.main_okved</code>.
-     */
-    public void setMainOkved(Boolean value) {
-        set(4, value);
-    }
-
-    /**
-     * Getter for <code>public.org_okved.main_okved</code>.
-     */
-    public Boolean getMainOkved() {
-        return (Boolean) get(4);
-    }
-
-    // -------------------------------------------------------------------------
-    // Primary key information
-    // -------------------------------------------------------------------------
-
-    @Override
-    public Record1<Long> key() {
-        return (Record1) super.key();
-    }
-
-    // -------------------------------------------------------------------------
-    // Constructors
-    // -------------------------------------------------------------------------
-
-    /**
-     * Create a detached OrgOkvedRecord
-     */
-    public OrgOkvedRecord() {
-        super(OrgOkved.ORG_OKVED);
-    }
-
-    /**
-     * Create a detached, initialised OrgOkvedRecord
-     */
-    public OrgOkvedRecord(Long id, String code, String okved, String organization, Boolean mainOkved) {
-        super(OrgOkved.ORG_OKVED);
-
-        setId(id);
-        setCode(code);
-        setOkved(okved);
-        setOrganization(organization);
-        setMainOkved(mainOkved);
-        resetChangedOnNotNull();
-    }
-}

backend/src/main/java/ru/micord/ervu/journal/mapper/JournalDtoMapper.java

@@ -1,6 +1,9 @@
 package ru.micord.ervu.journal.mapper;
 
-import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 
 import ervu_lkrp_ul.ervu_lkrp_ul.db_beans.public_.tables.records.InteractionLogRecord;
 import ru.micord.ervu.journal.JournalDto;
@@ -16,7 +19,7 @@ public class JournalDtoMapper {
     SenderInfo senderInfo = journalFileInfo.getSenderInfo();
     return new JournalDto()
         .setFileId(journalFileDetails.getFileId())
-        .setDepartureDateTime(Timestamp.valueOf(journalFileDetails.getDepartureDateTime()).toString())
+        .setDepartureDateTime(parseDateTime(journalFileDetails.getDepartureDateTime(), journalFileDetails.getTimeZone()))
         .setFileName(journalFileDetails.getFileName())
         .setFilePatternCode(journalFileDetails.getFilePatternCode())
         .setSenderFio(convertToFio(senderInfo.getFirstName(), senderInfo.getMiddleName(),
@@ -31,7 +34,8 @@ public class JournalDtoMapper {
 
   public static JournalDto mapToJournalDto(InteractionLogRecord record) {
     return new JournalDto()
-        .setDepartureDateTime(record.getSentDate().toString())
+        .setDepartureDateTime(
+            parseDateTime(record.getSentDate().toLocalDateTime(), record.getOffset()))
         .setFileName(record.getFileName())
         .setFilePatternCode(Integer.valueOf(record.getForm()))
         .setSenderFio(record.getSender())
@@ -41,4 +45,15 @@ public class JournalDtoMapper {
         .setRowsError(0)
         .setFileId(record.getFileId());
   }
+
+  private static String parseDateTime(LocalDateTime dateTime, String timeZone) {
+    if (timeZone == null) {
+      timeZone = "+00:00";
+    }
+    DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm:ss");
+    ZonedDateTime utcZoned = dateTime.atZone(ZoneOffset.UTC);
+    ZoneOffset offset = ZoneOffset.of(timeZone);
+    ZonedDateTime zonedDateTime = utcZoned.withZoneSameInstant(offset);
+    return zonedDateTime.format(formatter) + " (" + timeZone + ")";
+  }
 }

backend/src/main/java/ru/micord/ervu/service/InteractionService.java

@@ -12,7 +12,7 @@ public interface InteractionService {
 
   List<InteractionLogRecord> get(String ervuId, String[] excludedStatuses);
 
-  void setStatus(String fileId, String status, String fileName, String form, Timestamp timestamp, String sender, String ervuId);
+  void setStatus(String fileId, String status, String fileName, String form, Timestamp timestamp, String sender, String ervuId, String offset);
 
   void updateStatus(String fileId, String status, String ervuId);
 

backend/src/main/java/ru/micord/ervu/service/InteractionServiceImpl.java

@@ -33,7 +33,7 @@ public class InteractionServiceImpl implements InteractionService {
   }
 
   public void setStatus(String fileId, String status, String fileName, String form,
-      Timestamp timestamp, String sender, String ervuId) {
+      Timestamp timestamp, String sender, String ervuId, String offset) {
     dslContext.insertInto(INTERACTION_LOG)
         .set(INTERACTION_LOG.FILE_ID, fileId)
         .set(INTERACTION_LOG.STATUS, status)
@@ -42,6 +42,7 @@ public class InteractionServiceImpl implements InteractionService {
         .set(INTERACTION_LOG.SENDER, sender)
         .set(INTERACTION_LOG.FILE_NAME, fileName)
         .set(INTERACTION_LOG.ERVU_ID, ervuId)
+        .set(INTERACTION_LOG.OFFSET, offset)
         .execute();
   }
 

backend/src/main/resources/config/v_1.0/2025-10-20-create-offset-column.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
+
+  <changeSet id="001" author="tihomirov">
+    <comment>create offset column in interaction_log table</comment>
+    <addColumn schemaName="public" tableName="interaction_log">
+      <column name="offset" type="varchar(10)"/>
+    </addColumn>
+  </changeSet>
+</databaseChangeLog>

backend/src/main/resources/config/v_1.0/changelog-v_1.0.xml

@@ -8,5 +8,7 @@
   <include file="2024-08-29--01-create-table-okopf-records.xml" relativeToChangelogFile="true"/>
   <include file="2024-09-11--01-create-table-interaction-log.xml" relativeToChangelogFile="true"/>
   <include file="2024-09-18--02-add-shedlock-table.xml" relativeToChangelogFile="true"/>
+  <include file="2025-10-20-create-offset-column.xml" relativeToChangelogFile="true"/>
+
 
 </databaseChangeLog>

frontend/src/ts/ervu/component/grid/StaticColumnInitializer.ts

@@ -14,7 +14,6 @@ import {
   GridValueRendererUtils,
   PinnedType
 } from "@webbpm/base-package";
-import {Moment} from "moment";
 import * as moment from "moment-timezone";
 import {StaticGridColumn} from "../../../generated/ru/micord/ervu/property/grid/StaticGridColumn";
 import {CustomGridColumnFilterUtils} from "./filter/CustomGridColumnFilterUtils";
@@ -72,24 +71,28 @@ export class StaticColumnInitializer {
               if (!cellValue) {
                 return -1;
               }
+              const cellMoment = moment(cellValue, 'DD.MM.YYYY HH:mm:ss (Z)');
 
-              let filterMoment: Moment = moment.utc(filterLocalDateAtMidnight)
+              if (!cellMoment.isValid()) {
-                  .add(-filterLocalDateAtMidnight.getTimezoneOffset(), 'm');
+                return -1;
-              let cellMoment: Moment = DateTimeUtil.parseToMidnightUTC(cellValue);
+              }
+              const cellDateOnly = cellMoment.startOf('day');
+              const filterDateOnly = moment(filterLocalDateAtMidnight).startOf('day');
 
-              if (filterMoment.isSame(cellMoment)) {
+              if (filterDateOnly.isSame(cellDateOnly)) {
                 return 0;
               }
 
-              if (cellMoment.isBefore(filterMoment)) {
+              if (cellDateOnly.isBefore(filterDateOnly)) {
                 return -1;
               }
 
-              if (cellMoment.isAfter(filterMoment)) {
+              if (cellDateOnly.isAfter(filterDateOnly)) {
                 return 1;
               }
             },
             browserDatePicker: true,
+            inRangeInclusive: true
           };
         }
       }

frontend/src/ts/ervu/component/grid/formatter/ClientDateTimeFormatter.ts

@@ -1,38 +0,0 @@
-import {DateTimeUtil, DefaultValueFormatter, GridValueFormatter} from "@webbpm/base-package";
-import {ValueFormatterParams} from "ag-grid-community";
-
-export class ClientDateTimeFormatter extends DefaultValueFormatter implements GridValueFormatter {
-
-  public dateFormat: string = '';
-
-  format(params: ValueFormatterParams): string {
-    if (this.isValueEmpty(params)) {
-      return super.format(params);
-    }
-
-    // don't apply formatter to row with aggregation function
-    if (params.node.isRowPinned()) {
-      return params.value;
-    }
-
-    if (!this.dateFormat) {
-      return ClientDateTimeFormatter.parseForClientTimeZoneAndFormat(params.value, DateTimeUtil.TIMESTAMP_FORMAT);
-    }
-
-    if (!ClientDateTimeFormatter.isValidFormat(this.dateFormat)) {
-      throw new Error('Invalid date format = ' + this.dateFormat);
-    }
-
-    return ClientDateTimeFormatter.parseForClientTimeZoneAndFormat(params.value, this.dateFormat);
-  }
-
-  private static isValidFormat(format: string): boolean {
-    const validCharsRegex = /^[YyMmDdHhSsTZ.:\[\] -]*$/;
-    return format && validCharsRegex.test(format);
-  }
-
-  private static parseForClientTimeZoneAndFormat(value: string, dateFormat: string): string {
-    let timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
-    return DateTimeUtil.parseIsoDateTime(value).tz(timezone).format(dateFormat);
-  }
-}

resources/src/main/resources/business-model/Журнал взаимодействия.page

@@ -1094,10 +1094,7 @@
                         <entry>
                             <key>valueFormatter</key>
                             <value>
-<implRef type="TS">
+<implRef/>
-    <className>ClientDateTimeFormatter</className>
-    <packageName>ervu.component.grid.formatter</packageName>
-</implRef>
                             </value>
                         </entry>
                     </properties>
@@ -1113,10 +1110,7 @@
                         <entry>
                             <key>dataConverter</key>
                             <value>
-<implRef type="JAVA">
+<implRef/>
-    <className>LocalDateTimeConverter</className>
-    <packageName>component.field.dataconvert</packageName>
-</implRef>
                             </value>
                         </entry>
                         <entry>
@@ -1150,7 +1144,7 @@
     <entry>
         <key>type</key>
         <value>
-            <simple>"java.sql.Timestamp"</simple>
+            <simple>"java.time.ZonedDateTime"</simple>
         </value>
     </entry>
 </complex>
@@ -1177,13 +1171,13 @@
                         <entry>
                             <key>width</key>
                             <value>
-<simple>120</simple>
+<simple>300</simple>
                             </value>
                         </entry>
                         <entry>
                             <key>widthFixed</key>
                             <value>
-<simple>null</simple>
+<simple>true</simple>
                             </value>
                         </entry>
                     </properties>

resources/src/main/resources/business-model/Личный кабинет юр лица.page

@@ -221,7 +221,6 @@
                 <componentRootId>3e78f422-3db3-45b9-b531-f4aec5314dab</componentRootId>
                 <name>Группа полей</name>
                 <container>true</container>
-                <expanded>false</expanded>
                 <childrenReordered>false</childrenReordered>
                 <scripts id="46f20297-81d1-4786-bb17-2a78ca6fda6f">
                     <properties>
@@ -1131,24 +1130,13 @@
                     <entry>
                         <key>method</key>
                         <value>
-                            <simple>"setVisible"</simple>
+                            <simple>"reset"</simple>
                         </value>
                     </entry>
                     <entry>
                         <key>value</key>
                         <value>
-                            <complex>
+                            <simple>null</simple>
-<entry>
-    <key>staticValue</key>
-    <value>
-        <implRef type="TS">
-            <className>boolean</className>
-            <packageName></packageName>
-        </implRef>
-        <simple>true</simple>
-    </value>
-</entry>
-                            </complex>
                         </value>
                     </entry>
                 </complex>