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
67e81bad
Commit
67e81bad
authored
Sep 29, 2024
by
wangweidong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
业务修改
parent
815cc5c4
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
84 additions
and
137 deletions
+84
-137
FtdselMapper.xml
isc-funds-boot/src/main/resources/mapper/FtdselMapper.xml
+6
-0
FxdselMapper.xml
isc-funds-boot/src/main/resources/mapper/FxdselMapper.xml
+8
-0
FtdselController.java
...lliance/isc/basesel/ftdsel/resource/FtdselController.java
+2
-2
FtdselService.java
.../brilliance/isc/basesel/ftdsel/service/FtdselService.java
+1
-1
FtdselServiceImpl.java
...ce/isc/basesel/ftdsel/service/impl/FtdselServiceImpl.java
+2
-2
FxdselController.java
...lliance/isc/basesel/fxdsel/resource/FxdselController.java
+2
-2
FxdselService.java
.../brilliance/isc/basesel/fxdsel/service/FxdselService.java
+1
-1
FxdselServiceImpl.java
...ce/isc/basesel/fxdsel/service/impl/FxdselServiceImpl.java
+2
-4
FtdVo.java
...tity/src/main/java/com/brilliance/isc/funds/vo/FtdVo.java
+31
-1
FxdVo.java
...tity/src/main/java/com/brilliance/isc/funds/vo/FxdVo.java
+29
-124
No files found.
isc-funds-boot/src/main/resources/mapper/FtdselMapper.xml
View file @
67e81bad
...
...
@@ -39,6 +39,12 @@
<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>
<if
test=
" fttyp != null and fttyp != ''"
>
AND ftd.fttyp=#{ fttyp,jdbcType=VARCHAR}
</if>
...
...
isc-funds-boot/src/main/resources/mapper/FxdselMapper.xml
View file @
67e81bad
...
...
@@ -52,6 +52,14 @@
<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>
<if
test=
" fxtyp != null and fxtyp != ''"
>
AND fxd.fxtyp=#{ fxtyp,jdbcType=VARCHAR}
</if>
...
...
isc-funds-business/src/main/java/com/brilliance/isc/basesel/ft
t
sel/resource/FtdselController.java
→
isc-funds-business/src/main/java/com/brilliance/isc/basesel/ft
d
sel/resource/FtdselController.java
View file @
67e81bad
package
com
.
brilliance
.
isc
.
basesel
.
ft
t
sel
.
resource
;
package
com
.
brilliance
.
isc
.
basesel
.
ft
d
sel
.
resource
;
import
com.brilliance.isc.basesel.ft
t
sel.service.FtdselService
;
import
com.brilliance.isc.basesel.ft
d
sel.service.FtdselService
;
import
com.brilliance.isc.funds.vo.FtdVo
;
import
com.brilliance.isc.vo.ResponseSet
;
import
org.springframework.web.bind.annotation.RequestBody
;
...
...
isc-funds-business/src/main/java/com/brilliance/isc/basesel/ft
t
sel/service/FtdselService.java
→
isc-funds-business/src/main/java/com/brilliance/isc/basesel/ft
d
sel/service/FtdselService.java
View file @
67e81bad
package
com
.
brilliance
.
isc
.
basesel
.
ft
t
sel
.
service
;
package
com
.
brilliance
.
isc
.
basesel
.
ft
d
sel
.
service
;
import
com.brilliance.isc.funds.bo.Ftd
;
import
com.brilliance.isc.funds.vo.FtdVo
;
import
com.github.pagehelper.PageInfo
;
...
...
isc-funds-business/src/main/java/com/brilliance/isc/basesel/ft
t
sel/service/impl/FtdselServiceImpl.java
→
isc-funds-business/src/main/java/com/brilliance/isc/basesel/ft
d
sel/service/impl/FtdselServiceImpl.java
View file @
67e81bad
package
com
.
brilliance
.
isc
.
basesel
.
ft
t
sel
.
service
.
impl
;
package
com
.
brilliance
.
isc
.
basesel
.
ft
d
sel
.
service
.
impl
;
import
com.brilliance.isc.basesel.ft
t
sel.service.FtdselService
;
import
com.brilliance.isc.basesel.ft
d
sel.service.FtdselService
;
import
com.brilliance.isc.funds.bo.Ftd
;
import
com.brilliance.isc.funds.vo.FtdVo
;
import
com.brilliance.isc.mda.dao.FtdselMapper
;
...
...
isc-funds-business/src/main/java/com/brilliance/isc/basesel/fx
t
sel/resource/FxdselController.java
→
isc-funds-business/src/main/java/com/brilliance/isc/basesel/fx
d
sel/resource/FxdselController.java
View file @
67e81bad
package
com
.
brilliance
.
isc
.
basesel
.
fx
t
sel
.
resource
;
package
com
.
brilliance
.
isc
.
basesel
.
fx
d
sel
.
resource
;
import
com.brilliance.isc.basesel.fx
t
sel.service.FxdselService
;
import
com.brilliance.isc.basesel.fx
d
sel.service.FxdselService
;
import
com.brilliance.isc.vo.ResponseSet
;
import
com.brilliance.isc.funds.vo.FxdVo
;
...
...
isc-funds-business/src/main/java/com/brilliance/isc/basesel/fx
t
sel/service/FxdselService.java
→
isc-funds-business/src/main/java/com/brilliance/isc/basesel/fx
d
sel/service/FxdselService.java
View file @
67e81bad
package
com
.
brilliance
.
isc
.
basesel
.
fx
t
sel
.
service
;
package
com
.
brilliance
.
isc
.
basesel
.
fx
d
sel
.
service
;
import
com.brilliance.isc.funds.bo.Fxd
;
import
com.brilliance.isc.funds.vo.FxdVo
;
...
...
isc-funds-business/src/main/java/com/brilliance/isc/basesel/fx
t
sel/service/impl/FxdselServiceImpl.java
→
isc-funds-business/src/main/java/com/brilliance/isc/basesel/fx
d
sel/service/impl/FxdselServiceImpl.java
View file @
67e81bad
package
com
.
brilliance
.
isc
.
basesel
.
fx
t
sel
.
service
.
impl
;
package
com
.
brilliance
.
isc
.
basesel
.
fx
d
sel
.
service
.
impl
;
import
com.brilliance.isc.funds.bo.Fxd
;
import
com.brilliance.isc.mda.dao.FxdselMapper
;
import
com.brilliance.isc.funds.vo.FxdVo
;
import
com.brilliance.isc.basesel.fx
t
sel.service.FxdselService
;
import
com.brilliance.isc.basesel.fx
d
sel.service.FxdselService
;
import
com.github.pagehelper.PageHelper
;
import
com.github.pagehelper.PageInfo
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
javax.annotation.Resource
;
import
java.util.ArrayList
;
import
java.util.List
;
@Service
...
...
isc-funds-entity/src/main/java/com/brilliance/isc/funds/vo/FtdVo.java
View file @
67e81bad
...
...
@@ -19,7 +19,7 @@ public class FtdVo extends PageVo {
*/
private
String
seaownref
;
/**
*
客户号/
名称
* 名称
*/
private
String
nam
;
/**
...
...
@@ -47,5 +47,35 @@ public class FtdVo extends PageVo {
*/
private
BigDecimal
seaamtto
;
/**
*参与方参考号
*/
private
String
searef
;
/**
* 参与方名称
* */
private
String
seapty
;
/**
* 角色 User
* */
private
String
searol
;
/**
* user ID
* */
private
String
usrextkey
;
/**
*状态
* */
private
String
seasta
;
/**
* 定存拆借类型
* */
private
String
fxtyp
;
}
isc-funds-entity/src/main/java/com/brilliance/isc/funds/vo/FxdVo.java
View file @
67e81bad
...
...
@@ -4,6 +4,9 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import
com.fasterxml.jackson.annotation.JsonIgnoreProperties
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
org.apache.camel.language.bean.Bean
;
import
org.apache.catalina.User
;
import
java.util.Date
;
import
java.math.BigDecimal
;
import
java.util.List
;
...
...
@@ -14,89 +17,20 @@ import java.util.List;
* @create: 2024-09-25 15:10
**/
/**
* TABLE:fxd:
*
* `INR CHAR(8)`:`INR` 字段,字符类型,长度为 8。
* - `OWNREF CHAR(16)`:`OWNREF` 字段,字符类型,长度为 16。
* - `NAM CHAR(40)`:`NAM` 字段,字符类型,长度为 40。
* - `OPNDAT DATE`:`OPNDAT` 字段,日期类型。
* - `OWNUSR CHAR(8)`:`OWNUSR` 字段,字符类型,长度为 8。
* - `FXTYP CHAR(2)`:`FXTYP` 字段,字符类型,长度为 2。
* - `RAT NUMERIC(12,6)`:`RAT` 字段,数值类型,总共 12 位,小数点后 6 位。
* - `MIDRAT NUMERIC(12,6)`:`MIDRAT` 字段,数值类型,总共 12 位,小数点后 6 位。
* - `QUOREF CHAR(16)`:`QUOREF` 字段,字符类型,长度为 16。
* - `FUDREF CHAR(16)`:`FUDREF` 字段,字符类型,长度为 16。
* - `VALDAT DATE`:`VALDAT` 字段,日期类型。
* - `CNFDAT DATE`:`CNFDAT` 字段,日期类型。
* - `SETDAT DATE`:`SETDAT` 字段,日期类型。
* - `SETDATFRM DATE`:`SETDATFRM` 字段,日期类型。
* - `SETDATTO DATE`:`SETDATTO` 字段,日期类型。
* - `CLSDAT DATE`:`CLSDAT` 字段,日期类型。
* - `VER CHAR(4)`:`VER` 字段,字符类型,长度为 4。
* - `BRANCHINR CHAR(8)`:`BRANCHINR` 字段,字符类型,长度为 8。
* - `BCHKEYINR CHAR(8)`:`BCHKEYINR` 字段,字符类型,长度为 8。
* - `TRDINT CHAR(3)`:`TRDINT` 字段,字符类型,长度为 3。
* - `TRDOUT CHAR(3)`:`TRDOUT` 字段,字符类型,长度为 3。
* - `TRNMAN CHAR(2)`:`TRNMAN` 字段,字符类型,长度为 2。
* - `ACC CHAR(21)`:`ACC` 字段,字符类型,长度为 21。
* - `ACC2 CHAR(21)`:`ACC2` 字段,字符类型,长度为 21。
* - `USR CHAR(8)`:`USR` 字段,字符类型,长度为 8。
* - `DSP CHAR(2)`:`DSP` 字段,字符类型,长度为 2。
* - `DSP2 CHAR(2)`:`DSP2` 字段,字符类型,长度为 2。
* - `CSHPCT NUMERIC(5,2)`:`CSHPCT` 字段,数值类型,总共 5 位,小数点后 2 位。
* - `RAT1 NUMERIC(12,6)`:`RAT1` 字段,数值类型,总共 12 位,小数点后 6 位。
* - `ACCMNG CHAR(8)`:`ACCMNG` 字段,字符类型,长度为 8。
* - `HDBCH CHAR(8)`:`HDBCH` 字段,字符类型,长度为 8。
* - `ETYEXTKEY CHAR(8)`:`ETYEXTKEY` 字段,字符类型,长度为 8。
*
* ownref: "", // 业务编号 .infcon.seaownref
* nam: "", // 参与方名称Name .infcon.nam
* fxtyp, //平盘类型
* trdint, //结售汇类型
* fudref, //资金部编号
* //searef:"", // 参与方参考号 .infcon.searef
* //seapty:"", // 参与方名称/BIC .infcon.seapty
* opndatfrom: "", // 成交有效日期自 .infcon.opndatfrom
* opndatto: "", // Open Date to .infcon.opndatto
* seacur: "", // 币种 .infcon.seacur
* seaamtfr: "", // 金额自 .infcon.seaamtfr
* seaamtto: "", // Amount to .infcon.seaamtto
* //trnman, //交易主体
* acc, //外币结算账号
* acc2, //本币结算账号
* ownusr, //资金部经办人
* usr, //营运部经办人
*/
@Data
@NoArgsConstructor
@JsonIgnoreProperties
(
ignoreUnknown
=
true
)
public
class
FxdVo
extends
PageVo
{
/**
* 汇款主表唯一编号
*/
// private String inr;
/**
* 汇款业务编号
* 业务编号
*/
private
String
seaownref
;
/**
*
客户号/
名称
*
业务
名称
*/
private
String
nam
;
/**
* 机构编号
*/
private
String
bchkeyinr
;
/**
* 机构编码
*/
private
String
branchinr
;
/**
* 汇款开始日期
...
...
@@ -109,77 +43,48 @@ public class FxdVo extends PageVo {
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+8"
)
private
Date
opndatto
;
// /**
// * 汇款邮路
// */
// private String route;
private
String
fxtyp
;
private
String
trdint
;
private
String
fudref
;
/**
* //币种
*/
private
String
seacur
;
/**
* //金额
*/
private
BigDecimal
seaamt
;
/**
* //金额
* //金额从
*/
private
BigDecimal
seaamtfr
;
/**
* //金额
* //金额
到
*/
private
BigDecimal
seaamtto
;
/**
* swift类型
*/
// private String msgtyp;
/**
* 国家代码
*/
// private String countcode;
/**
* 同名划转标志
*/
// private String tsnflg;
/**
* 机构
*参与方参考号
*/
// private String brainr
;
private
String
searef
;
/**
*
柜员
*/
private
String
ownusr
;
private
String
usr
;
*
参与方名称
*
*
/
private
String
seapty
;
/**
* 前端渠道
*/
// private String channel;
* 角色 User
* */
private
String
searol
;
/**
* 渠道业务编号
*/
// private String chnref;
* user ID
* */
private
String
usrextkey
;
/**
*
排序字段
*/
// private String column
;
*
状态
*
*
/
private
String
seasta
;
/**
*
正序倒序
*/
// private String order
;
*
结售汇类型
*
*
/
private
String
fxtyp
;
}
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