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

http://jira.mfd.msk:8088/browse/CLS-946

Browse source
This commit is contained in:
Aleksey Kulikov 2026-03-27 14:03:52 +03:00
parent 96611c9803
commit 380ea1077e
1 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepCashRegistersReportBuilder.java
View file

@ -20,6 +20,7 @@ import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.reports.builders.CSVReportBuilder; import ru.spcex.clearing.reports.builders.CSVReportBuilder;
import ru.spcex.clearing.reports.builders.EmptyParams; import ru.spcex.clearing.reports.builders.EmptyParams;
import ru.spcex.clearing.reports.builders.bean.KSRepCashRegistersReport; import ru.spcex.clearing.reports.builders.bean.KSRepCashRegistersReport;
import ru.spcex.platform.enumeration.AccountStatus;
import ru.spcex.platform.enumeration.AccountType; import ru.spcex.platform.enumeration.AccountType;
import ru.spcex.platform.enumeration.ClearingCategory; import ru.spcex.platform.enumeration.ClearingCategory;
import ru.spcex.platform.enumeration.RegistryStatus; import ru.spcex.platform.enumeration.RegistryStatus;
@ -110,6 +111,22 @@ public class KSRepCashRegistersReportBuilder extends CSVReportBuilder<EmptyParam
} }
if (!WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus())) continue; if (!WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus())) continue;
if (registry.getAccountId() != null && registry.getBalance().compareTo(BigDecimal.ZERO) == 0) {
Account account = accountImdg.getSingleObjectByID(registry.getAccountId());
if (account != null) {
AccountStatus accountStatus = IEnumKey.getEnumByKey(AccountStatus.class, account.getStatus());
if (accountStatus == AccountStatus.BLOCKED || accountStatus == AccountStatus.CLOSE) {
log.debug(
"For registry id = {} balance = 0 and account with id = {} status = {}",
registry.getId(),
account.getId(),
accountStatus
);
continue;
}
}
}
String account = null; String account = null;
AccountType accountType = IEnumKey.getEnumByKey(AccountType.class, registry.getAccountType()); AccountType accountType = IEnumKey.getEnumByKey(AccountType.class, registry.getAccountType());
if (accountType == AccountType.Clrn) { if (accountType == AccountType.Clrn) {