Commit graph

128 commits

Author SHA1 Message Date
AKurakin
6a3433c26f http://jira.mfd.msk:8088/browse/CLS-25 http://jira.mfd.msk:8088/browse/CLS-26 рефакторинг коллекторов 2022-12-26 15:55:53 +03:00
akulikov
eed33ce35b insert values in docx (raw) 2022-12-26 14:38:31 +03:00
akulikov
a396d54c7b Merge branch 'dev' into report_25_26_29 2022-12-26 13:50:43 +03:00
ialbert
095b2d86d1 MoneyMarketSecurityUpdateRequest, CommonDeleteRequest -> WithId
Planner, PlannerTemplate fill created/updated
2022-12-26 13:14:04 +03:00
ialbert
e278d65325 поправил экранирование JSON для UserSettings 2022-12-23 15:40:59 +03:00
ialbert
7a057e1ebf UserSettings update fix 2022-12-23 13:14:12 +03:00
akulikov
ddb8d47f3c Merge branch 'dev' into report_25_26_29
# Conflicts:
#	platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/Market.java
2022-12-23 12:19:34 +03:00
ialbert
64d889566d http://jira.mfd.msk:8088/browse/CLS-198 2022-12-22 15:04:39 +03:00
ialbert
9b0acaeb7a http://jira.mfd.msk:8088/browse/CLS-198 2022-12-22 11:44:56 +03:00
ialbert
dd117b09b1 balance-service fix 2022-12-21 12:33:38 +03:00
ialbert
fd7ee9a989 http://jira.mfd.msk:8088/browse/CLS-16 2022-12-20 17:57:00 +03:00
AKurakin
c4734252df http://jira.mfd.msk:8088/browse/CLS-25 http://jira.mfd.msk:8088/browse/CLS-26 начало http://jira.mfd.msk:8088/browse/CLS-29 - написал выборку данных для формирования частей отчёта. TO DO 2022-12-20 15:04:24 +03:00
AKurakin
b67179ec8b http://jira.mfd.msk:8088/browse/CLS-25 добавил класс LiabilitiesClaimsAssets. TODO заполнение по CLS-25 2022-12-16 19:55:44 +03:00
psemenkov
8d2881c3eb Merge remote-tracking branch 'origin/dev' into dev 2022-12-14 14:24:23 +03:00
psemenkov
59e2b7a3b8 Fixing AccountBalanceServiceTest. And ImdgTransactionalHazelcast.getSingleObjectByFieldValues 2022-12-14 14:24:12 +03:00
aalehin
74cb4d75c0 http://jira.mfd.msk:8088/browse/CLS-37
---
рефактор TaskManager
2022-12-14 14:12:50 +03:00
ialbert
c773017570 http://jira.mfd.msk:8088/browse/CLS-178 2022-12-14 12:40:09 +03:00
ialbert
a15fae4885 http://jira.mfd.msk:8088/browse/CLS-175 2022-12-14 11:46:35 +03:00
ialbert
d7e570fa39 http://jira.mfd.msk:8088/browse/CLS-205 2022-12-13 15:15:30 +03:00
ialbert
33193b9746 http://jira.mfd.msk:8088/browse/CLS-42 2022-12-13 14:22:47 +03:00
ialbert
d28b12f68e http://jira.mfd.msk:8088/browse/CLS-36 bug fix 2022-12-12 17:08:35 +03:00
ialbert
e0dcd24604 http://jira.mfd.msk:8088/browse/CLS-69 2022-12-09 14:35:31 +03:00
ialbert
6a1951db28 http://jira.mfd.msk:8088/browse/CLS-69 2022-12-08 17:06:38 +03:00
ialbert
2de7c9876e http://jira.mfd.msk:8088/browse/CLS-100 2022-12-07 17:37:07 +03:00
ialbert
c760bd4d20 Merge branch 'CLS-80-backend-scheduler' into dev
# Conflicts:
#	clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/PlanerAllTodayController.java
2022-12-07 13:07:04 +03:00
psemenkov
53b0487e1f Изменились MoneyMarketSecurityNewRequest, MoneyMarketSecurityServiceDisabled, MoneyMarketSecurityFactory, MoneyMarketSecurityNewAction, MoneyMarketSecurityUpdateAction, MoneyMarketSecurityUpdateRequest в этих классах изменил Long nominalCurrencyId на String nominalCurrency (в мета нет nominalCurrencyId но есть nominalCurrency ) сюда не стал добавлять termType т.к. его нет в мета post и put.
MoneyMarketSecurityBackendGetFields, MoneyMarketSecurity, MoneyMarketSecurityBackendGetAllOld,  MoneyMarketSecurityMapStore поменял Long на String nominalCurrency и добавил termType
2022-12-07 11:18:07 +03:00
psemenkov
c1e66ed914 rename feald TradingStatus -> DayStatus for ClearingCalendar and other entities 2022-12-06 17:36:17 +03:00
ialbert
abf51317ca http://jira.mfd.msk:8088/browse/CLS-130 добавил обновление PaymentInstruction.transactionStatus по sdf04 2022-12-06 15:24:30 +03:00
ialbert
0b24bae280 http://jira.mfd.msk:8088/browse/CLS-191 2022-12-05 18:35:25 +03:00
ialbert
59110cdff8 http://jira.mfd.msk:8088/browse/CLS-80 2022-12-02 13:56:58 +03:00
aalehin
6d14c43994 scheduler set up 2022-12-01 12:28:07 +03:00
ialbert
fa0b7ba787 http://jira.mfd.msk:8088/browse/CLS-130 sdf03 sdf11 2022-12-01 11:15:46 +03:00
ialbert
ce767ceae1 http://jira.mfd.msk:8088/browse/CLS-130 clearing-service 2022-11-29 19:21:56 +03:00
ialbert
30ec2ceeec http://jira.mfd.msk:8088/browse/CLS-51
---
scheduler service (addition of scheduler)
2022-11-28 21:36:17 +03:00
ialbert
d25e8d9f4f http://jira.mfd.msk:8088/browse/CLS-73 выгрузка sdf10 добавил заготовку для журналирования 2022-11-25 19:19:56 +03:00
ialbert
e463d83084 http://jira.mfd.msk:8088/browse/CLS-99 dbf-import загрузка Sdf04 2022-11-25 12:58:10 +03:00
ialbert
15f42c96b8 http://jira.mfd.msk:8088/browse/CLS-74 2022-11-01 16:31:48 +03:00
ialbert
7cb1101b52 http://jira.mfd.msk:8088/browse/CLS-74 validation 2022-11-01 14:53:21 +03:00
etreshenkov
da14e08665 add sdf16 executor 2022-11-01 12:31:03 +03:00
etreschenkov
0472cbc85e some refactoring balance-service 2022-10-31 18:43:22 +03:00
ialbert
08315f7518 http://jira.mfd.msk:8088/browse/CLS-186 2022-10-31 11:35:02 +03:00
ialbert
3193e7014f http://jira.mfd.msk:8088/browse/CLS-101
http://jira.mfd.msk:8088/browse/CLS-70
2022-10-28 13:30:10 +03:00
ialbert
f2b28d0e3c http://jira.mfd.msk:8088/browse/CLS-70
http://jira.mfd.msk:8088/browse/CLS-101
2022-10-28 09:47:14 +03:00
etreshenkov
4390380893 Merge remote-tracking branch 'origin/psemenkov' into dev
# Conflicts:
#	clearing-parent/backend-api/pom.xml
2022-10-27 16:37:15 +03:00
ialbert
814c14d3b9 ClearingMemberCategory new endpoint 2022-10-21 19:33:45 +03:00
ialbert
19d013c096 imdg connect log fix 2022-10-21 12:26:20 +03:00
ialbert
5d08d3e438 removed unused class, log fix 2022-10-21 12:25:28 +03:00
ialbert
216d28767d http://jira.mfd.msk:8088/browse/CLS-11 2022-10-19 16:46:30 +03:00
ialbert
b7cbcbbe54 fix dates 2022-10-14 14:45:54 +03:00
ialbert
a73845cfd9 http://jira.mfd.msk:8088/browse/CLS-131 2022-10-14 13:14:39 +03:00