修改FTD交易

isc-common-core/src/main/java/com/brilliance/isc/bo/Ftd.java

@@ -104,32 +104,6 @@ public class Ftd  extends AbstractCommonVo{
        // @TDSetter(max=16)
         private String gzno = NULLSTR;
 
-        private String cur = NULLSTR;
-
-        private BigDecimal amt = Decimals.ZERO_SCALE0;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 }
\ No newline at end of file

isc-common-core/src/main/java/com/brilliance/isc/bo/model/Fttp.java

@@ -29,6 +29,8 @@ public class Fttp extends AbstractCommonVo {
     //BANKTYP flag  (max=1)
     private  String bnaktypflg = NULLSTR;
 
+    private Mt32m mt32m;
+
     @Override
     public void reset() {
         super.reset();

isc-common-core/src/main/java/com/brilliance/isc/bo/model/Mt32m.java

+package com.brilliance.isc.bo.model;
+
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.brilliance.isc.common.vo.PtsptaVo;
+import com.brilliance.mda.runtime.mda.util.Decimals;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Mt32m extends AbstractCommonVo {
+    private static Logger log = LoggerFactory.getLogger(Mt32m.class);
+
+    //Status E-nable, D-isable, I-nvisible
+    private  String pansta = null;
+    //MT300 22A - 报文功能
+    private  String amecur = null;
+    //Broker's Commission Amount
+    private BigDecimal ameamt = Decimals.ZERO_SCALE3;
+
+    private  String newcur = null;
+    //Broker's Commission Amount
+    private BigDecimal newamt = Decimals.ZERO_SCALE3;
+
+
+    private  String s22a = null;
+    //MT300 94A - 业务范�'
+    private  String s94a = null;
+
+    private  String s17r = null;
+
+    private  String s22b = null;
+
+
+    private  String s30x  = null;
+    private  String oldref = null;
+    private  String conref = null;
+    private  String conno = null;
+
+    private  String a53act = null;
+    private  String iniact = null;
+    private  String rbcact = null;
+    private  String a58act = null;
+
+    private  String b53act = null;
+    private  String b56act = null;
+    private  String owcact = null;
+    private  String b58act = null;
+    private  String str300 = null;
+
+    private PtsptaVo b58;
+
+    private PtsptaVo b53;
+
+    private PtsptaVo owc;
+
+    private PtsptaVo b56;
+
+
+    private PtsptaVo rbc;
+
+    private PtsptaVo ini;
+
+    private PtsptaVo a53;
+
+    private PtsptaVo a58;
+
+
+
+    @Override
+    public void reset() {
+        super.reset();
+    }
+
+}

isc-common-core/src/main/java/com/brilliance/isc/mda/dao/FtdMapper.java

+package com.brilliance.isc.mda.dao;
+
+import com.brilliance.isc.bo.Ftd;
+import com.brilliance.isc.vo.funds.FtdWithPtsCbbResponseVo;
+import com.brilliance.isc.vo.funds.FttselQueryVo;
+import org.apache.ibatis.annotations.Mapper;
+import com.brilliance.isc.bo.Ftd;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.List;
+
+@Mapper
+public interface FtdMapper {
+
+    int insert(Ftd record);
+
+    int insertSelective(Ftd record);
+
+    int updateByPrimaryKeySelective(Ftd record);
+
+    int updateByPrimaryKey(Ftd record);
+
+    int deleteByPrimaryKey(Ftd record);
+
+    int deleteByIds(Collection<Object> collection);
+
+    Ftd selectByPrimaryKey(Ftd record);
+
+    int dyncDelete(Map<String,Object> dyncMap);
+
+    List<Ftd> dyncRead(Map<String,Object> dyncMap);
+
+    List<FtdWithPtsCbbResponseVo> queryFtd(FttselQueryVo fttselQueryVo);
+
+    List<FtdWithPtsCbbResponseVo> queryFtdInfo(FttselQueryVo fttselQueryVo);
+
+    Ftd selectByInr(@Param("inr") String inr);
+
+    Ftd selectByOwnref(String ownref);
+    
+}
\ No newline at end of file

isc-common-core/src/main/java/com/brilliance/isc/mda/dao/FttMapper.java

+package com.brilliance.isc.mda.dao;
+
+import org.apache.ibatis.annotations.Mapper;
+import com.brilliance.isc.bo.Ftt;
+import java.util.Collection;
+import java.util.Map;
+import java.util.List;
+
+@Mapper
+public interface FttMapper {
+
+    int insert(Ftt record);
+
+    int insertSelective(Ftt record);
+
+    int updateByPrimaryKeySelective(Ftt record);
+
+    int updateByPrimaryKey(Ftt record);
+
+    int deleteByPrimaryKey(Ftt record);
+
+    int deleteByIds(Collection<Object> collection);
+
+    Ftt selectByPrimaryKey(Ftt record);
+
+    int dyncDelete(Map<String,Object> dyncMap);
+
+    List<Ftt> dyncRead(Map<String,Object> dyncMap);
+
+}
\ No newline at end of file

isc-common-core/src/main/java/com/brilliance/isc/vo/funds/FtdBizInfoVo.java

 package com.brilliance.isc.vo.funds;
 
 import com.brilliance.isc.common.vo.BizInfoVo;
+import com.brilliance.mda.runtime.mda.util.Dates;
 import com.brilliance.mda.runtime.mda.util.Decimals;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
+
 import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
 
 @Data
@@ -22,9 +25,11 @@ public class FtdBizInfoVo extends BizInfoVo{
 
     private String etyextkey = NULLSTR;
 
-    private String swtflg = NULLSTR;
+    private String msgtyp = NULLSTR;
 
     private  BigDecimal canamt = BigDecimal.ZERO;
 
 
+
+    private Date valdat =null;
 }

isc-common-core/src/main/java/com/brilliance/isc/vo/funds/FttselQueryVo.java

+package com.brilliance.isc.vo.funds;
+
+import com.brilliance.isc.common.vo.CommonResult;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 进口信用证入口交易查询条件字段
+ */
+@Data
+public class FttselQueryVo extends CommonResult {
+
+    private String seaownref;
+    private String seanam;
+
+    private String opndatfrom;
+    private String opndatto;
+    /**
+     * 币种
+     */
+    private String seacur;
+    /**
+     * 金额
+     */
+    private BigDecimal seaamt;
+    /**
+     * 金额
+     */
+    private BigDecimal seaamtfr;
+
+    /**
+     * 金额
+     */
+    private BigDecimal seaamtto;
+
+    private String ownusr;
+    private String usr;
+    private String acc;
+    private String acc2;
+    private String searef;
+    private String ptyextkey;
+    private String ptynam;
+    private String seapty;
+    private String searol;
+    private String usrextkey;
+    private String seasta;
+    private String accmng;
+    private String fxtyp;
+
+    private List<String> fxtypList;
+
+    /**
+     * 是否闭卷
+     */
+    private String isClosed;
+
+
+    /**
+     * 排序字段
+     */
+    private String column;
+
+    /**
+     * 正序倒序
+     */
+    private String order;
+
+}

isc-common-core/src/main/resources/mapper/fttmapper.xml

+<?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.FttMapper">
+
+    <resultMap id="BaseResultMap" type="com.brilliance.isc.bo.Ftt">
+        <result property="inr" column="inr" jdbcType="VARCHAR"/>
+        <result property="remark" column="remark" jdbcType="VARCHAR"/>
+        <result property="contag72" column="contag72" jdbcType="VARCHAR"/>
+        <result property="contag79" column="contag79" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        inr,remark,contag72,contag79
+    </sql>
+
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap">
+        select
+            <include refid="Base_Column_List" />
+        from ftt
+        where inr = #{inr,jdbcType=VARCHAR}
+    </select>
+
+    <delete id="deleteByPrimaryKey">
+        delete from ftt
+        where inr = #{inr,jdbcType=VARCHAR}
+    </delete>
+
+    <insert id="insert">
+        insert into ftt (<include refid="Base_Column_List" />)
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            #{inr,jdbcType=VARCHAR},
+            #{remark,jdbcType=VARCHAR},
+            #{contag72,jdbcType=VARCHAR},
+            #{contag79,jdbcType=VARCHAR},
+        </trim>
+    </insert>
+
+    <insert id="insertSelective">
+        insert into ftt
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="inr != null">inr,</if>
+            <if test="remark != null">remark,</if>
+            <if test="contag72 != null">contag72,</if>
+            <if test="contag79 != null">contag79,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="inr != null">#{inr,jdbcType=VARCHAR}, </if>
+            <if test="remark != null">#{remark,jdbcType=VARCHAR}, </if>
+            <if test="contag72 != null">#{contag72,jdbcType=VARCHAR}, </if>
+            <if test="contag79 != null">#{contag79,jdbcType=VARCHAR}, </if>
+        </trim>
+    </insert>
+
+    <update id="updateByPrimaryKeySelective">
+        update ftt
+        <set>
+            <if test="remark != null">remark = #{remark,jdbcType=VARCHAR},</if>
+            <if test="contag72 != null">contag72 = #{contag72,jdbcType=VARCHAR},</if>
+            <if test="contag79 != null">contag79 = #{contag79,jdbcType=VARCHAR},</if>
+        </set>
+        where inr = #{inr,jdbcType=VARCHAR}
+    </update>
+
+    <update id="updateByPrimaryKey">
+        update ftt
+        <set>
+            remark = #{remark,jdbcType=VARCHAR},
+            contag72 = #{contag72,jdbcType=VARCHAR},
+            contag79 = #{contag79,jdbcType=VARCHAR},
+        </set>
+        where inr = #{inr,jdbcType=VARCHAR}
+    </update>
+
+    <delete id="deleteByIds">
+        delete from act where inr in
+        <foreach item="item" index="index" collection="collection" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <update id="dyncUpdate">
+        update ftt
+        <set>
+            <if test="module.remark != null">remark = #{module.remark,jdbcType=VARCHAR},</if>
+            <if test="module.contag72 != null">contag72 = #{module.contag72,jdbcType=VARCHAR},</if>
+            <if test="module.contag79 != null">contag79 = #{module.contag79,jdbcType=VARCHAR},</if>
+        </set>
+        ${conditions}
+    </update>
+
+    <delete id="dyncDelete">
+        ${sql}
+    </delete>
+
+    <select id="dyncRead" resultMap="BaseResultMap">
+        ${sql}
+    </select>
+
+</mapper>
+
+

isc-common-service/src/main/java/com/brilliance/isc/common/context/SettleContext.java

@@ -623,6 +623,9 @@ public class SettleContext {
             case "FX":
                 role = "APL";
                 break;
+            case "FT":
+                role = "TRO";
+                break;
             case "LE":
             case "BE":
                 role = "BEN";