treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

.

Browse source
This commit is contained in:
AKurakin 2023-05-27 15:51:58 +03:00
parent 18f17923f9
commit 5e5133b580
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/util/services/IMDGMessageResolver.java
View file

@ -30,7 +30,7 @@ public class IMDGMessageResolver implements IMessageResolver {
try { try {
ErrorCodeDictionary errorDictionary = errorCodeDictionaryIMDG.getSingleObjectByID(errMsg.getSubject().getId()); ErrorCodeDictionary errorDictionary = errorCodeDictionaryIMDG.getSingleObjectByID(errMsg.getSubject().getId());
if (errorDictionary == null) { if (errorDictionary == null) {
log.warn("ERROR_CODE_DICTIONARY not found fo id={}", errMsg.getSubject().getId()); log.warn("ERROR_CODE_DICTIONARY not found for id={}", errMsg.getSubject().getId());
return simplFormatter.get(); return simplFormatter.get();
} }
String textTemplate = errorDictionary.getName(); String textTemplate = errorDictionary.getName();

6
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/LiabilitiesClaimsReportBuilder.java
View file

@ -104,6 +104,10 @@ public abstract class LiabilitiesClaimsReportBuilder<P> extends CSVReportBuilder
execution.getTradingClearingRegistryId() execution.getTradingClearingRegistryId()
); );
if (registry == null) {
log.warn("registry not found for companyId={}", execution.getCompanyId());
}
String id = String.valueOf(execution.getId()); String id = String.valueOf(execution.getId());
String docDate = dateFormatter.format(nowDate); String docDate = dateFormatter.format(nowDate);
String docTime = timeFormatter.format(nowTime); String docTime = timeFormatter.format(nowTime);
@ -114,7 +118,7 @@ public abstract class LiabilitiesClaimsReportBuilder<P> extends CSVReportBuilder
String sessionId = String.valueOf(execution.getSessionId()); String sessionId = String.valueOf(execution.getSessionId());
String clearingDate = dateFormatter.format(execution.getClearingDate()); String clearingDate = dateFormatter.format(execution.getClearingDate());
String clearingTime = dateFormatter.format(execution.getClearingDate()); String clearingTime = dateFormatter.format(execution.getClearingDate());
String trdAccId = registry.getTradingClearingRegistry(); String trdAccId = registry == null? null : registry.getTradingClearingRegistry();
String account = String.valueOf(tradingClearingRegistry.getMoneyAccountId()); String account = String.valueOf(tradingClearingRegistry.getMoneyAccountId());
String depoAccount = String.valueOf(tradingClearingRegistry.getDepoAccountId()); String depoAccount = String.valueOf(tradingClearingRegistry.getDepoAccountId());
String currency = execution.getSettlementCurrency(); String currency = execution.getSettlementCurrency();