Commit graph

444 commits

Author SHA1 Message Date
psemenkov
08c1789d36 Fixing loading MoneyMarketSecurity in MoneyMarketSecurityMapStore 2022-12-07 15:49:11 +03:00
ialbert
a5a3136ed3 Merge remote-tracking branch 'origin/dev' into dev 2022-12-07 14:41:32 +03:00
ialbert
e8af75ee78 http://jira.mfd.msk:8088/browse/CLS-80 2022-12-07 14:41:20 +03:00
akulikov
92313b9b1e report-service: Обновил имеющиеся таблицы по ТЗ, обновил само ТЗ 2022-12-07 14:29:40 +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
194f14a2d8 Merge remote-tracking branch 'origin/dev' into dev 2022-12-07 12:36:30 +03:00
psemenkov
4a9708b205 Fixing store and loading companyInfo in CompanyMapStore 2022-12-07 12:36:11 +03:00
AKurakin
9d7e619954 dictionary поправил комментарии 2022-12-07 12:07:04 +03:00
psemenkov
04905c4e0a PlannerAllToday и planner_all_today изменились названия полей source -> parent, origId -> parentId. Затронуло SchedulerAllTodayBackendGetAll, PlannerAllTodayMapStore, PlannerAllToday. 2022-12-07 11:55:06 +03:00
psemenkov
5ee3129316 fixing MoneyMarketSecurityMapStore 2022-12-07 11:31:09 +03:00
psemenkov
5a0d2c2cb5 Merge remote-tracking branch 'origin/dev' into dev 2022-12-07 11:18:32 +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
ialbert
902290f5f8 Merge remote-tracking branch 'origin/dev' into dev 2022-12-06 18:35:45 +03:00
ialbert
cf7bc22999 http://jira.mfd.msk:8088/browse/CLS-191 2022-12-06 18:35:32 +03:00
aalehin
9f04ebc688 http://jira.mfd.msk:8088/browse/CLS-63
---
fix up
2022-12-06 18:31:24 +03:00
psemenkov
8e191870b2 Merge remote-tracking branch 'origin/dev' into dev 2022-12-06 17:40:02 +03:00
psemenkov
c1e66ed914 rename feald TradingStatus -> DayStatus for ClearingCalendar and other entities 2022-12-06 17:36:17 +03:00
psemenkov
08dd60e18e delete feald account from BankAccount and other entities 2022-12-06 17:13:17 +03:00
ialbert
b8a218b0c7 Merge remote-tracking branch 'origin/dev' into dev 2022-12-06 16:44:09 +03:00
ialbert
56f027c313 http://jira.mfd.msk:8088/browse/CLS-75 added companyInfo GET method 2022-12-06 16:43:54 +03:00
psemenkov
f70d36d7bd Merge remote-tracking branch 'origin/dev' into dev 2022-12-06 16:29:40 +03:00
psemenkov
45c3fb745a delete feald account from BankAccount and other entity 2022-12-06 16:29:25 +03:00
ialbert
8633081e6d KeyRateService log fix 2022-12-06 16:19:23 +03:00
ialbert
59942baf9b http://jira.mfd.msk:8088/browse/CLS-74 bug fix 2022-12-06 15:51:15 +03:00
ialbert
d8c0401a59 Merge remote-tracking branch 'origin/dev' into dev 2022-12-06 15:24:40 +03:00
ialbert
abf51317ca http://jira.mfd.msk:8088/browse/CLS-130 добавил обновление PaymentInstruction.transactionStatus по sdf04 2022-12-06 15:24:30 +03:00
aalehin
2ec7c0fdc1 http://jira.mfd.msk:8088/browse/CLS-63
---
...
2022-12-06 13:45:40 +03:00
ialbert
0b24bae280 http://jira.mfd.msk:8088/browse/CLS-191 2022-12-05 18:35:25 +03:00
ialbert
c8527293b7 Merge branch 'master_meta_update' into dev
# Conflicts:
#	clearing-parent/backend-api/src/main/resources/meta/meta.xml
2022-12-02 14:50:34 +03:00
ialbert
aa23776d28 http://jira.mfd.msk:8088/browse/CLS-80 2022-12-02 14:01:33 +03:00
ialbert
874eaaa8ce CookieSameSite bug fix 2022-12-02 13:57:26 +03:00
ialbert
59110cdff8 http://jira.mfd.msk:8088/browse/CLS-80 2022-12-02 13:56:58 +03:00
ialbert
11ed1ff66b http://jira.mfd.msk:8088/browse/CLS-130 sdf03 sdf11 2022-12-01 16:22:08 +03:00
aalehin
6d14c43994 scheduler set up 2022-12-01 12:28:07 +03:00
ialbert
ca4483fe6f Merge branch 'CLS-130' into dev 2022-12-01 11:16:37 +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
aalehin
49729c4d08 http://jira.mfd.msk:8088/browse/CLS-51
---
some fix up
2022-11-29 19:10:53 +03:00
ialbert
d5a7154a25 Merge remote-tracking branch 'origin/dev' into dev 2022-11-29 16:51:06 +03:00
ialbert
e8bc165537 http://jira.mfd.msk:8088/browse/CLS-97 2022-11-29 16:50:55 +03:00
aalehin
86e9b724ac http://jira.mfd.msk:8088/browse/CLS-51
---
SchedulerAllTodayService fix up
2022-11-29 16:36:12 +03:00
aalehin
d7d098990b http://jira.mfd.msk:8088/browse/CLS-51
---
1) application.properties
2) logback.xml
2022-11-29 10:56:23 +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
aalehin
58d605d7c1 http://jira.mfd.msk:8088/browse/CLS-63
---
fix-up of roles
2022-11-28 14:17:26 +03:00
ialbert
07443234e1 http://jira.mfd.msk:8088/browse/CLS-73 выгрузка sdf10 добавил заготовку для журналирования 2022-11-25 20:18:38 +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
59e748b18a http://jira.mfd.msk:8088/browse/CLS-98 2022-11-25 12:32:15 +03:00
ialbert
c720df9741 http://jira.mfd.msk:8088/browse/CLS-97 2022-11-25 12:31:34 +03:00
ialbert
45e163d1b7 meta update 2022-11-22 12:06:45 +03:00