diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/MoneyMarketSecurityMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/MoneyMarketSecurityMapStore.java index fc7a707d5..6da29c61a 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/MoneyMarketSecurityMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/MoneyMarketSecurityMapStore.java @@ -80,9 +80,16 @@ public class MoneyMarketSecurityMapStore extends TemplateMapStore resouts = jdbcTemplate.query( "SELECT * FROM SECURITY WHERE id = ?", new Object[]{securityId}, (rs, rowNum) -> { + object.setCreated(getInstantFromTimestamp(rs, "CREATED_AT")); + object.setUpdated(getInstantFromTimestamp(rs, "UPDATED_AT")); object.setInstrumentType(rs.getObject("INSTRUMENT_TYPE", String.class)); + object.setIssuerId(rs.getObject("issuer_id", Long.class)); + object.setShortName(rs.getObject("short_name", String.class)); object.setFullName(rs.getObject("FULL_NAME", String.class)); + object.setShortNameEng(rs.getObject("short_name_eng", String.class)); + object.setFullNameEng(rs.getObject("full_name_eng", String.class)); object.setSecuritySymbol(rs.getObject("SECURITY_SYMBOL", String.class)); + object.setWorkflowStatus(rs.getObject("workflow_status", String.class)); return object; } ); diff --git a/clearing-parent/imdg/src/test/java/ru/spcex/clearing/imdg/AllMapStoreTest.java b/clearing-parent/imdg/src/test/java/ru/spcex/clearing/imdg/AllMapStoreTest.java index 8d2a0f323..d67cd2448 100644 --- a/clearing-parent/imdg/src/test/java/ru/spcex/clearing/imdg/AllMapStoreTest.java +++ b/clearing-parent/imdg/src/test/java/ru/spcex/clearing/imdg/AllMapStoreTest.java @@ -121,8 +121,8 @@ public class AllMapStoreTest { ResultSet rs = md.getTables(null, "clearing_tester", "%", new String[]{"TABLE"}); while (rs.next()) { String tableName = rs.getString("TABLE_NAME"); - //сущности для company_info и company_info_history включены соответственно в company и company_history - if (tableName.equals("company_info") || tableName.equals("company_info_history")) { + //сущности для company_info и company_info_history включены соответственно в company и company_history, security используется с money_market_security для хранения MoneyMarketSecurity + if (tableName.equalsIgnoreCase("company_info") || tableName.equalsIgnoreCase("company_info_history") || tableName.equalsIgnoreCase("security")) { continue; } nameTables.add(tableName);