From 26d6c68734890f43813daf41d75a0d1a6a4f1891 Mon Sep 17 00:00:00 2001
From: ialbert <ialbert@mfd.ru>
Date: Thu, 4 Jul 2024 18:23:04 +0300
Subject: [PATCH] UNIT session DM*V

---
 .../registry/PaymentStateMarkService.java     | 28 +++++++++++--------
 .../impl/FormingPaymentInstructionAssets.java |  2 +-
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/registry/PaymentStateMarkService.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/registry/PaymentStateMarkService.java
index 85e3dd690..60b60b7e5 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/registry/PaymentStateMarkService.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/registry/PaymentStateMarkService.java
@@ -1,5 +1,12 @@
 package ru.spcex.clearing.service.registry;
 
+import java.math.BigDecimal;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,24 +17,20 @@ import ru.clearing.classes.statics.data.registry.Registry;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.service.AssetTrio;
 import ru.spcex.clearing.session.stage.util.RegistryUtil;
-import ru.spcex.platform.enumeration.*;
+import ru.spcex.platform.enumeration.CompanyRole;
+import ru.spcex.platform.enumeration.RegistryDesignation;
+import ru.spcex.platform.enumeration.RegistryStatus;
+import static ru.spcex.platform.enumeration.RegistryTradingParams.CM_T;
+import static ru.spcex.platform.enumeration.RegistryTradingParams.LM_T;
+import ru.spcex.platform.enumeration.RegistryUnit;
+import ru.spcex.platform.enumeration.Section;
+import ru.spcex.platform.enumeration.WorkflowStatus;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.ImdgProvider;
 import ru.spcex.platform.imdg.api.predicate.ImdgPredicate;
 import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
 import ru.spcex.platform.imdg.api.predicate.specific.RegistryCodeSqlBuilder;
 
-import java.math.BigDecimal;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import static ru.spcex.platform.enumeration.RegistryTradingParams.CM_T;
-import static ru.spcex.platform.enumeration.RegistryTradingParams.LM_T;
-
 @Component
 public class PaymentStateMarkService {
     private final Logger log = LoggerFactory.getLogger(getClass());
@@ -49,6 +52,7 @@ public class PaymentStateMarkService {
         ImdgPredicate prdct = pb.and(
                 pb.sql(RegistryCodeSqlBuilder.getInstance(CM_T, LM_T).build()),
                 pb.equals("sessionId", sessionId),
+                pb.equals("section", Section.MKR.getKey()),
                 pb.equals("registryStatus", RegistryStatus.OK.getKey())
         );
         Collection<Registry> claimsAndLiabilities = rgsImdg.getCollectionObjectsByPredicate(prdct);
diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionAssets.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionAssets.java
index 34e6a849d..efa48f3cd 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionAssets.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionAssets.java
@@ -163,7 +163,7 @@ public class FormingPaymentInstructionAssets implements ISessionStage {
 
     private StageResult<?> formingPaymentInstructions(FormingPaymentInstructionPayload payload) {
         Long sessionId = payload.getSessionId();
-        if (SessionType.FINL.equals(sessionType) || SessionType.MEDM.equals(sessionType)) {
+        if (SessionType.FINL.equals(sessionType) || SessionType.MEDM.equals(sessionType) || SessionType.UNIT.equals(sessionType)) {
             dmvSrv.createDmv(sessionId);
         }
         Collection<Registry> AMBregistries = selectAMBRegistries(sessionId);