资金定存拆借入口交易

资金定存拆借入口交易

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/Setsta.java

+package com.brilliance.isc.bo;
+
+
+import com.brilliance.mda.runtime.mda.util.Decimals;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+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:Setsta
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Setsta {
+
+    //Internal Unique ID of Application Transaction
+    private String inr = NULLSTR;
+
+    //Object Type
+    private String objtyp = NULLSTR;
+
+    //Object INR
+    private String objinr = NULLSTR;
+
+    //Amount
+    private BigDecimal amt = Decimals.ZERO_SCALE2;
+
+    //Currency
+    private String cur = NULLSTR;
+
+    //Last Amount
+    private BigDecimal lstamt = Decimals.ZERO_SCALE2;
+
+    //Object Reference
+    private String objref = NULLSTR;
+
+    //Party INR
+    private String ptyinr = NULLSTR;
+
+    //Release Date
+    private Date reldat = NULLDATE;
+}
\ No newline at end of file

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/bo/model/Fxacbs.java

+package com.brilliance.isc.bo.model;
+
+import com.brilliance.isc.bo.Cbb;
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Fxacbs extends AbstractCommonVo {
+
+    private Cbb max;
+
+    private Cbb nom1;
+
+
+    private Cbb opn1;
+
+    private Cbb opn2;
+
+    @Override
+    public void reset() {
+        super.reset();
+        if (max == null) {
+            max = new Cbb();
+        }
+        if (nom1 == null) {
+            nom1 = new Cbb();
+        }
+        if (opn1 == null) {
+            opn1 = new Cbb();
+        }
+        if (opn2 == null) {
+            opn2 = new Cbb();
+        }
+    }
+}

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

+package com.brilliance.isc.bo.model;
+
+import com.brilliance.isc.bo.Fxd;
+import com.brilliance.isc.bo.Fxt;
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.brilliance.isc.common.vo.PtsptaVo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+/**
+ * @program: isc-core
+ * @ClassName: Fxdgrp
+ * @description: fxdgrp bo
+ * @author: huangshunlin
+ * @create: 2024-10-09 11:23
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Fxdgrp extends AbstractCommonVo {
+
+    private Fxd rec;
+
+    private Fxt blk;
+
+    private Fxacbs cbs;
+
+    private PtsptaVo apl;
+
+    private PtsptaVo act;
+
+    private PtsptaVo age;
+
+    private PtsptaVo acc;
+
+    @Override
+    public void reset() {
+        super.reset();
+        if (rec == null) {
+            rec = new Fxd();
+        }
+        if (blk == null) {
+            blk = new Fxt();
+        }
+        if (cbs == null) {
+            cbs = new Fxacbs();
+        }
+        cbs.reset();
+        if (apl == null) {
+            apl = new PtsptaVo();
+        }
+        apl.reset();
+        if (act == null) {
+            act = new PtsptaVo();
+        }
+        act.reset();
+        if (age == null) {
+            age = new PtsptaVo();
+        }
+        age.reset();
+        if (acc == null) {
+            acc = new PtsptaVo();
+        }
+        acc.reset();
+
+    }
+}

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

+package com.brilliance.isc.bo.model;
+
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
+
+/**
+ *
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Fxtp extends AbstractCommonVo {
+    private static Logger log = LoggerFactory.getLogger(Fxtp.class);
+
+    //Amount Label (max=30)
+    private String amtlab = NULLSTR;
+    //Amount LabelCNY (max=30)
+    private String cnylab = NULLSTR;
+    //Quote Flag (max=1)
+    private String quoflg = NULLSTR;
+    //钞汇标志 (max=1)
+    private String cshflg = NULLSTR;
+    //Calculate (max=1)
+    private String calflg = NULLSTR;
+    //外币 (max=1)
+    private String frgchk = NULLSTR;
+    //人民币 (max=1)
+    private String cnychk = NULLSTR;
+
+
+    @Override
+    public void reset() {
+        super.reset();
+    }
+}
\ No newline at end of file

isc-common-core/src/main/java/com/brilliance/isc/bo/model/Mt30m.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.omg.CORBA.PRIVATE_MEMBER;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Mt30m extends AbstractCommonVo {
+    private static Logger log = LoggerFactory.getLogger(Mt30m.class);
+
+    //Status E-nable, D-isable, I-nvisible
+    private  String pansta = null;
+    //MT300 22A - 报文功能
+    private  String s22a = null;
+    //MT300 94A - 业务范�'
+    private  String s94a = null;
+    //MT300 22C - 共同参号
+    private  String conref = null;
+    //MT300 17T - 打包交易指示
+    private  String s17t = null;
+    //MT300 17U - 分笔结算指示
+    private  String s17u = null;
+    //Delivery Agent Account
+    private  String a53act = null;
+    //Intermediary Account
+    private  String iniact = null;
+    //Receiving Agent Account
+    private  String rbcact = null;
+    //Delivery Agent Account
+    private  String b53act = null;
+    //Intermediary Account
+    private  String b56act = null;
+    //Receiving Agent Account
+    private  String owcact = null;
+    //Beneficiary Institution Account
+    private  String b58act = null;
+    //Contact Information
+    private  String coninf = null;
+    //Dealing Method
+    private  String deamet = null;
+    //Dealing Method Text
+    private  String deamettxt = null;
+    //Dealing MethodMT300 24D
+    private  String s24d = null;
+    //Broker's Commission Cur.
+    private  String comcur = null;
+    //Broker's Commission Amount
+    private BigDecimal comamt = Decimals.ZERO_SCALE3;
+    //Counterparty's Reference
+    private  String ctpref = null;
+    //Broker's Reference
+    private  String c88ref = null;
+    //Sender to Receiver Information
+    private  String str300 = null;
+    //Event Type
+    private  String enttyp = null;
+    //Reference
+    private  String sndref = null;
+    //Underlying Liability Reference
+    private  String unlref = null;
+    //Profit and Loss Srttlement Date
+    @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
+    private Date plsdat;
+    //Profit and Loss Settlement Amount CUR
+    private  String plscur = null;
+    //Profit and Loss Settlement Amount
+    private  BigDecimal plsamt = Decimals.ZERO_SCALE3;
+    //Outstanding Settlement Amount CUR
+    private  String ouscur = null;
+    //Outstanding Settlement Amount
+    private  BigDecimal ousamt = Decimals.ZERO_SCALE3;
+
+//    private Ptsp b58p;
+//
+//    private Ptsp b53p;
+//
+//    private Ptsp owcp;
+//
+//    private Ptsp b56p;
+//
+//    private Ptsp rbcp;
+//
+//    private Ptsp inip;
+//
+//    private Ptsp a53p;
+
+    private PtsptaVo b58;
+
+    private PtsptaVo b53;
+
+    private PtsptaVo owc;
+
+    private PtsptaVo b56;
+
+    private PtsptaVo rbc;
+
+    private PtsptaVo ini;
+
+    private PtsptaVo a53;
+
+    private PtsptaVo c84;
+
+    private PtsptaVo c85;
+
+    private PtsptaVo c88;
+
+    //private Ptsp c84p;
+
+    //private Ptsp c85p;
+
+    //private Ptsp c88p;
+
+    @Override
+    public void reset() {
+        super.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/java/com/brilliance/isc/mda/dao/FxdMapper.java

 package com.brilliance.isc.mda.dao;
 
 import com.brilliance.isc.bo.Fxd;
+import com.brilliance.isc.bo.Lid;
+import com.brilliance.isc.vo.funds.FxdWithPtsCbbResponseVo;
+import com.brilliance.isc.vo.funds.FxtselQueryVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.Collection;
 import java.util.List;
@@ -31,4 +35,12 @@ public interface FxdMapper {
 
     List<Fxd> dyncRead(Map<String, Object> dyncMap);
 
+    List<FxdWithPtsCbbResponseVo> queryFxd(FxtselQueryVo fxtselQueryVo);
+
+    List<FxdWithPtsCbbResponseVo> queryFxdInfo(FxtselQueryVo fxtselQueryVo);
+
+    Fxd selectByInr(@Param("inr") String inr);
+
+    Fxd selectByOwnref(String ownref);
+
 }
\ No newline at end of file

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

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

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

+package com.brilliance.isc.vo.funds;
+
+import com.brilliance.isc.common.vo.BizAmdInfoVo;
+import lombok.Data;
+
+/**
+ * @program: isc-core
+ * @ClassName: FxdBizAmdInfoVo
+ * @description: fxd 修改业务数据
+ * @author: huangshunlin
+ * @create: 2024-10-09 17:40
+ */
+@Data
+public class FxdBizAmdInfoVo extends BizAmdInfoVo {
+}

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

+package com.brilliance.isc.vo.funds;
+
+import com.brilliance.isc.common.vo.BizInfoVo;
+import com.brilliance.mda.runtime.mda.util.Decimals;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
+
+/**
+ * @program: isc-core
+ * @ClassName: FxdBizInfoVo
+ * @description: fxd业务数据
+ * @author: huangshunlin
+ * @create: 2024-10-09 17:40
+ */
+@Data
+public class FxdBizInfoVo extends BizInfoVo {
+    //结售汇类型  fxdgrp.rec.fxtyp
+    private String fxtyp = NULLSTR;
+
+    /**
+     * fxdgrp.rec.dsp  结售汇业务的外币的记账账号类型
+     * LO客户往来账户以及SP国际结算过渡账户2个选项
+     */
+    private String dsp = NULLSTR;
+
+    // 结售汇业务的外币的记账账号 fxdgrp.rec.acc
+    private String acc = NULLSTR;
+
+    //fxdgrp.rec.dsp2
+    private String dsp2 = NULLSTR;
+    ;
+
+    //结售汇业务的本币的记账账号 fxdgrp.rec.acc2
+    private String acc2 = NULLSTR;
+
+    //Rate
+    private BigDecimal rat = Decimals.ZERO_SCALE6;
+    //交易主体
+    private String trnman = NULLSTR;
+
+    //TRADE IN
+    private String trdint = NULLSTR;
+
+    //TRADE OUT
+    private String trdout = NULLSTR;
+
+    private String swtflg = NULLSTR;
+}

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

+package com.brilliance.isc.vo.funds;
+
+import com.brilliance.isc.bo.Fxd;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class FxdWithPtsCbbResponseVo extends Fxd {
+
+    /**
+     * 币种
+     */
+    private String maxcur;
+    /**
+     * 折算币种
+     */
+    private String nomcur;
+
+    /**
+     * 开立金额
+     */
+    private BigDecimal maxamt;
+
+    /**
+     * 折算开立金额
+     */
+    private BigDecimal nomamt;
+
+
+    /**
+     * 客户号
+     */
+    private String aplExtkey;
+
+    /**
+     * 客户名称
+     */
+    private String aplName;
+
+
+
+
+}
+

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

+package com.brilliance.isc.vo.funds;
+
+import com.brilliance.isc.bo.Bch;
+import com.brilliance.isc.common.vo.CommonResult;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 进口信用证入口交易查询条件字段
+ */
+@Data
+public class FxtselQueryVo 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/ini/intace.ini

@@ -37,7 +37,7 @@ srvnam0=account
 mode0=s
 code0=7759
 fgf0=|
-open0=Y
+open0=S
 
 [RBACCOUNT]
 srvnam0=account
@@ -63,7 +63,7 @@ srvnam0=account
 mode0=s
 code0=8760
 fgf0=|
-open0=Y
+open0=S
 
 [RBQIN]
 srvnam0=account

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>
+    <!--在gzno后加,cbb.cur,cbb.amt-->
+    <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>
+
+    <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>-->
+
+
+
+
+
+
+<!--        <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

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/fxdmapper.xml

@@ -292,6 +292,97 @@
         ${sql}
     </select>
 
+
+    <select id="queryFxd" resultType="com.brilliance.isc.vo.funds.FxdWithPtsCbbResponseVo">
+            select
+            fxd.*,
+            max1.cur maxcur,max1.amt maxamt,
+            nom1.cur nomcur,nom1.amt nomamt,
+
+            pty.extkey aplExtkey,pty.nam1 aplName
+
+            from fxd
+
+            left join cbb max1 on max1.OBJINR = fxd.inr and max1.OBJTYP = 'FXD' and max1.cbc = 'MAXSUM' and max1.extid =
+            'AMT1' and max1.enddat = '2299-12-31'
+
+            left join cbb nom1 on nom1.OBJINR = fxd.inr and nom1.OBJTYP = 'FXD' and nom1.cbc = 'NOMSUM' and nom1.extid =
+            'AMT1' and nom1.enddat = '2299-12-31'
+
+            left join pts on pts.OBJINR = fxd.inr and pts.OBJTYP = 'FXD' and pts.rol = 'APL'
+
+            left join pty pty on pty.inr = pts.ptyinr
+            <!--开立状态-->
+            where 1 = 1
+            <!--业务品种-->
+            <if test="fxtypList != null and fxtypList.size() > 0">
+                and fxd.fxtyp in
+                <foreach item="item" collection="fxtypList" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+
+            </if>
+            <!--业务编号-->
+            <if test="seaownref != null and seaownref != ''">
+                AND UPPER(fxd.OWNREF) LIKE concat(concat('%', UPPER(#{seaownref})), '%')
+            </if>
+            <!--日期-->
+            <!--日期-->
+            <if test="opndatfrom != null and opndatfrom != ''">
+                AND fxd.opndat &gt;= #{opndatfrom}
+            </if>
+            <if test="opndatto != null and opndatto != ''">
+                AND fxd.opndat &lt;= #{opndatto}
+            </if>
+            <!--客户号/名称 -->
+            <if test="searef != null and searef != ''">
+                and exists (
+                select 1 from PTS,PTY
+                where fxd.INR = PTS.OBJINR
+                AND PTY.INR = PTS.PTYINR
+                AND PTS.OBJTYP = 'FXD'
+                AND PTS.ROL = 'APL'
+                AND (
+                PTS.EXTKEY LIKE concat(concat('%', #{searef}), '%')
+                or replace(PTS.NAM,'\n',' ') LIKE concat(concat('%', #{searef}), '%')
+                or PTS.CNNAM LIKE concat(concat('%', #{searef}), '%')
+                or PTS.ENNAM LIKE concat(concat('%', #{searef}), '%')
+                or PTY.NAM LIKE concat(concat('%', #{searef}), '%')
+                )
+                )
+            </if>
+            <!--是否闭卷 -->
+            <if test="isClosed != null and isClosed != ''">
+                <if test="isClosed == 'Y'.toString()">
+                    and fxd.clsdat is not null
+                </if>
+                <if test="isClosed == 'N'.toString()">
+                    and fxd.clsdat is null
+                </if>
+            </if>
+
+            order by fxd.opndat desc , fxd.ownref desc
+        </select>
+
+
+
+    <select id="selectByInr" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from fxd
+        where inr = #{inr,jdbcType=VARCHAR}
+    </select>
+
+    <select id="selectByOwnref" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from fxd
+        where ownref = #{ownref}
+    </select>
+    <select id="queryFxdInfo" resultType="com.brilliance.isc.vo.funds.FxdWithPtsCbbResponseVo">
+
+    </select>
+
 </mapper>
 
 

isc-common-core/src/main/resources/mapper/setstamapper.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.SetstaMapper">
+
+    <resultMap id="BaseResultMap" type="com.brilliance.isc.bo.Setsta">
+        <result property="inr" column="inr" jdbcType="VARCHAR"/>
+        <result property="objtyp" column="objtyp" jdbcType="VARCHAR"/>
+        <result property="objtyp" column="objtyp" jdbcType="VARCHAR"/>
+        <result property="amt" column="amt" jdbcType="DECIMAL"/>
+        <result property="cur" column="cur" jdbcType="VARCHAR"/>
+        <result property="lstamt" column="lstamt" jdbcType="DECIMAL"/>
+        <result property="objref" column="objref" jdbcType="VARCHAR"/>
+        <result property="ptyinr" column="ptyinr" jdbcType="VARCHAR"/>
+        <result property="reldat" column="reldat" jdbcType="DATE"/>
+    </resultMap>
+
+
+    <sql id="Base_Column_List">
+        inr,objtyp,objinr,amt,cur,lstamt,objref,ptyinr,reldat
+    </sql>
+
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from setsta
+        where inr = #{inr,jdbcType=VARCHAR}
+    </select>
+
+    <delete id="deleteByPrimaryKey">
+         delete from setsta
+         where inr = #{inr,jdbcType=VARCHAR}
+     </delete>
+
+    <insert id="insert">
+        insert into setsta (<include refid="Base_Column_List"/>)
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            #{inr,jdbcType=VARCHAR},
+            #{objtyp,jdbcType=VARCHAR},
+            #{objinr,jdbcType=VARCHAR},
+            #{amt,jdbcType=DECIMAL},
+            #{cur,jdbcType=VARCHAR},
+            #{lstamt,jdbcType=DECIMAL},
+            #{objref,jdbcType=VARCHAR},
+            #{ptyinr,jdbcType=VARCHAR},
+            #{reldat,jdbcType=DATE},
+        </trim>
+    </insert>
+    <!--    inr,objtyp,objinr,amt,cur,lstamt,objref,ptyinr,reldat-->
+
+    <insert id="insertSelective">
+        insert into setsta
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="inr != null">inr,</if>
+            <if test="objtyp != null">objtyp,</if>
+            <if test="objinr != null">objinr,</if>
+            <if test="amt != null">amt,</if>
+            <if test="cur != null">cur,</if>
+            <if test="lstamt != null">lstamt,</if>
+            <if test="objref != null">objref,</if>
+            <if test="ptyinr != null">ptyinr,</if>
+            <if test="reldat != null">reldat,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="inr != null">#{inr,jdbcType=VARCHAR},</if>
+            <if test="objtyp != null">#{objtyp,jdbcType=VARCHAR},</if>
+            <if test="objinr != null">#{objinr,jdbcType=VARCHAR},</if>
+            <if test="amt != null">#{amt,jdbcType=DECIMAL},</if>
+            <if test="cur != null">#{cur,jdbcType=VARCHAR},</if>
+            <if test="lstamt != null">#{lstamt,jdbcType=DECIMAL},</if>
+            <if test="objref != null">#{objref,jdbcType=VARCHAR},</if>
+            <if test="ptyinr != null">#{ptyinr,jdbcType=VARCHAR},</if>
+            <if test="reldat != null">#{reldat,jdbcType=DATE},</if>
+        </trim>
+    </insert>
+
+    <update id="updateByPrimaryKeySelective">
+        update setsta
+        <set>
+            <if test="objtyp != null">objtyp = #{objtyp,jdbcType=VARCHAR},</if>
+            <if test="objinr != null">objinr = #{objinr,jdbcType=VARCHAR},</if>
+            <if test="amt != null">amt = #{amt,jdbcType=DECIMAL},</if>
+            <if test="cur != null">cur = #{cur,jdbcType=VARCHAR},</if>
+            <if test="lstamt != null">lstamt = #{lstamt,jdbcType=DECIMAL},</if>
+            <if test="objref != null">objref = #{objref,jdbcType=VARCHAR},</if>
+            <if test="ptyinr != null">ptyinr = #{ptyinr,jdbcType=VARCHAR},</if>
+            <if test="reldat != null">reldat = #{reldat,jdbcType=DATE},</if>
+        </set>
+        where inr = #{inr,jdbcType=VARCHAR}
+    </update>
+
+    <update id="updateByPrimaryKey">
+        update setsta
+        <set>
+            objtyp = #{objtyp,jdbcType=VARCHAR},
+            objinr = #{objinr,jdbcType=VARCHAR},
+            amt = #{amt,jdbcType=DECIMAL},
+            cur = #{cur,jdbcType=VARCHAR},
+            lstamt = #{lstamt,jdbcType=DECIMAL},
+            objref = #{objref,jdbcType=VARCHAR},
+            ptyinr = #{ptyinr,jdbcType=VARCHAR},
+            reldat = #{reldat,jdbcType=DATE},
+        </set>
+        where inr = #{inr,jdbcType=VARCHAR}
+    </update>
+
+    <delete id="deleteByIds">
+        delete from setsta where inr in
+        <foreach item="item" index="index" collection="collection" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <update id="dyncUpdate">
+        update setsta
+        <set>
+            <if test="module.objtyp != null">objtyp = #{module.objtyp,jdbcType=VARCHAR},</if>
+            <if test="module.objinr != null">objinr = #{module.objinr,jdbcType=VARCHAR},</if>
+            <if test="module.amt != null">amt = #{module.amt,jdbcType=DECIMAL},</if>
+            <if test="module.cur != null">cur = #{module.cur,jdbcType=VARCHAR},</if>
+            <if test="module.lstamt != null">lstamt = #{module.lstamt,jdbcType=DECIMAL},</if>
+            <if test="module.objref != null">objref = #{module.objref,jdbcType=VARCHAR},</if>
+            <if test="module.ptyinr != null">ptyinr = #{module.ptyinr,jdbcType=VARCHAR},</if>
+            <if test="module.reldat != null">reldat = #{module.reldat,jdbcType=DATE},</if>
+        </set>
+        ${conditions}
+    </update>
+
+    <delete id="dyncDelete">
+         ${sql}
+     </delete>
+
+    <select id="dyncRead" resultMap="BaseResultMap">
+         ${sql}
+     </select>
+
+    <select id="getSumAmtByPtyinrAndCur" resultType="java.math.BigDecimal">
+        SELECT SUM(amt) FROM SETSTA WHERE ptyinr =#{ptyinr} and cur =#{cur}
+    </select>
+
+    <select id="getSumLstamtByPtyinrAndCur" resultType="java.math.BigDecimal">
+        SELECT SUM(lstamt) FROM SETSTA WHERE ptyinr =#{ptyinr} and cur =#{cur}
+    </select>
+</mapper>
+
+

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

@@ -45,6 +45,10 @@
         <result property="chlflg" column="chlflg" jdbcType="VARCHAR"/>
         <result property="orimsgtyp" column="orimsgtyp" jdbcType="VARCHAR"/>
         <result property="mpiinr" column="mpiinr" jdbcType="VARCHAR"/>
+        <result property="xxxcnt" column="xxxcnt" jdbcType="INTEGER"/>
+        <result property="docmd5" column="docmd5" jdbcType="VARCHAR"/>
+        <result property="doclen" column="doclen" jdbcType="NUMERIC"/>
+
     </resultMap>
 
 
@@ -60,7 +64,7 @@
 <!--    </resultMap>-->
 
     <sql id="Base_Column_List">
-        inr,objtyp,objinr,trntyp,trninr,trnsub,extkey,nam,creusr,crefrm,credattim,dir,docpth,docfil,docfxt,docmac,msgpos,msglen,grpinr,grpseq,cortyp,cortypsub,apf,sndkey,apfcnt,ptainr,oriflg,orismhinr,partflg,msgtyp,relcur,relamt,stp,etyextkey,sysno,staflg,clndat,f20,chlflg,orimsgtyp,mpiinr
+        inr,objtyp,objinr,trntyp,trninr,trnsub,extkey,nam,creusr,crefrm,credattim,dir,docpth,docfil,docfxt,docmac,msgpos,msglen,grpinr,grpseq,cortyp,cortypsub,apf,sndkey,apfcnt,ptainr,oriflg,orismhinr,partflg,msgtyp,relcur,relamt,stp,etyextkey,sysno,staflg,clndat,f20,chlflg,orimsgtyp,mpiinr,xxxcnt,docmd5,doclen
     </sql>
 
     <select id="selectByPrimaryKey" resultMap="BaseResultMap">
@@ -120,6 +124,9 @@
             #{chlflg,jdbcType=VARCHAR},
             #{orimsgtyp,jdbcType=VARCHAR},
             #{mpiinr,jdbcType=VARCHAR},
+            #{xxxcnt,jdbcType=INTEGER},
+            #{docmd5,jdbcType=VARCHAR},
+            #{doclen,jdbcType=NUMERIC},
         </trim>
     </insert>
 
@@ -167,6 +174,9 @@
             <if test="chlflg != null">chlflg,</if>
             <if test="orimsgtyp != null">orimsgtyp,</if>
             <if test="mpiinr != null">mpiinr,</if>
+            <if test="xxxcnt != null">xxxcnt,</if>
+            <if test="docmd5 != null">docmd5,</if>
+            <if test="doclen != null">doclen,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="inr != null">#{inr,jdbcType=VARCHAR},</if>
@@ -210,6 +220,9 @@
             <if test="chlflg != null">#{chlflg,jdbcType=VARCHAR},</if>
             <if test="orimsgtyp != null">#{orimsgtyp,jdbcType=VARCHAR},</if>
             <if test="mpiinr != null">#{mpiinr,jdbcType=VARCHAR},</if>
+            <if test="xxxcnt != null">#{xxxcnt,jdbcType=INTEGER},</if>
+            <if test="docmd5 != null">#{docmd5,jdbcType=VARCHAR},</if>
+            <if test="doclen != null">#{doclen,jdbcType=NUMERIC},</if>
         </trim>
     </insert>
 
@@ -256,6 +269,9 @@
             <if test="chlflg != null">chlflg = #{chlflg,jdbcType=VARCHAR},</if>
             <if test="orimsgtyp != null">orimsgtyp = #{orimsgtyp,jdbcType=VARCHAR},</if>
             <if test="mpiinr != null">mpiinr = #{mpiinr,jdbcType=VARCHAR},</if>
+            <if test="xxxcnt != null">xxxcnt = #{xxxcnt,jdbcType=INTEGER},</if>
+            <if test="docmd5 != null">docmd5 = #{docmd5,jdbcType=VARCHAR},</if>
+            <if test="doclen != null">doclen = #{doclen,jdbcType=NUMERIC},</if>
         </set>
         where inr = #{inr,jdbcType=VARCHAR}
     </update>
@@ -303,6 +319,9 @@
             chlflg = #{chlflg,jdbcType=VARCHAR},
             orimsgtyp = #{orimsgtyp,jdbcType=VARCHAR},
             mpiinr = #{mpiinr,jdbcType=VARCHAR},
+            xxxcnt = #{xxxcnt,jdbcType=INTEGER},
+            docmd5 = #{docmd5,jdbcType=VARCHAR},
+            doclen = #{doclen,jdbcType=NUMERIC},
         </set>
         where inr = #{inr,jdbcType=VARCHAR}
     </update>
@@ -356,7 +375,10 @@
             <if test="module.f20 != null">f20 = #{module.f20,jdbcType=VARCHAR},</if>
             <if test="module.chlflg != null">chlflg = #{module.chlflg,jdbcType=VARCHAR},</if>
             <if test="module.orimsgtyp != null">orimsgtyp = #{module.orimsgtyp,jdbcType=VARCHAR},</if>
-            <if test="module.mpiinr != null">orimsgtyp = #{module.mpiinr,jdbcType=VARCHAR},</if>
+            <if test="module.mpiinr != null">mpiinr = #{module.mpiinr,jdbcType=VARCHAR},</if>
+            <if test="module.xxxcnt != null">xxxcnt = #{module.xxxcnt,jdbcType=INTEGER},</if>
+            <if test="module.docmd5 != null">docmd5 = #{module.docmd5,jdbcType=VARCHAR},</if>
+            <if test="module.doclen != null">doclen = #{module.doclen,jdbcType=NUMERIC},</if>
         </set>
         ${conditions}
     </update>
@@ -441,6 +463,9 @@
         <if test="chlflg != null">and chlflg = #{chlflg,jdbcType=VARCHAR}</if>
         <if test="orimsgtyp != null">and orimsgtyp = #{orimsgtyp,jdbcType=VARCHAR}</if>
         <if test="mpiinr != null">and mpiinr = #{mpiinr,jdbcType=VARCHAR}</if>
+        <if test="xxxcnt != null">and xxxcnt = #{xxxcnt,jdbcType=INTEGER}</if>
+        <if test="docmd5 != null">and docmd5 = #{docmd5,jdbcType=VARCHAR}</if>
+        <if test="doclen != null">and doclen = #{doclen,jdbcType=NUMERIC}</if>
     </select>
 
     <select id="selectRelationSmh" resultMap="BaseResultMap">

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

@@ -163,7 +163,7 @@
 
     <select id="selectRefByTrninr" resultType="java.lang.String">
         select
-        concat(INIFRM ,'-',OWNREF) REF
+        concat(INIFRM ,'-',OWNREF) "REF"
         from trn
         where inr in (select prvinr from tro where TRNINR= #{trninr} )
         and relflg != 'R' and relflg != 'F'  and relflg != 'A'
@@ -173,7 +173,7 @@
 
     <select id="selectRefByPrvinr" resultType="java.lang.String">
         select
-            concat(INIFRM ,'-',OWNREF) REF
+            concat(INIFRM ,'-',OWNREF) "REF"
         from trn
         where inr in (select trninr from tro where prvinr= #{trninr} )
         and relflg != 'R'

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

@@ -187,8 +187,11 @@
         AND objinr = #{objinr,jdbcType=VARCHAR}
     </select>
     <select id="selectAllUsrByTrninr" resultType="String">
-        SELECT GROUP_CONCAT(DISTINCT usr) usrs FROM trs where objtyp='TRN' AND objinr =#{objinr,jdbcType=VARCHAR} GROUP BY objinr
+        SELECT LISTAGG(DISTINCT usr,',') usrs FROM trs where objtyp='TRN' AND objinr =#{objinr,jdbcType=VARCHAR} GROUP BY objinr
     </select>
+    <!--<select id="selectAllUsrByTrninr" resultType="String">
+        SELECT GROUP_CONCAT(DISTINCT usr) usrs FROM trs where objtyp='TRN' AND objinr =#{objinr,jdbcType=VARCHAR} GROUP BY objinr
+    </select>-->
     <select id="selectByObjtypAndObjinrAndSigidx" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>

isc-common-service/src/main/java/com/brilliance/isc/common/cbsmod/service/XrtmodService.java

@@ -64,17 +64,21 @@ public interface XrtmodService {
 
     void getRateXrt(String argCur, String basCur, boolean ininFlg, String typ, Date value, Argument<BigDecimal> rat, Argument<BigDecimal> sqrRat);
 
-    void getrat(String fromCur,String toCur,String typ,Date value,Argument<BigDecimal> rat,Argument<BigDecimal> sqrRat);
+    void getrat(String fromCur, String toCur, String typ, Date value, Argument<BigDecimal> rat, Argument<BigDecimal> sqrRat);
 
-    public BigDecimal amtcnv(BigDecimal amt,BigDecimal rat,String fromcur,String tocur);
+    public BigDecimal amtcnv(BigDecimal amt, BigDecimal rat, String fromcur, String tocur);
 
     boolean isCurrencyValid(String inCur);
 
-    void xrtCheckRate(BigDecimal argRate,String argCur,Date argValue);
+    void xrtCheckRate(BigDecimal argRate, String argCur, Date argValue);
 
     List<CodetableItem> validCurrencies();
 
-    void getratForENT(String fromCur,String fromTyp,String toCur,String toTyp,Date value,Argument<BigDecimal> rat,Argument<BigDecimal> sqrRat);
+    void getratForENT(String fromCur, String fromTyp, String toCur, String toTyp, Date value, Argument<BigDecimal> rat, Argument<BigDecimal> sqrRat);
 
     String validCurrencies(Date value);
+
+    //黑龙江版本比上面的多一个参数
+    void getratCebTim(String fromcur, String tocur, Date value, Argument<String> rmbrat, Argument<BigDecimal> brate, Argument<BigDecimal> srate, Argument<BigDecimal> mrate, Argument<BigDecimal> cbrate);
+
 }

isc-common-service/src/main/java/com/brilliance/isc/common/setglg/service/SetglgService.java

@@ -126,4 +126,6 @@ public interface SetglgService {
     String calcMaceog(SetmodVo setmodVo);
 
     Set<String> getFixDspflagSet();
+
+    void setSettlementDetails(SetglgVo setglg, String setTyp,String rol,String trnMan,String trdTyp);
 }

isc-common-service/src/main/java/com/brilliance/isc/common/setmod/service/SetmodService.java

@@ -46,17 +46,20 @@ public interface SetmodService {
 
     /**
      * 判断指定日期是否是节假日
+     *
      * @param cur
      * @param date
      * @return
      */
     boolean isHoliday(String cur, Date date);
 
-    /**指定日期增加天数或者减少天数
+    /**
+     * 指定日期增加天数或者减少天数
+     *
      * @param cur
      * @param beginDate
      * @param days
-     * @param workday  是否避开节假日
+     * @param workday   是否避开节假日
      * @return
      */
     Date addDays(String cur, Date beginDate, int days, boolean workday);
@@ -137,4 +140,7 @@ public interface SetmodService {
 
     void saveFale01(SetmodVo setmodVo);
 
-    void updateSetfelObjmod(List<SetfelVo> setfels, String feecod, SimpleModuleVo linkModule);}
+    void updateSetfelObjmod(List<SetfelVo> setfels, String feecod, SimpleModuleVo linkModule);
+
+    BigDecimal getSettlementAmount(SetmodVo setmodVo, String argCur);
+}

isc-common-service/src/main/java/com/brilliance/isc/common/sysmod/SysmodService.java

@@ -6,6 +6,7 @@ import com.brilliance.isc.bo.Pty;
 import com.brilliance.isc.bo.Spt;
 import com.brilliance.isc.bo.Trn;
 import com.brilliance.isc.common.transaction.vo.BaseTransactionVo;
+import com.brilliance.isc.common.vo.BizInfoVo;
 import com.brilliance.isc.common.vo.PtsptaVo;
 import com.brilliance.mda.runtime.mda.impl.Argument;
 
@@ -159,4 +160,11 @@ public interface SysmodService {
     boolean sptIsPenLoaded(String sptState);
 
     boolean sptIsCorLoaded(String sptState);
+
+    String getRef(String stRnTbl, int nLen);
+
+    void getPtyAccMng(String ptyinr, String argPtspta, String rol, String fileds, Argument<String> accmng, Argument<String> hdbch);
+
+    String getClientPath(String objtyp, BizInfoVo bizInfoVo);
+
 }

isc-common-service/src/main/java/com/brilliance/isc/common/util/Utils.java

@@ -141,7 +141,8 @@ public class Utils {
         //   根据选择的账户类型返回账户类型代码
         //
         //  -----------------------------
-        String dsp = type.substring(0, 2);
+//        String dsp = type.substring(0, 2);
+        String dsp = Strings.mid(type, 0, 2);
         if (MdaUtils.compareTo(dsp, "PA") == 0) {
             dsp = "SP";
         }
@@ -626,8 +627,8 @@ public class Utils {
             return amtStr.replace(pointSuffiex, ",");
         } else {
             // JPY1300 -> JPY1300,
-            if (amtStr.indexOf(".") == -1){
-                return amtStr+",";
+            if (amtStr.indexOf(".") == -1) {
+                return amtStr + ",";
             } else {
                 return amtStr.replace(".", ",");//like 1000.01 -> 1000,01
             }
@@ -660,7 +661,7 @@ public class Utils {
         //! Corresponding functions: AddExtensionToName, AddNodeToPath, GetLastNode, Basename (TradeDesign function), GetFileExtension, GetNormalizedNodename
         // search for a backslash starting at the end
         String chr = NULLSTR;
-        for (int idx = Strings.len(argPth); idx >= 1; idx --) {
+        for (int idx = Strings.len(argPth); idx >= 1; idx--) {
             chr = Strings.mid(argPth, idx, 1);
             if (MdaUtils.compareTo(chr, "\\") == 0 || MdaUtils.compareTo(chr, "/") == 0) {
                 if (idx > 1) {
@@ -1236,10 +1237,10 @@ public class Utils {
             field.setAccessible(true);
             if (idx > 0) {
                 Object subObject = field.get(object);
-                if(subObject instanceof Collection){
+                if (subObject instanceof Collection) {
                     subObject = CollectionUtils.get(subObject, 0);
-                }else if(subObject instanceof Object[]){
-                    subObject = Array.get(subObject,0);
+                } else if (subObject instanceof Object[]) {
+                    subObject = Array.get(subObject, 0);
                 }
                 return getTargetFieldByPath(subObject, path.substring(idx + 1));
             } else {