Merge branch 'develop' of http://114.115.138.98:8900/isc-v3.1/isc-core into develop

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

+package com.brilliance.isc.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;
+
+        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/FtdVo.java

+package com.brilliance.isc.bo;
+
+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;
+
+    /**
+     * 客户名称
+     * */
+    private String ownusr;
+
+    /**
+     *资金部经办人
+     **/
+    private String usr;
+
+    /**
+     * 银行类型
+     * */
+    private String bnktyp;
+
+    /**
+     * 挂起编号
+     * */
+    private String gzno;
+
+    /**
+     * 汇款开始日期
+     */
+    @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 cur;
+//    /**
+//     * //金额
+//     */
+    private BigDecimal amtmax;
+//    /**
+//     * //金额
+//     */
+    private BigDecimal amtmin;
+
+//    /**
+//     *参与方参考号
+//     */
+//    private String searef;
+//    /**
+//     * 参与方名称
+//     * */
+//    private String seapty;
+
+//    /**
+//     * 角色 User
+//     * */
+//    private String searol;
+
+//    /**
+//     * user ID
+//     * */
+//
+//    private String usrextkey;
+
+
+
+        // Getter method
+//        public String getFttyp() {
+//            return fttyp;
+//        }
+//
+//        // Setter method
+//        public void setFttyp(String fttyp) {
+//            this.fttyp = fttyp;
+//        }
+
+
+}

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

+package com.brilliance.isc.bo.model;
+
+import com.brilliance.isc.bo.Cbb;
+import com.brilliance.isc.bo.Ftd;
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Ftdgrp extends AbstractCommonVo {
+    private Ftd rec;
+
+    private Cbb cbb;
+
+    @Override
+    public void reset() {
+        if (rec == null) {
+            rec = new Ftd();
+        }
+        if (cbb == null) {
+            cbb = new Cbb();
+        }
+        cbb.reset();
+    }
+}

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

+package com.brilliance.isc.mda.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.brilliance.isc.bo.Ftd;
+import com.brilliance.isc.bo.FtdVo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface FtdselMapper extends BaseMapper<FtdVo> {
+
+    List<FtdVo> query(FtdVo vo);
+
+    Ftd selectByPrimaryKey(Ftd ftd);
+
+    //String findInrByRcvbic(String cod);
+}

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

@@ -27,6 +27,7 @@
         and IS_SHOW = 'Y'
         order by SORT
     </select>
+
     <select id="selectByBustypAndIsShowAndBranch" resultType="com.brilliance.isc.bo.Busbtn">
         select
         b.bustyp bustyp,case when a.inifrm is null then b.inifrm else a.inifrm end  inifrm ,b.btnnam btnnam,b.IS_MAIN isMain,b.IS_SHOW isShow

isc-common-core/src/main/resources/mapper/ftdselMapper.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.FtdselMapper">
+
+    <resultMap id="BaseResultMap" type="com.brilliance.isc.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"/>
+        <result property="cur" column="cur" jdbcType="VARCHAR"/>
+        <result property="amt" column="amt" jdbcType="DECIMAL"/>
+
+
+    </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="selectByPrimaryKey" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from ftd
+        where inr = #{inr,jdbcType=VARCHAR}
+    </select>
+
+<!--    资金调拨_连接cbb表查询-->
+    <select id="query" resultMap="BaseResultMap" parameterType="java.util.Map">
+    select <include refid="Base_Column_List" />
+    from ftd
+    join cbb on cbb.objinr = ftd.inr
+    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>
+    <if test="cur != null and cur != ''">
+        AND cbb.cur = #{cur,jdbcType=VARCHAR}
+    </if>
+
+    <if test=" amtmin != null and amtmin != ''">
+        AND cbb.amt &gt;=#{amtmin,jdbcType=DECIMAL}
+    </if>
+    <if test=" amtmax != null and amtmax != ''">
+        AND cbb.amt &lt;=#{amtmax,jdbcType=DECIMAL}
+    </if>
+    </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>-->
+
+
+
+
+
+
+
+
+<!--        <if test="amtfr != null and amtto != null">-->
+<!--            AND cbb.amt BETWEEN #{amtfr,jdbcType=DECIMAL} AND #{amtto,jdbcType=DECIMAL}-->
+<!--        </if>-->
+
+
+        <!--        <if test="seacur != null and seacur != ''">-->
+        <!--            AND ftd.SEACUR=#{seacur,jdbcType=VARCHAR}-->
+        <!--        </if>-->
+
+<!--                <if test=" seaamtfr != null and seaamtfr != ''">-->
+<!--                    AND ftd.SEAAMT>=#{seaamtfr,jdbcType=DECIMAL}-->
+<!--                </if>-->
+<!--                <if test=" seaamtto != null and seaamtto != ''">-->
+<!--                    AND ftd.SEAAMT&lt;=#{seaamtto,jdbcType=DECIMAL}-->
+<!--                </if>-->
+
+        <!--        <if test=" seaamtto != null and seaamtto != ''">-->
+        <!--            AND ftd.SEAAMT<=#{seaamtto,jdbcType=DECIMAL}-->
+        <!--        </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>-->
+    
+</mapper>
\ No newline at end of file