Skip to content

I
isc-funds
Commit 815cc5c4 by wangweidong
Options

ftd的修改

parent 94ea56e9
Showing with 366 additions and 91 deletions
isc-funds-boot/src/main/resources/mapper/FtdselMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.brilliance.isc.mda.dao.FtdselMapper">
<resultMap id="BaseResultMap" type="com.brilliance.isc.funds.bo.Ftd">
<result property="inr" column="inr" jdbcType="VARCHAR"/>
<result property="ownref" column="ownref" jdbcType="VARCHAR"/>
<result property="nam" column="nam" jdbcType="VARCHAR"/>
<result property="opndat" column="opndat" jdbcType="DATE"/>
<result property="valdat" column="valdat" jdbcType="DATE"/>
<result property="cnfdat" column="cnfdat" jdbcType="DATE"/>
<result property="matdat" column="matdat" jdbcType="DATE"/>
<result property="clsdat" column="clsdat" jdbcType="DATE"/>
<result property="ownusr" column="ownusr" jdbcType="VARCHAR"/>
<result property="ver" column="ver" jdbcType="VARCHAR"/>
<result property="branchinr" column="branchinr" jdbcType="VARCHAR"/>
<result property="bchkeyinr" column="bchkeyinr" jdbcType="VARCHAR"/>
<result property="fttyp" column="fttyp" jdbcType="VARCHAR"/>
<result property="rat" column="rat" jdbcType="DECIMAL"/>
<result property="cntfra" column="cntfra" jdbcType="VARCHAR"/>
<result property="usr" column="usr" jdbcType="VARCHAR"/>
<result property="bnktyp" column="bnktyp" jdbcType="VARCHAR"/>
<result property="etyextkey" column="etyextkey" jdbcType="VARCHAR"/>
<result property="gzno" column="gzno" jdbcType="VARCHAR"/>
</resultMap>
<select id="query" resultMap="BaseResultMap">
select ftd.OWNREF,ftd.NAM,ftd.OPNDAT
from ftd where
<if test=" opndatfrom != null ">
ftd.OPNDAT>=#{opndatfrom,jdbcType=DATE}
</if>
<if test=" opndatto != null ">
AND ftd.OPNDAT&lt;=#{opndatto,jdbcType=DATE}
</if>
<if test=" seaownref != null and seaownref != ''">
AND ftd.OWNREF=#{ seaownref,jdbcType=VARCHAR}
</if>
<if test=" nam != null and nam != ''">
AND ftd.NAM=#{ nam,jdbcType=VARCHAR}
</if>
<!-- <if test=" chnipt != null and chnipt != ''">-->
<!-- <choose>-->
<!-- <when test=" chnipt == 'BLK'">-->
<!-- AND M1.nxtchncod=-->
<!-- </when>-->
<!-- <when test=" chnipt == 'wu'">-->
<!-- AND M1.tgtchncod IS NULL-->
<!-- </when>-->
<!-- <otherwise>-->
<!-- AND M1.tgtchncod=-->
<!-- </otherwise>-->
<!-- </choose>-->
<!-- </if>-->
<!-- <if test=" msgtyp != null and msgtyp != ''">-->
<!-- AND M2.msgtyp=#{ msgtyp,jdbcType=VARCHAR}-->
<!-- </if>-->
<!-- <if test=" subtyp != null and subtyp != ''">-->
<!-- AND M2.subtyp=#{ subtyp,jdbcType=VARCHAR}-->
<!-- </if>-->
<!-- <if test=" gpi != null and gpi != ''">-->
<!-- AND M2.gpi=#{ gpi,jdbcType=VARCHAR}-->
<!-- </if>-->
<!-- <if test=" sndbak != null and sndbak != ''">-->
<!-- AND M2.sndbic like '%' || #{sndbak,jdbcType=VARCHAR} || '%'-->
<!-- </if>-->
<!-- <if test=" revbak != null and revbak != ''">-->
<!-- AND M2.rcvbic like '%' || #{revbak,jdbcType=VARCHAR} || '%'-->
<!-- </if>-->
<!-- <if test=" othref != null and othref != ''">-->
<!-- AND M2.othref like '%' || #{othref,jdbcType=VARCHAR} || ''-->
<!-- </if>-->
<!-- <if test=" ownref != null and ownref != ''">-->
<!-- AND M2.ownref like '%' || #{ ownref,jdbcType=VARCHAR} || '%'-->
<!-- </if>-->
<!-- <if test=" act != null and act != ''">-->
<!-- AND M2.act like '%' || #{ act,jdbcType=VARCHAR} || '%'-->
<!-- </if>-->
<!-- <if test=" cur != null and cur != ''">-->
<!-- AND M2.cur=#{ cur,jdbcType=VARCHAR}-->
<!-- </if>-->
<!-- <if test=" dtlchg != null and dtlchg != ''">-->
<!-- AND M2.dtlchg=#{ dtlchg,jdbcType=VARCHAR}-->
<!-- </if>-->
<!-- <if test=" amtmin != null and amtmin != ''">-->
<!-- AND M2.amt &gt;= #{ amtmin,jdbcType=DECIMAL}-->
<!-- </if>-->
<!-- <if test=" amtmax != null and amtmax != ''">-->
<!-- AND M2.amt &lt;= #{ amtmax,jdbcType=DECIMAL}-->
<!-- </if>-->
<!-- <if test=" actbic != null and actbic != ''">-->
<!-- AND (M2.actbic like '%' || #{ actbic,jdbcType=VARCHAR} || '%'-->
<!-- or M2.t53bic LIKE '%' || #{ actbic,jdbcType=VARCHAR} || '%')-->
<!-- </if>-->
<!-- <if test=" sta != null and sta != ''">-->
<!-- AND M1.sta=#{ sta,jdbcType=VARCHAR}-->
<!-- </if>-->
</select>
</mapper>
\ No newline at end of file
isc-funds-business/src/main/java/com/brilliance/isc/basesel/fttsel/resource/FtdselController.java 0 → 100644
package com.brilliance.isc.basesel.fttsel.resource;
import com.brilliance.isc.basesel.fttsel.service.FtdselService;
import com.brilliance.isc.funds.vo.FtdVo;
import com.brilliance.isc.vo.ResponseSet;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
@RestController
@RequestMapping("/ftdsel")
public class FtdselController {
@Resource
private FtdselService ftdselService;
@RequestMapping("/query")
public ResponseSet list(@RequestBody FtdVo vo) {
return ResponseSet.simpleSuccess(ftdselService.query(vo));
}
/**
* 处理按钮查看能够进行的交易
*
*/
/**
* 详情页面初始化
*/
}
isc-funds-business/src/main/java/com/brilliance/isc/basesel/fttsel/resource/FttselController.java deleted 100644 → 0
package com.brilliance.isc.basesel.fttsel.resource;
import com.brilliance.isc.basesel.fttsel.service.FttselService;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
@RestController
@RequestMapping("/fxtsel")
public class FttselController {
@Resource
private FttselService fxtselService;
// @Resource
// private TrncodService trncodService;
/**
* 汇款页签查询
* @param cptselQueryVo
* @return
*/
// @RequestMapping("/listfxd")
// public ResponseSet list(@RequestBody FxtselVo cptselQueryVo) {
// return ResponseSet.simpleSuccess(fxtselService.list(cptselQueryVo));
// }
/**
* 处理按钮查看能够进行的交易
*/
// @RequestMapping("/dealWithByInr")
// public ResponseSet dealWithByInr(@RequestBody TrnCodeQueryVo trnCodeQueryVo) {
// return ResponseSet.simpleSuccess(trncodService.dealWithByInr(trnCodeQueryVo));
// }
/**
* 详情页面初始化
*/
// @RequestMapping("/selectXxdByPrimaryKey")
// public ResponseSet selectXxdByPrimaryKey(Map<String,String> map){
// return ResponseSet.simpleSuccess(trncodService.selectXxdByPrimaryKey(map));
// }
}
isc-funds-business/src/main/java/com/brilliance/isc/basesel/fttsel/service/FtdselService.java 0 → 100644
package com.brilliance.isc.basesel.fttsel.service;
import com.brilliance.isc.funds.bo.Ftd;
import com.brilliance.isc.funds.vo.FtdVo;
import com.github.pagehelper.PageInfo;
public interface FtdselService {
PageInfo<Ftd> query(FtdVo ftdVo);
}
isc-funds-business/src/main/java/com/brilliance/isc/basesel/fttsel/service/FttselService.java deleted 100644 → 0
package com.brilliance.isc.basesel.fttsel.service;
import com.brilliance.isc.vo.TrnCodeQueryVo;
import com.brilliance.isc.vo.TrncodVo;
import com.brilliance.isc.funds.vo.FxdVo;
import com.github.pagehelper.PageInfo;
import java.util.List;
public interface FttselService {
PageInfo list(FxdVo cptselQueryVo);
List<TrncodVo> dealWithByInr(TrnCodeQueryVo trnCodeQueryVo);
}
isc-funds-business/src/main/java/com/brilliance/isc/basesel/fttsel/service/impl/FttselServiceImpl.java → isc-funds-business/src/main/java/com/brilliance/isc/basesel/fttsel/service/impl/FtdselServiceImpl.java
package com.brilliance.isc.basesel.fttsel.service.impl; package com.brilliance.isc.basesel.fttsel.service.impl;
import com.brilliance.isc.basesel.fttsel.service.FttselService; import com.brilliance.isc.basesel.fttsel.service.FtdselService;
import com.brilliance.isc.bo.Busbtn; import com.brilliance.isc.funds.bo.Ftd;
import com.brilliance.isc.common.api.bch.service.BchService; import com.brilliance.isc.funds.vo.FtdVo;
import com.brilliance.isc.mda.dao.BusbtnMapper; import com.brilliance.isc.mda.dao.FtdselMapper;
import com.brilliance.isc.mda.dao.CpdMapper; import com.github.pagehelper.PageHelper;
import com.brilliance.isc.vo.TrnCodeQueryVo;
import com.brilliance.isc.vo.TrncodVo;
import com.brilliance.isc.funds.vo.FxdVo;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.google.common.collect.Lists;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List; import java.util.List;
@Service @Service
public class FttselServiceImpl implements FttselService { public class FtdselServiceImpl implements FtdselService {
@Resource @Resource
private BchService bchService; private FtdselMapper ftdselMapper;
@Resource
private CpdMapper cpdMapper;
@Resource
private BusbtnMapper busbtnMapper;
@Override @Override
public PageInfo list(FxdVo fxdVo) { public PageInfo<Ftd> query(FtdVo vo) {
PageHelper.startPage(vo.getPageNo(), vo.getPageSize(), null).setReasonable(true);
List<Ftd> result= ftdselMapper.query(vo);
return new PageInfo<>(result);
// String branch = fxtselQueryVo.getBranch(); // String branch = fxtselQueryVo.getBranch();
// if (Strings.isEmpty(branch)) { // if (Strings.isEmpty(branch)) {
// branch = SettleContext.getSessionUserVo().getOwnOrgDepartmentNumber(); // branch = SettleContext.getSessionUserVo().getOwnOrgDepartmentNumber();
...@@ -54,23 +50,7 @@ public class FttselServiceImpl implements FttselService { ...@@ -54,23 +50,7 @@ public class FttselServiceImpl implements FttselService {
// } // }
// return new PageInfo(cpdList); // return new PageInfo(cpdList);
return new PageInfo();
} }
@Override
public List<TrncodVo> dealWithByInr(TrnCodeQueryVo trnCodeQueryVo) {
List<TrncodVo> result = Lists.newArrayList();
//获取模型数据
// Lidgrp lidgrp = lcToolComponent.getLidgrpByInr(inr);
List<Busbtn> busbtnList = busbtnMapper.selectByBustypAndIsShow(trnCodeQueryVo.getType());
String isAllowed = "Y";
String disResult = "";
for (int i = 0; i < busbtnList.size(); i++) {
//按钮亮灰显逻辑
// isAllowed = lcToolComponent.isLITrnAllowed(lidgrp,lgTraArray[i]);
TrncodVo trncodVo = new TrncodVo(busbtnList.get(i).getInifrm(), busbtnList.get(i).getBtnnam(), isAllowed, busbtnList.get(i).getIsMain(), disResult);
result.add(trncodVo);
}
return result;
}
} }
isc-funds-business/src/main/java/com/brilliance/isc/mda/dao/FtdselMapper.java 0 → 100644
package com.brilliance.isc.mda.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.brilliance.isc.funds.bo.Ftd;
import com.brilliance.isc.funds.vo.FtdVo;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface FtdselMapper extends BaseMapper<Ftd> {
List<Ftd> query(FtdVo vo);
//String findInrByRcvbic(String cod);
}
isc-funds-entity/src/main/java/com/brilliance/isc/funds/bo/Ftd.java 0 → 100644
package com.brilliance.isc.funds.bo;
import com.brilliance.mda.runtime.mda.util.Decimals;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Getter;
import lombok.Setter;
import java.math.BigDecimal;
import java.util.Date;
import static com.brilliance.mda.runtime.mda.Constants.NULLDATE;
import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
/**
* TABLE:ftd:FTD - Funds Transfer Data
*/
@JsonIgnoreProperties(ignoreUnknown = true)
@Getter
@Setter
public class Ftd{
//@TDSetter(max=8)
private String inr = NULLSTR;
//Reference
//@TDSetter(max=16)
private String ownref = NULLSTR;
//Externally Displayed Name to Identify the Contract
//@TDSetter(max=40)
private String nam = NULLSTR;
//Date Funds Transfer Opened/Issued
@JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
// @TDSetter
private Date opndat = NULLDATE;
//Value Date
@JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
//@TDSetter
private Date valdat = NULLDATE;
//Confirmed on
@JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
//@TDSetter
private Date cnfdat = NULLDATE;
//Maturity Date
@JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
//@TDSetter
private Date matdat = NULLDATE;
//Date Closed
@JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
//@TDSetter
private Date clsdat = NULLDATE;
//Responsible User
// @TDSetter(max=8)
private String ownusr = NULLSTR;
//Version Counter
// @TDSetter(max=4)
private String ver = NULLSTR;
//Branch INR
// @TDSetter(max=8)
private String branchinr = NULLSTR;
//Branch INR
//@TDSetter(max=8)
private String bchkeyinr = NULLSTR;
//Funds Transfer Type
// @TDSetter(max=2)
private String fttyp = NULLSTR;
//Rate per year
// @TDSetter(scale=6)
private BigDecimal rat = Decimals.ZERO_SCALE6;
//Day count Fraction
// @TDSetter(max=7)
private String cntfra = NULLSTR;
//User
//@TDSetter(max=8)
private String usr = NULLSTR;
//Bank Type
// @TDSetter(max=1)
private String bnktyp = NULLSTR;
//entity extkey
// @TDSetter(max=8)
private String etyextkey = NULLSTR;
//挂�'�编号
// @TDSetter(max=16)
private String gzno = NULLSTR;
}
\ No newline at end of file
isc-funds-entity/src/main/java/com/brilliance/isc/funds/vo/FtdVo.java 0 → 100644
package com.brilliance.isc.funds.vo;
import com.brilliance.isc.common.vo.PageVo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
import java.util.Date;
@Data
@NoArgsConstructor
@JsonIgnoreProperties(ignoreUnknown = true)
public class FtdVo extends PageVo {
/**
* 汇款业务编号
*/
private String seaownref;
/**
* 客户号/名称
*/
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;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment