Skip to content

I
isc-core
Commit 50d1ff4a by zhoujunpeng
Options

头寸调拨确认交易

parent 5dd7a974
Showing with 83 additions and 74 deletions
isc-common-core/src/main/java/com/brilliance/isc/bo/model/Ftdgrp.java
...@@ -12,6 +12,7 @@ import lombok.Data; ...@@ -12,6 +12,7 @@ import lombok.Data;
public class Ftdgrp extends AbstractCommonVo { public class Ftdgrp extends AbstractCommonVo {
private Ftd rec; private Ftd rec;
private Fxacbs cbs;
private Cbb cbb; private Cbb cbb;
@Override @Override
...@@ -22,6 +23,9 @@ public class Ftdgrp extends AbstractCommonVo { ...@@ -22,6 +23,9 @@ public class Ftdgrp extends AbstractCommonVo {
if (cbb == null) { if (cbb == null) {
cbb = new Cbb(); cbb = new Cbb();
} }
if (cbs == null){
cbs = new Fxacbs();
}
cbb.reset(); cbb.reset();
} }
} }
isc-common-core/src/main/resources/mapper/ftdselMapper.xml
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<sql id="Base_Column_List"> <sql id="Base_Column_List">
inr,ownref,nam,opndat,valdat,cnfdat,matdat,clsdat,ownusr,ver,branchinr,bchkeyinr,fttyp,rat,cntfra, inr,ownref,nam,opndat,valdat,cnfdat,matdat,clsdat,ownusr,ver,branchinr,bchkeyinr,fttyp,rat,cntfra,
usr,bnktyp,etyextkey,gzno usr,bnktyp,etyextkey,gzno,cur,amt
</sql> </sql>
...@@ -42,80 +42,83 @@ ...@@ -42,80 +42,83 @@
</select> </select>
<!-- 资金调拨_连接cbb表查询--> <!-- 资金调拨_连接cbb表查询-->
<!-- <select id="query" resultMap="BaseResultMap" parameterType="java.util.Map">--> <select id="query" resultMap="BaseResultMap" parameterType="java.util.Map">
<!-- select <include refid="Base_Column_List" />--> select
<!-- from ftd--> ftd.*,
<!-- join cbb on cbb.objinr = ftd.inr--> cbb.cur,
<!-- where--> cbb.amt
<!-- <if test=" opndatfrom != null ">--> from ftd
<!-- ftd.OPNDAT>=#{opndatfrom,jdbcType=DATE}--> join cbb on cbb.objinr = ftd.inr
<!-- </if>--> where
<if test=" opndatfrom != null ">
<!-- <if test=" opndatto != null ">--> ftd.OPNDAT>=#{opndatfrom,jdbcType=DATE}
<!-- AND ftd.OPNDAT&lt;=#{opndatto,jdbcType=DATE}--> </if>
<!-- </if>-->
<!-- <if test=" seaownref != null and seaownref != ''">--> <if test=" opndatto != null ">
<!-- AND ftd.OWNREF=#{ seaownref,jdbcType=VARCHAR}--> AND ftd.OPNDAT&lt;=#{opndatto,jdbcType=DATE}
<!-- </if>--> </if>
<if test=" seaownref != null and seaownref != ''">
<!-- <if test=" nam != null and nam != ''">--> AND ftd.OWNREF=#{ seaownref,jdbcType=VARCHAR}
<!-- AND ftd.NAM=#{ nam,jdbcType=VARCHAR}--> </if>
<!-- </if>-->
<!-- <if test=" ownusr != null and ownusr != ''">--> <if test=" nam != null and nam != ''">
<!-- AND ftd.ownusr=#{ ownusr,jdbcType=VARCHAR}--> AND ftd.NAM=#{ nam,jdbcType=VARCHAR}
<!-- </if>--> </if>
<!-- <if test=" usr != null and usr != ''">--> <if test=" ownusr != null and ownusr != ''">
<!-- AND ftd.usr=#{ usr,jdbcType=VARCHAR}--> AND ftd.ownusr=#{ ownusr,jdbcType=VARCHAR}
<!-- </if>--> </if>
<!-- <if test=" fttyp != null and fttyp != ''">--> <if test=" usr != null and usr != ''">
<!-- AND ftd.FTTYP=#{ fttyp,jdbcType=VARCHAR}--> AND ftd.usr=#{ usr,jdbcType=VARCHAR}
<!-- </if>--> </if>
<!-- <if test=" gzno != null and gzno != ''">--> <if test=" fttyp != null and fttyp != ''">
<!-- AND ftd.gzno=#{ gzno,jdbcType=VARCHAR}--> AND ftd.FTTYP=#{ fttyp,jdbcType=VARCHAR}
<!-- </if>--> </if>
<!-- <if test="cur != null and cur != ''">--> <if test=" gzno != null and gzno != ''">
<!-- AND cbb.cur = #{cur,jdbcType=VARCHAR}--> AND ftd.gzno=#{ gzno,jdbcType=VARCHAR}
<!-- </if>--> </if>
<if test="cur != null and cur != ''">
<!-- <if test=" amtmin != null and amtmin != ''">--> AND cbb.cur = #{cur,jdbcType=VARCHAR}
<!-- AND cbb.amt &gt;=#{amtmin,jdbcType=DECIMAL}--> </if>
<!-- </if>-->
<!-- <if test=" amtmax != null and amtmax != ''">--> <if test=" amtmin != null and amtmin != ''">
<!-- AND cbb.amt &lt;=#{amtmax,jdbcType=DECIMAL}--> AND cbb.amt &gt;=#{amtmin,jdbcType=DECIMAL}
<!-- </if>--> </if>
<!-- </select>--> <if test=" amtmax != null and amtmax != ''">
<!--本地测试--> AND cbb.amt &lt;=#{amtmax,jdbcType=DECIMAL}
<select id="query" resultMap="BaseResultMap"> </if>
select <include refid="Base_Column_List" />
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=" 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>
</select> </select>
<!--本地测试-->
<!-- <select id="query" resultMap="BaseResultMap">-->
<!-- select <include refid="Base_Column_List" />-->
<!-- 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=" 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>-->
<!-- </select>-->
......
isc-common-core/src/main/resources/mapper/fxdmapper.xml
...@@ -379,6 +379,8 @@ ...@@ -379,6 +379,8 @@
from fxd from fxd
where ownref = #{ownref} where ownref = #{ownref}
</select> </select>
<select id="queryFxdInfo" resultType="com.brilliance.isc.vo.funds.FxdWithPtsCbbResponseVo"
parameterType="com.brilliance.isc.vo.funds.FxtselQueryVo"></select>
</mapper> </mapper>
......
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