From bbd133093fdd4fb92391a8434d5f3e28b8fb8501 Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Tue, 6 Aug 2024 13:32:01 +0300
Subject: [PATCH] imdg http://jira.mfd.msk:8088/browse/CLS-728

---
 .../imdg/businessobject/ExecutionCurrencyMapStore.java       | 5 +++++
 .../spcex/clearing/imdg/businessobject/RegistryMapStore.java | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/ExecutionCurrencyMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/ExecutionCurrencyMapStore.java
index 077c2084c..70e3528bc 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/ExecutionCurrencyMapStore.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/ExecutionCurrencyMapStore.java
@@ -31,6 +31,11 @@ public class ExecutionCurrencyMapStore extends TemplateMapStore<ExecutionCurrenc
         return "EXECUTION_CURRENCY";
     }
 
+    @Override
+    public Iterable<Long> loadAllKeys() {
+        return defaultLoadAllKeysOnTodayByField("TRADING_DATE", false);
+    }
+
     @Override
     public String[] getFields() {
         return new String[]{
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/RegistryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/RegistryMapStore.java
index e3a66679e..b427fcd31 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/RegistryMapStore.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/RegistryMapStore.java
@@ -52,8 +52,8 @@ public class RegistryMapStore extends TemplateMapStore<Registry> {
         LocalDate today = LocalDate.now();
         log.debug("loadAllKeys from {} with condition and today {}", getTableName(), today);
         List<Long> keys;
-        String sql = "select id from " + getTableName() + " WHERE registry_status<>'OK' or registry_status='OK' " +
-                "and (clearing_date = ? OR updated_at::date = ?)";
+        String sql = "select id from " + getTableName() + " WHERE (registry_status<>'OK' and registry_status<>'CLRD') " +
+                " or ((registry_status='ОК' or registry_status='CLRD') and (clearing_date = ? OR updated_at::date = ?))";
         try {
             keys = jdbcTemplate.query(sql,
                     (resultSet, i) -> resultSet.getLong("id"),