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

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

Browse source
This commit is contained in:
etreschenkov 2026-05-21 13:50:37 +03:00
parent 801a35027c
commit ed17efccbd
4 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/SOrders.java
View file

@ -64,6 +64,7 @@ public class SOrders extends BusinessObject {
private BigDecimal qty2;
private BigDecimal value2;
private String exchangeOrderNum;
public Long getOrderNum() {
return orderNum;
@ -384,4 +385,12 @@ public class SOrders extends BusinessObject {
public void setValue2(BigDecimal value2) {
this.value2 = value2;
}
public String getExchangeOrderNum() {
return exchangeOrderNum;
}
public void setExchangeOrderNum(String exchangeOrderNum) {
this.exchangeOrderNum = exchangeOrderNum;
}
}

8
clearing-parent/db-scripts/src/main/resources/db/DDL.sql
View file

@ -5618,7 +5618,7 @@ COMMENT ON COLUMN ORDER_CURRENCY.INITIAL_ORDER_ID is 'Номер исходно
COMMENT ON COLUMN ORDER_CURRENCY.CREATED_AT is 'Создано';
COMMENT ON COLUMN ORDER_CURRENCY.UPDATED_AT is 'Обновлено';
COMMENT ON COLUMN ORDER_CURRENCY.REGISTRY_ID IS 'Идентификатор регистра';
COMMENT ON COLUMN ORDER_CURRENCY.EXCHANGE_ORDER_ID IS 'Биржевой номер заявки курс';
COMMENT ON COLUMN ORDER_CURRENCY.EXCHANGE_ORDER_ID IS 'Биржевой номер заявки';
GRANT ALL PRIVILEGES ON TABLE ORDER_CURRENCY TO clearing;
DROP TABLE IF EXISTS OVERNIGHT_SETTINGS;
@ -5710,7 +5710,8 @@ CREATE TABLE S_ORDERS
SETTLE_DATE DATE,
SETTLE_DATE2 DATE,
QTY2 NUMERIC(72, 18),
VALUE2 NUMERIC(72, 18)
VALUE2 NUMERIC(72, 18),
EXCHANGE_ORDER_NUM VARCHAR(255)
);
COMMENT ON TABLE S_ORDERS IS 'Заявки из Торговой системы';
@ -5757,6 +5758,7 @@ COMMENT ON COLUMN S_ORDERS.SETTLE_DATE is 'Дата расчетов перво
COMMENT ON COLUMN S_ORDERS.SETTLE_DATE2 is 'Дата расчетов второй (дальней) ноги свопа';
COMMENT ON COLUMN S_ORDERS.QTY2 is 'Количество второй части свопа';
COMMENT ON COLUMN S_ORDERS.VALUE2 is 'Объем второй части свопа';
COMMENT ON COLUMN S_ORDERS.EXCHANGE_ORDER_NUM IS 'Биржевой номер заявки';
GRANT ALL PRIVILEGES ON TABLE S_ORDERS TO clearing;
CREATE TABLE ORDER_STATUS_DICTIONARY(ID bigint PRIMARY KEY, CODE varchar(4), NAME varchar(50));
@ -5844,7 +5846,7 @@ COMMENT ON COLUMN ORDER_CURRENCY_HISTORY.COMMENT is 'Комментарий';
COMMENT ON COLUMN ORDER_CURRENCY_HISTORY.INITIAL_ORDER_ID is 'Номер исходной заявки';
COMMENT ON COLUMN ORDER_CURRENCY_HISTORY.CREATED_AT is 'Создано';
COMMENT ON COLUMN ORDER_CURRENCY_HISTORY.UPDATED_AT is 'Обновлено';
COMMENT ON COLUMN ORDER_CURRENCY_HISTORY.EXCHANGE_ORDER_ID IS 'Биржевой номер заявки курс';
COMMENT ON COLUMN ORDER_CURRENCY_HISTORY.EXCHANGE_ORDER_ID IS 'Биржевой номер заявки';
GRANT ALL PRIVILEGES ON TABLE ORDER_CURRENCY_HISTORY TO clearing;
/* views */

9
clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.26.sql
View file

@ -2,10 +2,13 @@
ALTER TABLE ORDER_CURRENCY ADD COLUMN IF NOT EXISTS EXCHANGE_ORDER_ID BIGINT;
COMMENT ON COLUMN ORDER_CURRENCY.EXCHANGE_ORDER_ID IS 'Биржевой номер заявки курс';
COMMENT ON COLUMN ORDER_CURRENCY.EXCHANGE_ORDER_ID IS 'Биржевой номер заявки';
ALTER TABLE ORDER_CURRENCY_HISTORY ADD COLUMN IF NOT EXISTS EXCHANGE_ORDER_ID BIGINT;
COMMENT ON COLUMN ORDER_CURRENCY_HISTORY.EXCHANGE_ORDER_ID IS 'Биржевой номер заявки курс';
COMMENT ON COLUMN ORDER_CURRENCY_HISTORY.EXCHANGE_ORDER_ID IS 'Биржевой номер заявки';
ALTER TABLE S_ORDERS ADD COLUMN IF NOT EXISTS EXCHANGE_ORDER_NUM VARCHAR(255);
COMMENT ON COLUMN S_ORDERS.EXCHANGE_ORDER_NUM IS 'Биржевой номер заявки';
INSERT INTO DB_VERSION(ID, VERSION) values (1, '3.25') ON CONFLICT (ID) DO UPDATE SET VERSION = EXCLUDED.VERSION;
INSERT INTO DB_VERSION(ID, VERSION) values (1, '3.26') ON CONFLICT (ID) DO UPDATE SET VERSION = EXCLUDED.VERSION;

7
clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/SOrdersMapStore.java
View file

@ -71,7 +71,8 @@ public class SOrdersMapStore extends TemplateMapStore<SOrders> {
"SETTLE_DATE",
"SETTLE_DATE2",
"QTY2",
"VALUE2"
"VALUE2",
"EXCHANGE_ORDER_NUM"
};
}
@ -127,6 +128,7 @@ public class SOrdersMapStore extends TemplateMapStore<SOrders> {
object.setSettleDate2(getLocalDateFromSqlDate(resultSet, "SETTLE_DATE2"));
object.setQty2(resultSet.getBigDecimal("QTY2"));
object.setValue2(resultSet.getBigDecimal("VALUE2"));
object.setExchangeOrderNum(resultSet.getString("EXCHANGE_ORDER_NUM"));
return object;
}
@ -176,7 +178,8 @@ public class SOrdersMapStore extends TemplateMapStore<SOrders> {
TimeUtil.toDateFromLocalDate(object.getSettleDate()),
TimeUtil.toDateFromLocalDate(object.getSettleDate2()),
object.getQty2(),
object.getValue2()
object.getValue2(),
object.getExchangeOrderNum()
};
}