diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilderCommon.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilderCommon.java index fb40d6946..7b233dbc8 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilderCommon.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilderCommon.java @@ -17,7 +17,6 @@ import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import java.util.Map; public abstract class ExecutedDealReportBuilderCommon
extends CSVReportBuilder
{ protected final DateTimeFormatter fileNameDateTimeFormatter = DateTimeFormatter.ofPattern("yyMMddHHmmssSSS"); @@ -72,23 +71,13 @@ public abstract class ExecutedDealReportBuilderCommon
extends CSVReportBuilde
}
if (!WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus())) continue;
- STrades sTrade = null;
- if (executionFond.getSide() != null && executionFond.getExchangeExecutionId() != null) {
- sTrade = sTradesImdg.getFirstObjectByFieldValues(
- Map.of(
- "tradeNum", executionFond.getExchangeExecutionId(),
- "operation", executionFond.getSide()
- )
- );
- }
ExecutedDealReport executedDealReport = new ExecutedDealReport();
-
executedDealReport.setSecurityId(executionFond.getSecuritySymbol());
executedDealReport.setTradeNo(executionFond.getExchangeExecutionId());
executedDealReport.setTradeDate(executionFond.getTradingDate());
executedDealReport.setTradeTime(executionFond.getExchangeExecutionTime());
executedDealReport.setSettleDate(executionFond.getSettlementDate());
- executedDealReport.setSettleCode(sTrade != null ? sTrade.getSettleCode() : "");
+ executedDealReport.setSettleCode(executionFond.getSettlementCode());
executedDealReport.setQuantity(executionFond.getQuantity());
executedDealReport.setValue(executionFond.getSettlementAmount());
if (executionFond.getSettlementAmount() != null && executionFond.getQuantity() != null)
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/UnfulfilledDealReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/UnfulfilledDealReportBuilder.java
index d97e80dc8..ff8937942 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/UnfulfilledDealReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/UnfulfilledDealReportBuilder.java
@@ -21,7 +21,6 @@ import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import java.util.Map;
@Component
public class UnfulfilledDealReportBuilder extends CSVReportBuilder