Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
I
isc-funds
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
isc-v3.1-tmp
isc-funds
Commits
73359377
Commit
73359377
authored
Sep 30, 2024
by
wangweidong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fxd/ftd修改
parent
9167ab51
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
155 additions
and
98 deletions
+155
-98
FtdselMapper.xml
isc-funds-boot/src/main/resources/mapper/FtdselMapper.xml
+14
-3
FxdselMapper.xml
isc-funds-boot/src/main/resources/mapper/FxdselMapper.xml
+19
-3
Ftd.java
...entity/src/main/java/com/brilliance/isc/funds/bo/Ftd.java
+2
-0
Fxd.java
...entity/src/main/java/com/brilliance/isc/funds/bo/Fxd.java
+24
-37
FtdVo.java
...tity/src/main/java/com/brilliance/isc/funds/vo/FtdVo.java
+56
-35
FxdVo.java
...tity/src/main/java/com/brilliance/isc/funds/vo/FxdVo.java
+40
-20
No files found.
isc-funds-boot/src/main/resources/mapper/FtdselMapper.xml
View file @
73359377
...
...
@@ -24,8 +24,12 @@
<result
property=
"gzno"
column=
"gzno"
jdbcType=
"VARCHAR"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
inr,ownref,nam,opndat,valdat,cnfdat,matdat,clsdat,ownusr,ver,branchinr,bchkeyinr,fttyp,rat,cntfra,usr,bnktyp,etyextkey,gzno
</sql>
<select
id=
"query"
resultMap=
"BaseResultMap"
>
select
ftd.OWNREF,ftd.NAM,ftd.OPNDAT
select
<include
refid=
"Base_Column_List"
/>
from ftd where
<if
test=
" opndatfrom != null "
>
ftd.OPNDAT>=#{opndatfrom,jdbcType=DATE}
...
...
@@ -39,12 +43,19 @@
<if
test=
" nam != null and nam != ''"
>
AND ftd.NAM=#{ nam,jdbcType=VARCHAR}
</if>
<if
test=
" searol != null and searol != ''"
>
AND ftd.USR=#{ searol,jdbcType=VARCHAR}
<if
test=
" ownusr != null and ownusr != ''"
>
AND ftd.ownusr=#{ ownusr,jdbcType=VARCHAR}
</if>
<if
test=
" usr != null and usr != ''"
>
AND ftd.usr=#{ usr,jdbcType=VARCHAR}
</if>
<if
test=
" fttyp != null and fttyp != ''"
>
AND ftd.FTTYP=#{ fttyp,jdbcType=VARCHAR}
</if>
<if
test=
" gzno != null and gzno != ''"
>
AND ftd.gzno=#{ gzno,jdbcType=VARCHAR}
</if>
...
...
isc-funds-boot/src/main/resources/mapper/FxdselMapper.xml
View file @
73359377
...
...
@@ -37,8 +37,12 @@
<result
property=
"etyextkey"
column=
"etyextkey"
jdbcType=
"VARCHAR"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
inr,ownref,nam,opndat,ownusr,fxtyp,rat,midrat,quoref,fudref,valdat,cnfdat,setdat,setdatfrm,setdatto,clsdat,ver,branchinr,bchkeyinr,trdint,trdout,trnman,acc,acc2,usr,dsp,dsp2,cshpct,rat1,accmng,hdbch,etyextkey
</sql>
<select
id=
"query"
resultMap=
"BaseResultMap"
>
select
fxd.OWNREF,fxd.NAM,fxd.OPNDAT
select
<include
refid=
"Base_Column_List"
/>
from fxd where
<if
test=
" opndatfrom != null "
>
fxd.OPNDAT>=#{opndatfrom,jdbcType=DATE}
...
...
@@ -52,12 +56,24 @@
<if
test=
" nam != null and nam != ''"
>
AND fxd.NAM=#{ nam,jdbcType=VARCHAR}
</if>
<if
test=
" searol != null and searol != ''"
>
AND fxd.USR=#{ searol,jdbcType=VARCHAR}
<if
test=
" ownusr != null and ownusr != ''"
>
AND fxd.OWNUSR=#{ ownusr,jdbcType=VARCHAR}
</if>
<if
test=
" usr != null and usr != ''"
>
AND fxd.USR=#{ usr,jdbcType=VARCHAR}
</if>
<if
test=
" accmng != null and accmng != ''"
>
AND fxd.accmng=#{ accmng,jdbcType=VARCHAR}
</if>
<if
test=
" fxtyp != null and fxtyp != ''"
>
AND fxd.FXTYP=#{ fxtyp,jdbcType=VARCHAR}
</if>
<if
test=
" acc != null and acc != ''"
>
AND fxd.acc=#{ acc,jdbcType=VARCHAR}
</if>
<if
test=
" acc2 != null and acc2 != ''"
>
AND fxd.acc2=#{ acc2,jdbcType=VARCHAR}
</if>
...
...
isc-funds-entity/src/main/java/com/brilliance/isc/funds/bo/Ftd.java
View file @
73359377
...
...
@@ -17,6 +17,8 @@ import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
/**
* TABLE:ftd:FTD - Funds Transfer Data
*
*
*/
@JsonIgnoreProperties
(
ignoreUnknown
=
true
)
@Getter
...
...
isc-funds-entity/src/main/java/com/brilliance/isc/funds/bo/Fxd.java
View file @
73359377
...
...
@@ -15,6 +15,30 @@ import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
/**
* TABLE:fxd:
*
*
* 1、 Reference:这笔结售汇业务的编号。在选择了售汇币种后可以通过Get Ref获取,或者在交易存盘时系统自动获取。
* 2、Name:这笔结售汇业务的简要说明,系统根据交易要素自动赋值。
* 3、Responsible User:这笔结汇业务的经办人,默认为登陆柜员,也可以通过点击“i”按钮更改成其他经办人。
* 4 、Exchange Type:这笔结售汇业务的类型,本期默认为即期售汇。
* 5、Purchase Amount:这笔结售汇业务的售汇币种及金额,根据业务实际情况输入,必输项。
* 6、Domestic Amount:这笔结售汇业务的本币币种及金额,币种默认为人民币CNY,不可更改,金额由系统根据交易要素自动计算得出。
* 7、Applicant:这笔结售汇业务的申请人,根据业务实际情况输入,必输项。
* 8、Exchange Rate:这笔结售汇业务所使用的牌价,如果不需要资金部报价,则自动根据申请人的汇率优惠情况在原结售汇牌价基础上计算得出。
* 9、Middle Rate:这笔结售汇业务所涉及的中间价,如果不需要资金部报价,则自动带出结汇币种的中间价。
* 10、钞汇标志:这笔结售汇业务的钞汇标志,选项为现汇和现钞,默认为现汇,根据业务实际情况输入。
* 11、Quote Ref.:本交易不适用。
* 12、Treasury Dept. Ref.:本交易不适用。
* 13、Open Date:这笔结售汇业务的成交日期,系统默认为当前日期,可以根据业务实际情况修改。
* 14、Value Date:这笔结售汇业务的起息日,系统默认为成交日,可以根据业务实际情况修改。
* 15、Settlement Date:本期不适用。
* 16、Begin Date of Settle:本期不适用。
* 17、Expiry Date of Settle:本期不适用。
* 18、Foreign Cur. Account:这笔结售汇业务的外币的记账账号类型与记账账号,有LO客户往来账户、VT客户待核查账户、HA内部往来清算账户以及SP国际结算过渡账户4个选项,系统会根据账号类型自动带出相关账号,也可根据业务实际情况输入,必输项。
* 19、Domestic Cur. Account:这笔结售汇业务的本币的记账账号类型与记账账号,有LO客户往来账户,HA内部往来清算账户以及SP国际结算过渡账户3个选项,系统会根据账号类型自动带出相关账号,也可根据业务实际情况输入,必输项。
* 20、Exchange Party Type:这笔结售汇业务的申请人的主体类型,系统会根据静态数据的信息自动默认,也可根据业务实际情况输入,必输项。
* 21、Exchange Title:这笔结售汇业务的类型,根据业务实际情况输入,必输项。
* 22、Remark:这笔结售汇业务的备注信息。
*/
@JsonIgnoreProperties
(
ignoreUnknown
=
true
)
...
...
@@ -160,40 +184,4 @@ public class Fxd {
private
String
etyextkey
=
NULLSTR
;
}
\ No newline at end of file
isc-funds-entity/src/main/java/com/brilliance/isc/funds/vo/FtdVo.java
View file @
73359377
...
...
@@ -22,61 +22,82 @@ public class FtdVo extends PageVo {
* 名称
*/
private
String
nam
;
/**
* 汇款开始日期
*/
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+8"
)
private
Date
opndatfrom
;
/**
* 汇款截止日期
*/
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+8"
)
private
Date
opndatto
;
/**
* //币种
*/
private
String
seacur
;
/**
* //金额
*/
private
BigDecimal
seaamtfr
;
/**
*
//金额
*/
private
BigDecimal
seaamtto
;
*
客户名称
*
*
/
private
String
ownusr
;
/**
*参与方参考号
*/
private
String
searef
;
/**
* 参与方名称
* */
private
String
seapty
;
*资金部经办人
**/
private
String
usr
;
/**
*
角色 User
*
银行类型
* */
private
String
searol
;
private
String
bnktyp
;
/**
*
user ID
*
挂起编号
* */
private
String
gzno
;
private
String
usrextkey
;
/**
* 汇款开始日期
*/
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+8"
)
private
Date
opndatfrom
;
/**
* 汇款截止日期
*/
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+8"
)
private
Date
opndatto
;
/**
*状态
* */
private
String
seasta
;
/**
*
定存拆借
类型
*
资金转账
类型
* */
private
String
fttyp
;
// /**
// * //币种
// */
// private String seacur;
// /**
// * //金额
// */
// private BigDecimal seaamtfr;
// /**
// * //金额
// */
// private BigDecimal seaamtto;
// /**
// *参与方参考号
// */
// private String searef;
// /**
// * 参与方名称
// * */
// private String seapty;
// /**
// * 角色 User
// * */
// private String searol;
// /**
// * user ID
// * */
//
// private String usrextkey;
// Getter method
// public String getFttyp() {
// return fttyp;
...
...
isc-funds-entity/src/main/java/com/brilliance/isc/funds/vo/FxdVo.java
View file @
73359377
...
...
@@ -46,36 +46,36 @@ public class FxdVo extends PageVo {
/**
* //币种
*/
private
String
seacur
;
//
private String seacur;
/**
* //金额从
*/
private
BigDecimal
seaamtfr
;
/**
* //金额到
*/
private
BigDecimal
seaamtto
;
//
/**
//
* //金额从
//
*/
//
private BigDecimal seaamtfr;
//
/**
//
* //金额到
//
*/
//
private BigDecimal seaamtto;
/**
*参与方参考号
*/
private
String
searef
;
//
private String searef;
/**
* 参与方名称
* */
private
String
seapty
;
//
private String seapty;
/**
* 角色 User
* */
private
String
searol
;
/**
* user ID
* */
// /**
// * 角色 User
// * */
// private String searol;
private
String
usrextkey
;
// /**
// * user ID
// * */
//
// private String usrextkey;
/**
*状态
...
...
@@ -86,5 +86,25 @@ public class FxdVo extends PageVo {
* 结售汇类型
* */
private
String
fxtyp
;
/**
* 客户名称
* */
private
String
ownusr
;
/***
* 账户经理
* */
private
String
accmng
;
/**
* 资金部经办人
* */
private
String
usr
;
/***
* 外币和本币结算账户
* */
private
String
acc
;
private
String
acc2
;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment