Merge remote-tracking branch 'origin/develop' into develop

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

+package com.brilliance.isc.bo;
+
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.util.Date;
+
+import static com.brilliance.mda.runtime.mda.Constants.NULLDATE;
+import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
+
+
+/**
+ * TABLE:crd:
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Crd extends AbstractCommonVo {
+
+
+    //Internal Unique ID of Import L/C (max = 16)
+    private String inr = NULLSTR;
+
+    //Reference (max = 16)
+    private String ownref = NULLSTR;
+
+    //Externally Displayed Name to Identify the Contract (max = 40)
+    private String nam = NULLSTR;
+
+    //Responsible User (max = 8)
+    private String ownusr = NULLSTR;
+
+    //Date of Creation Opening or Registry
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date credat = NULLDATE;
+
+    //Date L/C Opened/Issued
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date opndat = NULLDATE;
+
+    //Date L/C Closed
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+
+    private Date clsdat = NULLDATE;
+
+    //Object Type of Associated Contract Optional  (max =6)
+    private String rcvobjtyp = NULLSTR;
+
+    //Object INR of Associated Contract Optional (max =8)
+    private String rcvobjinr = NULLSTR;
+
+    //Clearing Type  (max =1) I:Clearing In  ;O:Clearing Out
+    private String clrtyp = NULLSTR;
+
+    /*
+        Transaction Type  (max =1)
+        贸易 0
+        非贸易 1
+        资本 2
+        其他 3
+     */
+    private String trntyp = NULLSTR;
+
+    //Receiver BIC  (max =12)
+    private String rcvbic = NULLSTR;
+
+    //Message ReferenceTag21  (max =16)
+    private String msgref = NULLSTR;
+
+    //Account in MessageTag59  (max =21)
+    private String msgact = NULLSTR;
+
+    //Message Type  (max =3)
+    private String msgtyp = NULLSTR;
+
+    //Message InrSMH  (max =8)
+    private String msginr = NULLSTR;
+
+    //Bound Message Type  (max =8)
+    private String bndtyp = NULLSTR;
+
+    //Bound Message INRSMH   (max =8)
+    private String bndinr = NULLSTR;
+
+    //Status  (max =1)
+    private String sta = NULLSTR;
+
+    //Error Message  (max =40)
+    private String errmsg = NULLSTR;
+
+    //Customer Type  (max =1)  1:对私 0:对公
+    private String custyp = NULLSTR;
+
+    //BRANCHINR (max =8)
+    private String branchinr = NULLSTR;
+
+    //BRANCH CODE KEYINR  (max =8)
+    private String bchkeyinr = NULLSTR;
+
+    //Receiver Branch Inr  (max =8)
+    private String rcvbchinr = NULLSTR;
+
+    //Version Counter  (max =4)
+    private String ver = NULLSTR;
+
+    //Inr for SPT  (max =8)
+    private String sptinr = NULLSTR;
+
+    //Entity holding Contract   (max =8)
+    private String etyextkey = NULLSTR;
+
+
+}
\ No newline at end of file

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

+package com.brilliance.isc.bo;
+
+
+import com.brilliance.isc.common.vo.AbstractCommonVo;import com.brilliance.mda.runtime.mda.util.Decimals;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+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:ftd:FTD - Funds Transfer Data
+ *
+ *
+*/
+@JsonIgnoreProperties(ignoreUnknown = true)
+@Data
+public class Ftd  extends AbstractCommonVo{
+
+
+        //@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-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/Ftt.java

+package com.brilliance.isc.bo;
+
+
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Ftt {
+       //Internal Unique ID of Import L/C
+
+            private String inr = NULLSTR;
+
+            //remark
+
+            private String remark = NULLSTR;
+
+            //incoming tag 72
+
+            private String contag72 = NULLSTR;
+
+            //incoming tag 79
+
+            private String contag79 = NULLSTR;
+}

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

+package com.brilliance.isc.bo;
+
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.brilliance.mda.runtime.mda.util.Decimals;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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:fxd:
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Fxd extends AbstractCommonVo {
+
+
+    //Internal Unique ID of Import L/C
+    private String inr = NULLSTR;
+
+    //Reference
+    private String ownref = NULLSTR;
+
+    //Externally Displayed Name to Identify the Contract
+    private String nam = NULLSTR;
+
+    //Date Foreign Exchange Opened/Issued
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date opndat = NULLDATE;
+
+    //Responsible User
+    private String ownusr = NULLSTR;
+
+    //Foreign Exchange Type
+    private String fxtyp = NULLSTR;
+
+    //Rate
+    private BigDecimal rat = Decimals.ZERO_SCALE6;
+
+    //Middle Rate
+    private BigDecimal midrat = Decimals.ZERO_SCALE6;
+
+    //Quote Reference
+    private String quoref = NULLSTR;
+
+    //Fund Department Reference
+    private String fudref = NULLSTR;
+
+    //Value date
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date valdat = NULLDATE;
+
+    //Date of confirmation
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date cnfdat = NULLDATE;
+
+    //Settlement Date
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date setdat = NULLDATE;
+
+    //Settlemt date from
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date setdatfrm = NULLDATE;
+
+    //Settlement date to
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date setdatto = NULLDATE;
+
+    //Date of Closed
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date clsdat = NULLDATE;
+
+    //Version
+    private String ver = NULLSTR;
+
+    //Branch INR
+    private String branchinr = NULLSTR;
+
+    //Branch INR
+    private String bchkeyinr = NULLSTR;
+
+    //TRADE IN
+    private String trdint = NULLSTR;
+
+    //TRADE OUT
+    private String trdout = NULLSTR;
+
+    //交易主体
+    private String trnman = NULLSTR;
+
+    //Foreign Account
+    private String acc = NULLSTR;
+
+    //CNY Account
+    private String acc2 = NULLSTR;
+
+    //Clearing Department Responsible User
+    private String usr = NULLSTR;
+
+    //Disposition
+    private String dsp = NULLSTR;
+
+    //Disposition
+    private String dsp2 = NULLSTR;
+
+    //Cash cover percent
+    private BigDecimal cshpct = Decimals.ZERO_SCALE2;
+
+    //Rate
+    private BigDecimal rat1 = Decimals.ZERO_SCALE6;
+
+    //Account manager
+    private String accmng = NULLSTR;
+
+    //客户经理部门
+    private String hdbch = NULLSTR;
+
+    //Entity  KEY of Entry
+    private String etyextkey = NULLSTR;
+
+
+}
\ No newline at end of file

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

+package com.brilliance.isc.bo;
+
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
+
+
+/**
+ * TABLE:fxt:
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Fxt extends AbstractCommonVo {
+
+
+    //Internal Unique ID
+    private String inr = NULLSTR;
+
+    //Remark
+    private String remark = NULLSTR;
+
+
+}
\ No newline at end of file

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

+package com.brilliance.isc.bo;
+
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
+
+
+/**
+ * TABLE:rou:ROU - Routing
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Rou extends AbstractCommonVo {
+
+    //Internal Unique ID of ROU Routing
+    private String inr = NULLSTR;
+
+    //Priority Detail Level
+    private int pri;
+
+    //Work Group (max=6)
+    private String usg = NULLSTR;
+
+    //Product Type (max=2)
+    private String bussec = NULLSTR;
+
+    //State Code (max=2)
+    private String stacod = NULLSTR;
+
+    //Country (max=2)
+    private String cty = NULLSTR;
+
+    //Currency  (max=3)
+    private String cur = NULLSTR;
+
+    //Entity owning routing entry  (max=8)
+    private String etyextkey = NULLSTR;
+
+    //Work Group  (max=6)
+    private String grp = NULLSTR;
+
+    //Branch Code  (max=6)
+    private String bchcod = NULLSTR;
+
+    //TRNGRP   (max=6)
+    private String trngrp = NULLSTR;
+
+
+}
\ No newline at end of file

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

@@ -13,8 +13,6 @@ import static com.brilliance.mda.runtime.mda.Constants.NULLDATE;
 import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
 
 
-
-
 /**
  * TABLE:smh:SMH - Structured Message Header
  */
@@ -38,7 +36,7 @@ public class Smh implements Serializable {
     private String trninr = NULLSTR;
 
     //Counter within TRN
-        private  int trnsub ;
+    private int trnsub;
 
     //External Key
     private String extkey = NULLSTR;
@@ -53,7 +51,7 @@ public class Smh implements Serializable {
     private String crefrm = NULLSTR;
 
     //Timestamp Created
-        @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date credattim = NULLDATE;
 
     //Direction '>'=Outgoing, '<'=Incoming
@@ -72,16 +70,16 @@ public class Smh implements Serializable {
     private String docmac = NULLSTR;
 
     //Position of Message in Document 1=Begin of Document, 0=Whole Document
-        private  long msgpos ;
+    private long msgpos;
 
     //Length of Message in Document 0=Rest of Document
-        private  long msglen ;
+    private long msglen;
 
     //INR of the First Message of Split Messages/Secondary Messages
     private String grpinr = NULLSTR;
 
     //Sequence Number of Split Messages
-        private  int grpseq ;
+    private int grpseq;
 
     //Structure/Syntax of Message SWT, LET, TLX, TCO
     private String cortyp = NULLSTR;
@@ -132,7 +130,7 @@ public class Smh implements Serializable {
     private String staflg = NULLSTR;
 
     //文件清理日期
-        @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date clndat = NULLDATE;
 
     //ReferenceDZT
@@ -144,12 +142,15 @@ public class Smh implements Serializable {
     //原ISO报文类型
     private String orimsgtyp = NULLSTR;
 
-        private  String mpiinr=NULLSTR;
+    private String mpiinr = NULLSTR;
 
     private String docmd5 = NULLSTR;
 
-        private long doclen ;
+    private long doclen;
+
+    private int xxxcnt;
 
-        private int xxxcnt ;
 
+    //清算模块用刀的 收报行
+    private String rcvkey = NULLSTR;
 }

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

 package com.brilliance.isc.bo;
 
-import com.brilliance.mda.runtime.mda.util.Decimals;
 import com.brilliance.isc.common.json.BigDecimalSerialize;
+import com.brilliance.mda.runtime.mda.util.Decimals;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -177,4 +177,7 @@ public class Spt {
         private String cortyp= NULLSTR;
 
         private String frontchannel= NULLSTR;
+
+        //HLJ 清算模块 len=34 MT103-59 ACT
+        private String act59= NULLSTR;
 }
\ No newline at end of file

isc-common-core/src/main/java/com/brilliance/isc/bo/model/Cracbs.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;
+
+/**
+ * @program: isc-core
+ * @ClassName: Cracbs
+ * @description: 清算cbs模块
+ * @author: huangshunlin
+ * @create: 2024-10-16 20:41
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Cracbs extends AbstractCommonVo {
+
+    private Cbb max;
+
+    @Override
+    public void reset() {
+        super.reset();
+        if (max == null) {
+            max = new Cbb();
+        }
+        max.reset();
+    }
+
+}

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

+package com.brilliance.isc.bo.model;
+
+import com.brilliance.isc.bo.Crd;
+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: Crdgrp
+ * @description: 清算grp模块
+ * @author: huangshunlin
+ * @create: 2024-10-16 20:38
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Crdgrp extends AbstractCommonVo {
+
+    private Crd rec;
+
+    private Crtp crtp;
+
+    private Cracbs cbs;
+
+    private PtsptaVo snd;
+
+    private PtsptaVo rcv;
+
+    private PtsptaVo trf;
+
+    private PtsptaVo apl;
+
+    private PtsptaVo acc;
+
+    @Override
+    public void reset() {
+        if (rec == null) {
+            rec = new Crd();
+        }
+        if (crtp == null) {
+            crtp = new Crtp();
+        }
+        crtp.reset();
+        if (cbs == null) {
+            cbs = new Cracbs();
+        }
+        cbs.reset();
+
+        if (snd == null) {
+            snd = new PtsptaVo();
+        }
+        snd.reset();
+
+        if (rcv == null) {
+            rcv = new PtsptaVo();
+        }
+        rcv.reset();
+
+        if (trf == null) {
+            trf = new PtsptaVo();
+        }
+        trf.reset();
+
+        if (apl == null) {
+            apl = new PtsptaVo();
+        }
+        apl.reset();
+
+        if (acc == null) {
+            acc = new PtsptaVo();
+        }
+        acc.reset();
+
+    }
+}

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

+package com.brilliance.isc.bo.model;
+
+import com.brilliance.isc.bo.Spt;
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.brilliance.mda.runtime.mda.IStream;
+import com.brilliance.mda.runtime.mda.impl.StreamImpl;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
+
+/**
+ * @program: isc-core
+ * @ClassName: Crtmod
+ * @description: 清算crtmod
+ * @author: huangshunlin
+ * @create: 2024-10-17 18:24
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Crtmod extends AbstractCommonVo {
+    //Parameter Stream
+    private IStream parstm = new StreamImpl();
+    //Inr of SMH
+    private String smhinr = NULLSTR;
+
+
+//    private Sysobj crdobj;
+
+//    private Crdlod crdlod;
+
+    private Spt crtspt;
+
+    //    private Crtdoc crtdoc;
+    @Override
+    public void reset() {
+
+        if (crtspt == null) {
+            crtspt = new Spt();
+        }
+    }
+}

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

+package com.brilliance.isc.bo.model;
+
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+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.util.Date;
+
+import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
+
+/**
+ *
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Crtp extends AbstractCommonVo {
+    private static Logger log = LoggerFactory.getLogger(Crtp.class);
+
+    //Value Date
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date valdat;
+
+
+    //USE FOR ARE AMTOUNT (max=1)
+    private String forare = NULLSTR;
+
+
+    @Override
+    public void reset() {
+        super.reset();
+    }
+}
\ No newline at end of file

isc-common-core/src/main/java/com/brilliance/isc/bo/model/Ftacbs.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 Ftacbs extends AbstractCommonVo {
+    
+    private Cbb max;
+
+    private Cbb opn1;
+
+    private Cbb opn2;
+
+    private Cbb ins;
+
+    @Override
+    public void reset() {
+        super.reset();
+        if (max == null) {
+            max = new Cbb();
+        }
+        if (ins == null) {
+            ins = 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/Ftdgrp.java

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

isc-common-core/src/main/java/com/brilliance/isc/bo/model/Fttp.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 Fttp extends AbstractCommonVo {
+    private static Logger log = LoggerFactory.getLogger(Fttp.class);
+
+    //Status E-nable, D-isable, I-nvisible
+    //TDSetter(max=1)
+    private  String pansta = NULLSTR;
+    //Get Ref
+  //  private transient IControl butgetref = new ControlImpl("butgetref", "Get Ref", this);
+    //Trade-out Account
+    //TDSetter    (max=34)
+    private  String troact = NULLSTR;
+    //Trade-in Account TDSetter(max=34)
+    private  String triact = NULLSTR;
+    //Message Type  (max=3)
+    private  String msgtyp = NULLSTR;
+    //Ben Trade-in Account  (max=34)
+    private  String benact = NULLSTR;
+    //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/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/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/common/nosmod/bo/Noscbs.java

+package com.brilliance.isc.common.nosmod.bo;
+
+import com.brilliance.isc.bo.Cbb;
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: isc-core
+ * @ClassName: Noscbs
+ * @description:
+ * @author: huangshunlin
+ * @create: 2024-10-18 20:34
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Noscbs extends AbstractCommonVo implements Serializable {
+    private Cbb nos;
+
+    @Override
+    public void reset() {
+        super.reset();
+        if (nos == null) {
+            nos = new Cbb();
+        }
+        nos.reset();
+    }
+}

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

+package com.brilliance.isc.common.nosmod.bo;
+
+import com.brilliance.isc.bo.Act;
+import com.brilliance.isc.bo.Cbe;
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: isc-funds
+ * @ClassName: Nosmod
+ * @description:
+ * @author:huangshunlin
+ * @create:2024-10-18 20:30
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Nosmod extends AbstractCommonVo implements Serializable {
+    private Noscbs cbs;
+
+    private Cbe wrkcbe;
+
+    private Act rec;
+
+    @Override
+    public void reset() {
+        super.reset();
+        if (cbs == null) {
+            cbs = new Noscbs();
+        }
+        cbs.reset();
+        if (wrkcbe == null) {
+            wrkcbe = new Cbe();
+        }
+
+        if (rec == null) {
+            rec = new Act();
+        }
+
+    }
+}

isc-common-core/src/main/java/com/brilliance/isc/common/nosmod/vo/NoscbsVo.java

+package com.brilliance.isc.common.nosmod.vo;
+
+import com.brilliance.isc.bo.Cbb;
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.brilliance.isc.vo.model.CbbVo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: isc-core
+ * @ClassName: NoscbsVo
+ * @description:
+ * @author: huangshunlin
+ * @create: 2024-10-18 20:34
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class NoscbsVo extends AbstractCommonVo implements Serializable {
+    private CbbVo nos;
+
+    @Override
+    public void reset() {
+        super.reset();
+        if (nos == null) {
+            nos = new CbbVo();
+        }
+        nos.reset();
+    }
+}

isc-common-core/src/main/java/com/brilliance/isc/common/nosmod/vo/NosmodVo.java

+package com.brilliance.isc.common.nosmod.vo;
+
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.brilliance.isc.common.vo.ActVo;
+import com.brilliance.isc.vo.lg.CbeVo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: isc-funds
+ * @ClassName: Nosmod
+ * @description:
+ * @author:huangshunlin
+ * @create:2024-10-18 20:30
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class NosmodVo extends AbstractCommonVo implements Serializable {
+    private NoscbsVo cbs;
+
+    private CbeVo wrkcbe;
+
+    private ActVo rec;
+
+    @Override
+    public void reset() {
+        super.reset();
+        if (cbs == null) {
+            cbs = new NoscbsVo();
+        }
+        cbs.reset();
+        if (wrkcbe == null) {
+            wrkcbe = new CbeVo();
+        }
+
+        if (rec == null) {
+            rec = new ActVo();
+        }
+
+    }
+}

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

@@ -78,4 +78,6 @@ public interface ActMapper {
     List<Act> selectCashAccList(@Param("holptyinr") String holptyinr, @Param("cur") String cur);
 
     List<Act> selectByExtkeyAndActpro(@Param("extkey") String extkey);
+
+    List<String> getSerAccByConditionSql(@Param(value = "conditionSql") String conditionSql);
 }
\ No newline at end of file

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

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

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/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;
+import java.util.Map;
+
+@Mapper
+public interface FxdMapper {
+
+    int insert(Fxd record);
+
+    int insertSelective(Fxd record);
+
+    int updateByPrimaryKeySelective(Fxd record);
+
+    int updateByPrimaryKey(Fxd record);
+
+    int deleteByPrimaryKey(Fxd record);
+
+    int deleteByIds(Collection<Object> collection);
+
+    //修改语句
+    int dyncUpdate(Map<String, Object> dyncMap);
+
+    Fxd selectByPrimaryKey(Fxd record);
+
+    int dyncDelete(Map<String, Object> dyncMap);
+
+    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/FxtMapper.java

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

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

 package com.brilliance.isc.mda.dao;
-import java.math.BigDecimal;
 
 import com.brilliance.isc.bo.Gle;
 import com.brilliance.isc.vo.PvcRequestVo;
@@ -7,6 +6,7 @@ import com.brilliance.isc.vo.PvcResponseVo;
 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;
@@ -28,19 +28,21 @@ public interface GleMapper {
 
     Gle selectByPrimaryKey(Gle record);
 
-    int dyncDelete(Map<String,Object> dyncMap);
+    int dyncDelete(Map<String, Object> dyncMap);
+
+    int dyncUpdate(Map<String, Object> dyncMap);
 
-    List<Gle> dyncRead(Map<String,Object> dyncMap);
+    List<Gle> dyncRead(Map<String, Object> dyncMap);
 
     Gle selectByCondition(Gle record);
 
-    List<Gle>  selectByTrninr(@Param("trninr")String trninr);
+    List<Gle> selectByTrninr(@Param("trninr") String trninr);
 
-    Gle selectByNewactcodAndCurAndTrninr(@Param("newactcod") String newactcod, @Param("cur")String cur, @Param("trninr")String trninr);
+    Gle selectByNewactcodAndCurAndTrninr(@Param("newactcod") String newactcod, @Param("cur") String cur, @Param("trninr") String trninr);
 
-    int updateByTrninr(@Param("itfinr") String itfinr,@Param("trninr")String trninr);
+    int updateByTrninr(@Param("itfinr") String itfinr, @Param("trninr") String trninr);
 
-    int selectCountByTrninr(@Param("trninr")String trninr);
+    int selectCountByTrninr(@Param("trninr") String trninr);
 
     List<Gle> selectByTrninrLikeTaxinf(@Param("trninr") String trninr);
 
@@ -52,4 +54,7 @@ public interface GleMapper {
 
     List<PvcResponseVo> selectPVCList(PvcRequestVo gleRequestVo);
 
+    Gle selectSpcGLeByTrninr(@Param("trninr") String trninr);
+
+
 }
\ No newline at end of file

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

+package com.brilliance.isc.mda.dao;
+
+import com.brilliance.isc.bo.Rou;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface RouMapper {
+
+    int insert(Rou record);
+
+    int insertSelective(Rou record);
+
+    int updateByPrimaryKeySelective(Rou record);
+
+    int updateByPrimaryKey(Rou record);
+
+    int deleteByPrimaryKey(Rou record);
+
+    int deleteByIds(Collection<Object> collection);
+
+    Rou selectByPrimaryKey(Rou record);
+
+    int dyncDelete(Map<String, Object> dyncMap);
+
+    int dyncUpdate(Map<String, Object> dyncMap);
+
+    List<Rou> dyncRead(Map<String, Object> dyncMap);
+
+    Rou selectByBussec(@Param("bussec") String  bussec);
+
+}
\ 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/mda/dao/SptMapper.java

@@ -30,6 +30,8 @@ public interface SptMapper {
 
     int dyncDelete(Map<String, Object> dyncMap);
 
+    int dyncUpdate(Map<String, Object> dyncMap);
+
     List<Spt> dyncRead(Map<String, Object> dyncMap);
 
     List<Spt> selectList(@Param("selobj") String selobj, @Param("inidatfro") String inidatfro,

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

+package com.brilliance.isc.vo.funds;
+
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.brilliance.isc.vo.model.CbbVo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+/**
+ * @program: isc-core
+ * @ClassName: Cracbs
+ * @description: 清算cbs模块
+ * @author: huangshunlin
+ * @create: 2024-10-16 20:41
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class CracbsVo extends AbstractCommonVo {
+
+    private CbbVo max;
+
+    @Override
+    public void reset() {
+        super.reset();
+        if (max == null) {
+            max = new CbbVo();
+        }
+        max.reset();
+    }
+
+}

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

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

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

+package com.brilliance.isc.vo.funds;
+
+import com.brilliance.isc.common.vo.BizInfoVo;
+import lombok.Data;
+
+import java.util.Date;
+
+import static com.brilliance.mda.runtime.mda.Constants.NULLDATE;
+import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
+
+/**
+ * @program: isc-core
+ * @ClassName: CrdBizInfoVo
+ * @description: crd业务数据
+ * @author: huangshunlin
+ * @create: 2024-10-17 20:34
+ */
+@Data
+public class CrdBizInfoVo extends BizInfoVo {
+
+    //crtp.forare
+    private String forare = NULLSTR;
+    //crdgrp.rec.opndat
+    private Date opndat = NULLDATE;
+
+    //crdgrp.rec.rcvbchinr
+    private String rcvbchinr = NULLSTR;
+
+    //crdgrp.rec.custyp
+    private String custyp = NULLSTR;
+
+    //rcvact.inr
+    private String rcvactInr = NULLSTR;
+    //rcvact.extkey
+    private String rcvactExtkey = NULLSTR;
+
+    //crtcro 汇出清算 spcgle.act
+    private String spcgleAct = NULLSTR;
+
+    //crtcro 汇出清算 crdgrp.rec.rcvobjtyp
+    private String rcvobjtyp = NULLSTR;
+
+    //crtcro 汇出清算 cpdgrp.rec.valdat
+    private Date valdat = NULLDATE;
+
+}

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

+package com.brilliance.isc.vo.funds;
+
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.util.Date;
+
+import static com.brilliance.mda.runtime.mda.Constants.NULLDATE;
+import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
+
+
+/**
+ * CrdVo
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class CrdVo extends AbstractCommonVo {
+
+
+    //Internal Unique ID of Import L/C (max = 16)
+    private String inr = NULLSTR;
+
+    //Reference (max = 16)
+    private String ownref = NULLSTR;
+
+    //Externally Displayed Name to Identify the Contract (max = 40)
+    private String nam = NULLSTR;
+
+    //Responsible User (max = 8)
+    private String ownusr = NULLSTR;
+
+    //Date of Creation Opening or Registry
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date credat = NULLDATE;
+
+    //Date L/C Opened/Issued
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date opndat = NULLDATE;
+
+    //Date L/C Closed
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+
+    private Date clsdat = NULLDATE;
+
+    //Object Type of Associated Contract Optional  (max =6)
+    private String rcvobjtyp = NULLSTR;
+
+    //Object INR of Associated Contract Optional (max =8)
+    private String rcvobjinr = NULLSTR;
+
+    //Clearing Type  (max =1) I:Clearing In  ;O:Clearing Out
+    private String clrtyp = NULLSTR;
+
+    /*
+        Transaction Type  (max =1)
+        贸易 0
+        非贸易 1
+        资本 2
+        其他 3
+     */
+    private String trntyp = NULLSTR;
+
+    //Receiver BIC  (max =12)
+    private String rcvbic = NULLSTR;
+
+    //Message ReferenceTag21  (max =16)
+    private String msgref = NULLSTR;
+
+    //Account in MessageTag59  (max =21)
+    private String msgact = NULLSTR;
+
+    //Message Type  (max =3)
+    private String msgtyp = NULLSTR;
+
+    //Message InrSMH  (max =8)
+    private String msginr = NULLSTR;
+
+    //Bound Message Type  (max =8)
+    private String bndtyp = NULLSTR;
+
+    //Bound Message INRSMH   (max =8)
+    private String bndinr = NULLSTR;
+
+    //Status  (max =1)
+    private String sta = NULLSTR;
+
+    //Error Message  (max =40)
+    private String errmsg = NULLSTR;
+
+    //Customer Type  (max =1)  1:对私 0:对公
+    private String custyp = NULLSTR;
+
+    //BRANCHINR (max =8)
+    private String branchinr = NULLSTR;
+
+    //BRANCH CODE KEYINR  (max =8)
+    private String bchkeyinr = NULLSTR;
+
+    //Receiver Branch Inr  (max =8)
+    private String rcvbchinr = NULLSTR;
+
+    //Version Counter  (max =4)
+    private String ver = NULLSTR;
+
+    //Inr for SPT  (max =8)
+    private String sptinr = NULLSTR;
+
+    //Entity holding Contract   (max =8)
+    private String etyextkey = NULLSTR;
+
+
+}
\ No newline at end of file

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

+package com.brilliance.isc.vo.funds;
+
+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: Crdgrp
+ * @description: 清算grp模块
+ * @author: huangshunlin
+ * @create: 2024-10-16 20:38
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class CrdgrpVo extends AbstractCommonVo {
+
+    private CrdVo rec;
+
+    private CrtpVo crtp;
+
+    private CracbsVo cbs;
+
+    private PtsptaVo snd;
+
+    private PtsptaVo rcv;
+
+    private PtsptaVo trf;
+
+    private PtsptaVo apl;
+
+    private PtsptaVo acc;
+
+    @Override
+    public void reset() {
+        if (rec == null) {
+            rec = new CrdVo();
+        }
+        if (crtp == null) {
+            crtp = new CrtpVo();
+        }
+        crtp.reset();
+        if (cbs == null) {
+            cbs = new CracbsVo();
+        }
+        cbs.reset();
+
+        if (snd == null) {
+            snd = new PtsptaVo();
+        }
+        snd.reset();
+
+        if (rcv == null) {
+            rcv = new PtsptaVo();
+        }
+        rcv.reset();
+
+        if (trf == null) {
+            trf = new PtsptaVo();
+        }
+        trf.reset();
+
+        if (apl == null) {
+            apl = new PtsptaVo();
+        }
+        apl.reset();
+
+        if (acc == null) {
+            acc = new PtsptaVo();
+        }
+        acc.reset();
+
+    }
+}

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

+package com.brilliance.isc.vo.funds;
+
+import com.brilliance.isc.bo.SptVo;
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.brilliance.mda.runtime.mda.IStream;
+import com.brilliance.mda.runtime.mda.impl.StreamImpl;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
+
+/**
+ * @program: isc-core
+ * @ClassName: CrtmodVo
+ * @description: 清算crtmod
+ * @author: huangshunlin
+ * @create: 2024-10-17 18:24
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class CrtmodVo extends AbstractCommonVo {
+    //Parameter Stream
+    private IStream parstm = new StreamImpl();
+    //Inr of SMH
+    private String smhinr = NULLSTR;
+
+//    private Sysobj crdobj;
+
+//    private Crdlod crdlod;
+
+    private SptVo crtspt;
+
+    //    private Crtdoc crtdoc;
+    @Override
+    public void reset() {
+
+        if (crtspt == null) {
+            crtspt = new SptVo();
+        }
+    }
+}

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

+package com.brilliance.isc.vo.funds;
+
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+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.util.Date;
+
+import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
+
+/**
+ *
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class CrtpVo extends AbstractCommonVo {
+    private static Logger log = LoggerFactory.getLogger(CrtpVo.class);
+
+    //Value Date
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date valdat;
+
+
+    //USE FOR ARE AMTOUNT (max=1)
+    private String forare = NULLSTR;
+
+
+    @Override
+    public void reset() {
+        super.reset();
+    }
+}
\ No newline at end of file

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

+package com.brilliance.isc.vo.funds;
+import com.brilliance.isc.common.vo.BizAmdInfoVo;
+import lombok.Data;
+
+
+@Data
+public class FtdBizAmdInfoVo extends BizAmdInfoVo{
+}

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
+public class FtdBizInfoVo extends BizInfoVo{
+
+    private String fttyp = NULLSTR;
+
+    private String tronref = NULLSTR;
+
+    private BigDecimal rat = Decimals.ZERO_SCALE6;
+
+    private BigDecimal amt = Decimals.ZERO_SCALE0;
+
+    private String bnktyp = NULLSTR;
+
+    private String etyextkey = 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/FtdWithPtsCbbResponseVo.java

+package com.brilliance.isc.vo.funds;
+
+import com.brilliance.isc.bo.Ftd;import lombok.Data;import java.math.BigDecimal;
+
+
+@Data
+public class FtdWithPtsCbbResponseVo extends Ftd{
+
+    private String cur;
+
+    private BigDecimal amt;
+
+    private String etyextkey;
+
+    private String ownref;
+
+    private String nam;
+
+
+}

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> fttypList;
+
+    /**
+     * 是否闭卷
+     */
+    private String isClosed;
+
+
+    /**
+     * 排序字段
+     */
+    private String column;
+
+    /**
+     * 正序倒序
+     */
+    private String order;
+
+}

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

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

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 java.util.Date;
+
+import static com.brilliance.mda.runtime.mda.Constants.NULLDATE;
+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;
+
+    private String cancur = NULLSTR;
+    private BigDecimal canamt = BigDecimal.ZERO;
+
+    //fxdgrp.rec.setdat
+    private Date setdat = NULLDATE;
+
+}

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

+package com.brilliance.isc.vo.funds;
+
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.brilliance.mda.runtime.mda.util.Decimals;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+
+
+/**
+ * FxdVo:
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class FxdVo extends AbstractCommonVo {
+
+
+    //Internal Unique ID of Import L/C
+    private String inr = NULLSTR;
+
+    //Reference
+    private String ownref = NULLSTR;
+
+    //Externally Displayed Name to Identify the Contract
+    private String nam = NULLSTR;
+
+    //Date Foreign Exchange Opened/Issued
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date opndat = NULLDATE;
+
+    //Responsible User
+    private String ownusr = NULLSTR;
+
+    //Foreign Exchange Type
+    private String fxtyp = NULLSTR;
+
+    //Rate
+    private BigDecimal rat = Decimals.ZERO_SCALE6;
+
+    //Middle Rate
+    private BigDecimal midrat = Decimals.ZERO_SCALE6;
+
+    //Quote Reference
+    private String quoref = NULLSTR;
+
+    //Fund Department Reference
+    private String fudref = NULLSTR;
+
+    //Value date
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date valdat = NULLDATE;
+
+    //Date of confirmation
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date cnfdat = NULLDATE;
+
+    //Settlement Date
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date setdat = NULLDATE;
+
+    //Settlemt date from
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date setdatfrm = NULLDATE;
+
+    //Settlement date to
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date setdatto = NULLDATE;
+
+    //Date of Closed
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date clsdat = NULLDATE;
+
+    //Version
+    private String ver = NULLSTR;
+
+    //Branch INR
+    private String branchinr = NULLSTR;
+
+    //Branch INR
+    private String bchkeyinr = NULLSTR;
+
+    //TRADE IN
+    private String trdint = NULLSTR;
+
+    //TRADE OUT
+    private String trdout = NULLSTR;
+
+    //交易主体
+    private String trnman = NULLSTR;
+
+    //Foreign Account
+    private String acc = NULLSTR;
+
+    //CNY Account
+    private String acc2 = NULLSTR;
+
+    //Clearing Department Responsible User
+    private String usr = NULLSTR;
+
+    //Disposition
+    private String dsp = NULLSTR;
+
+    //Disposition
+    private String dsp2 = NULLSTR;
+
+    //Cash cover percent
+    private BigDecimal cshpct = Decimals.ZERO_SCALE2;
+
+    //Rate
+    private BigDecimal rat1 = Decimals.ZERO_SCALE6;
+
+    //Account manager
+    private String accmng = NULLSTR;
+
+    //客户经理部门
+    private String hdbch = NULLSTR;
+
+    //Entity  KEY of Entry
+    private String etyextkey = NULLSTR;
+
+
+}
\ No newline at end of file

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

+package com.brilliance.isc.vo.funds;
+
+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: FxdgrpVo
+ * @description: fxdgrp VO
+ * @author: huangshunlin
+ * @create: 2024-10-09 11:23
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class FxdgrpVo extends AbstractCommonVo {
+
+    private FxdVo rec;
+
+    private FxtVo blk;
+
+    private FxacbsVo cbs;
+
+    private PtsptaVo apl;
+
+    private PtsptaVo act;
+
+    private PtsptaVo age;
+
+    private PtsptaVo acc;
+
+    @Override
+    public void reset() {
+        super.reset();
+        if (rec == null) {
+            rec = new FxdVo();
+        }
+        if (blk == null) {
+            blk = new FxtVo();
+        }
+        if (cbs == null) {
+            cbs = new FxacbsVo();
+        }
+        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/vo/funds/FxtVo.java

+package com.brilliance.isc.vo.funds;
+
+import com.brilliance.isc.common.vo.AbstractCommonVo;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
+
+
+/**
+ * FxtVo:
+ */
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class FxtVo extends AbstractCommonVo {
+
+
+    //Internal Unique ID
+    private String inr = NULLSTR;
+
+    //Remark
+    private String remark = NULLSTR;
+
+
+}
\ No newline at end of file

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

+package com.brilliance.isc.vo.funds;
+
+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 FxtpVo extends AbstractCommonVo {
+    private static Logger log = LoggerFactory.getLogger(FxtpVo.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/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/cbsconf.ini

@@ -32,6 +32,7 @@ COD30=BDD
 COD31=BFD
 COD31=NID
 COD31=NCD
+COD33=FXD
 [CBCCOD]
 COD1=ACRACR
 COD2=AOPSUM
@@ -1245,3 +1246,45 @@ UTLSUM=+
 [NID-UTLAMT-COL]
 COD1=OPN
 COD2=UTLSUM
+[FXD-CCVIN]
+OPR1=+CCVSUM
+[FXD-CCVIN-OPR]
+CCVSUM=+
+[FXD-CCVIN-COL]
+COD1=CCVSUM
+[FXD-CCVOUT]
+OPR1=-CCVSUM
+[FXD-CCVOUT-OPR]
+CCVSUM=-
+[FXD-CCVOUT-COL]
+COD1=CCVSUM
+[FXD-MAXAMT]
+OPR1=+MAXSUM
+OPR2=+OPN
+[FXD-MAXAMT-OPR]
+MAXSUM=+
+OPN=+
+[FXD-MAXAMT-COL]
+COD1=MAXSUM
+COD2=OPN
+[FXD-NOMAMT]
+OPR1=+NOMSUM
+[FXD-NOMAMT-OPR]
+NOMSUM=+
+[FXD-NOMAMT-COL]
+COD1=NOMSUM
+[FXD-OPNAMT]
+OPR1=+OPN2
+[FXD-OPNAMT-OPR]
+OPN2=+
+[FXD-OPNAMT-COL]
+COD1=OPN2
+[FXD-UTLAMT]
+OPR1=-OPN
+OPR2=+UTLSUM
+[FXD-UTLAMT-OPR]
+OPN=-
+UTLSUM=+
+[FXD-UTLAMT-COL]
+COD1=OPN
+COD2=UTLSUM

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

@@ -300,6 +300,13 @@
         ${conditionSql}
     </select>
 
+    <select id="getSerAccByConditionSql" resultMap="BaseResultMap">
+        select
+        seracc
+        from act
+        ${conditionSql}
+    </select>
+
     <select id="selectPtyinrListByExtkey" resultType="java.lang.String"> <!--环境用的是oracle数据库，实际再调整-->
         select distinct holptyinr from ACT WHERE EXTKEY=#{extkey,jdbcType=VARCHAR}
     </select>

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/ftdMapper.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.FtdMapper">
+
+    <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
+        ftd.*,
+        cbb.cur,
+        cbb.amt
+    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>-->
+
+    <insert id="insert">
+        insert into ftd (<include refid="Base_Column_List"/>)
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            #{inr,jdbcType=VARCHAR},
+            #{ownref,jdbcType=VARCHAR},
+            #{nam,jdbcType=VARCHAR},
+            #{opndat,jdbcType=DATE},
+            #{valdat,jdbcType=DATE},
+            #{cnfdat,jdbcType=DATE},
+            #{matdat,jdbcType=DATE},
+            #{clsdat,jdbcType=DATE},
+            #{ownusr,jdbcType=VARCHAR},
+            #{ver,jdbcType=VARCHAR},
+            #{branchinr,jdbcType=VARCHAR},
+            #{bchkeyinr,jdbcType=VARCHAR},
+            #{fttyp,jdbcType=VARCHAR},
+            #{rat,jdbcType=DECIMAL},
+            #{cntfra,jdbcType=VARCHAR},
+            #{usr,jdbcType=VARCHAR},
+            #{bnktyp,jdbcType=VARCHAR},
+            #{etyextkey,jdbcType=VARCHAR},
+            #{gzno,jdbcType=VARCHAR},
+
+        </trim>
+    </insert>
+
+
+    
+</mapper>
\ No newline at end of file

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"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        inr,remark
+    </sql>
+
+ <insert id="insert">
+        insert into ftt (<include refid="Base_Column_List" />)
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            #{inr,jdbcType=VARCHAR},
+            #{remark,jdbcType=VARCHAR},
+        </trim>
+    </insert>
+
+
+
+</mapper>
\ No newline at end of file

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-core/src/main/resources/mapper/fxtmapper.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.FxtMapper">
+
+    <resultMap id="BaseResultMap" type="com.brilliance.isc.bo.Fxt">
+        <result property="inr" column="inr" jdbcType="VARCHAR"/>
+        <result property="remark" column="remark" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        inr,remark
+    </sql>
+
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap">
+        select
+            <include refid="Base_Column_List" />
+        from fxt
+        where inr = #{inr,jdbcType=VARCHAR}
+    </select>
+
+    <delete id="deleteByPrimaryKey">
+        delete from fxt
+        where inr = #{inr,jdbcType=VARCHAR}
+    </delete>
+
+    <insert id="insert">
+        insert into fxt (<include refid="Base_Column_List" />)
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            #{inr,jdbcType=VARCHAR},
+            #{remark,jdbcType=VARCHAR},
+        </trim>
+    </insert>
+
+    <insert id="insertSelective">
+        insert into fxt
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="inr != null">inr,</if>
+            <if test="remark != null">remark,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="inr != null">#{inr,jdbcType=VARCHAR}, </if>
+            <if test="remark != null">#{remark,jdbcType=VARCHAR}, </if>
+        </trim>
+    </insert>
+
+    <update id="updateByPrimaryKeySelective">
+        update fxt
+        <set>
+            <if test="remark != null">remark = #{remark,jdbcType=VARCHAR},</if>
+        </set>
+        where inr = #{inr,jdbcType=VARCHAR}
+    </update>
+
+    <update id="updateByPrimaryKey">
+        update fxt
+        <set>
+            remark = #{remark,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 fxt
+        <set>
+            <if test="module.remark != null">remark = #{module.remark,jdbcType=VARCHAR},</if>
+        </set>
+        ${conditions}
+    </update>
+
+    <delete id="dyncDelete">
+        ${sql}
+    </delete>
+
+    <select id="dyncRead" resultMap="BaseResultMap">
+        ${sql}
+    </select>
+
+</mapper>
+
+

isc-common-core/src/main/resources/mapper/roumapper.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.RouMapper">
+
+    <resultMap id="BaseResultMap" type="com.brilliance.isc.bo.Rou">
+        <result property="inr" column="inr" jdbcType="VARCHAR"/>
+        <result property="pri" column="pri" jdbcType="INTEGER"/>
+        <result property="usg" column="usg" jdbcType="VARCHAR"/>
+        <result property="bussec" column="bussec" jdbcType="VARCHAR"/>
+        <result property="stacod" column="stacod" jdbcType="VARCHAR"/>
+        <result property="cty" column="cty" jdbcType="VARCHAR"/>
+        <result property="cur" column="cur" jdbcType="VARCHAR"/>
+        <result property="etyextkey" column="etyextkey" jdbcType="VARCHAR"/>
+        <result property="grp" column="grp" jdbcType="VARCHAR"/>
+        <result property="bchcod" column="bchcod" jdbcType="VARCHAR"/>
+        <result property="trngrp" column="trngrp" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        inr,pri,usg,bussec,stacod,cty,cur,etyextkey,grp,bchcod,trngrp
+    </sql>
+
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap">
+        select
+            <include refid="Base_Column_List" />
+        from rou
+        where inr = #{inr,jdbcType=VARCHAR}
+    </select>
+
+    <delete id="deleteByPrimaryKey">
+        delete from rou
+        where inr = #{inr,jdbcType=VARCHAR}
+    </delete>
+
+    <insert id="insert">
+        insert into rou (<include refid="Base_Column_List" />)
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            #{inr,jdbcType=VARCHAR},
+            #{pri,jdbcType=INTEGER},
+            #{usg,jdbcType=VARCHAR},
+            #{bussec,jdbcType=VARCHAR},
+            #{stacod,jdbcType=VARCHAR},
+            #{cty,jdbcType=VARCHAR},
+            #{cur,jdbcType=VARCHAR},
+            #{etyextkey,jdbcType=VARCHAR},
+            #{grp,jdbcType=VARCHAR},
+            #{bchcod,jdbcType=VARCHAR},
+            #{trngrp,jdbcType=VARCHAR},
+        </trim>
+    </insert>
+
+    <insert id="insertSelective">
+        insert into rou
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="inr != null">inr,</if>
+            <if test="pri != null">pri,</if>
+            <if test="usg != null">usg,</if>
+            <if test="bussec != null">bussec,</if>
+            <if test="stacod != null">stacod,</if>
+            <if test="cty != null">cty,</if>
+            <if test="cur != null">cur,</if>
+            <if test="etyextkey != null">etyextkey,</if>
+            <if test="grp != null">grp,</if>
+            <if test="bchcod != null">bchcod,</if>
+            <if test="trngrp != null">trngrp,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="inr != null">#{inr,jdbcType=VARCHAR}, </if>
+            <if test="pri != null">#{pri,jdbcType=INTEGER}, </if>
+            <if test="usg != null">#{usg,jdbcType=VARCHAR}, </if>
+            <if test="bussec != null">#{bussec,jdbcType=VARCHAR}, </if>
+            <if test="stacod != null">#{stacod,jdbcType=VARCHAR}, </if>
+            <if test="cty != null">#{cty,jdbcType=VARCHAR}, </if>
+            <if test="cur != null">#{cur,jdbcType=VARCHAR}, </if>
+            <if test="etyextkey != null">#{etyextkey,jdbcType=VARCHAR}, </if>
+            <if test="grp != null">#{grp,jdbcType=VARCHAR}, </if>
+            <if test="bchcod != null">#{bchcod,jdbcType=VARCHAR}, </if>
+            <if test="trngrp != null">#{trngrp,jdbcType=VARCHAR}, </if>
+        </trim>
+    </insert>
+
+    <update id="updateByPrimaryKeySelective">
+        update rou
+        <set>
+            <if test="pri != null">pri = #{pri,jdbcType=INTEGER},</if>
+            <if test="usg != null">usg = #{usg,jdbcType=VARCHAR},</if>
+            <if test="bussec != null">bussec = #{bussec,jdbcType=VARCHAR},</if>
+            <if test="stacod != null">stacod = #{stacod,jdbcType=VARCHAR},</if>
+            <if test="cty != null">cty = #{cty,jdbcType=VARCHAR},</if>
+            <if test="cur != null">cur = #{cur,jdbcType=VARCHAR},</if>
+            <if test="etyextkey != null">etyextkey = #{etyextkey,jdbcType=VARCHAR},</if>
+            <if test="grp != null">grp = #{grp,jdbcType=VARCHAR},</if>
+            <if test="bchcod != null">bchcod = #{bchcod,jdbcType=VARCHAR},</if>
+            <if test="trngrp != null">trngrp = #{trngrp,jdbcType=VARCHAR},</if>
+        </set>
+        where inr = #{inr,jdbcType=VARCHAR}
+    </update>
+
+    <update id="updateByPrimaryKey">
+        update rou
+        <set>
+            pri = #{pri,jdbcType=INTEGER},
+            usg = #{usg,jdbcType=VARCHAR},
+            bussec = #{bussec,jdbcType=VARCHAR},
+            stacod = #{stacod,jdbcType=VARCHAR},
+            cty = #{cty,jdbcType=VARCHAR},
+            cur = #{cur,jdbcType=VARCHAR},
+            etyextkey = #{etyextkey,jdbcType=VARCHAR},
+            grp = #{grp,jdbcType=VARCHAR},
+            bchcod = #{bchcod,jdbcType=VARCHAR},
+            trngrp = #{trngrp,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 rou
+        <set>
+            <if test="module.pri != null">pri = #{module.pri,jdbcType=INTEGER},</if>
+            <if test="module.usg != null">usg = #{module.usg,jdbcType=VARCHAR},</if>
+            <if test="module.bussec != null">bussec = #{module.bussec,jdbcType=VARCHAR},</if>
+            <if test="module.stacod != null">stacod = #{module.stacod,jdbcType=VARCHAR},</if>
+            <if test="module.cty != null">cty = #{module.cty,jdbcType=VARCHAR},</if>
+            <if test="module.cur != null">cur = #{module.cur,jdbcType=VARCHAR},</if>
+            <if test="module.etyextkey != null">etyextkey = #{module.etyextkey,jdbcType=VARCHAR},</if>
+            <if test="module.grp != null">grp = #{module.grp,jdbcType=VARCHAR},</if>
+            <if test="module.bchcod != null">bchcod = #{module.bchcod,jdbcType=VARCHAR},</if>
+            <if test="module.trngrp != null">trngrp = #{module.trngrp,jdbcType=VARCHAR},</if>
+        </set>
+        ${conditions}
+    </update>
+
+    <delete id="dyncDelete">
+        ${sql}
+    </delete>
+
+    <select id="dyncRead" resultMap="BaseResultMap">
+        ${sql}
+    </select>
+
+    <select id="selectByBussec" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from rou
+        where bussec = #{bussec}
+    </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,11 @@
         <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"/>
+        <result property="rcvkey" column="rcvkey" jdbcType="VARCHAR"/>
+
     </resultMap>
 
 
@@ -60,7 +65,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,rcvkey
     </sql>
 
     <select id="selectByPrimaryKey" resultMap="BaseResultMap">
@@ -120,6 +125,10 @@
             #{chlflg,jdbcType=VARCHAR},
             #{orimsgtyp,jdbcType=VARCHAR},
             #{mpiinr,jdbcType=VARCHAR},
+            #{xxxcnt,jdbcType=INTEGER},
+            #{docmd5,jdbcType=VARCHAR},
+            #{doclen,jdbcType=NUMERIC},
+            #{rcvkey,jdbcType=VARCHAR},
         </trim>
     </insert>
 
@@ -167,6 +176,10 @@
             <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>
+            <if test="rcvkey != null">rcvkey,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="inr != null">#{inr,jdbcType=VARCHAR},</if>
@@ -210,6 +223,10 @@
             <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>
+            <if test="rcvkey != null">#{rcvkey,jdbcType=VARCHAR},</if>
         </trim>
     </insert>
 
@@ -256,6 +273,10 @@
             <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>
+            <if test="rcvkey != null">rcvkey = #{rcvkey,jdbcType=VARCHAR},</if>
         </set>
         where inr = #{inr,jdbcType=VARCHAR}
     </update>
@@ -303,6 +324,10 @@
             chlflg = #{chlflg,jdbcType=VARCHAR},
             orimsgtyp = #{orimsgtyp,jdbcType=VARCHAR},
             mpiinr = #{mpiinr,jdbcType=VARCHAR},
+            xxxcnt = #{xxxcnt,jdbcType=INTEGER},
+            docmd5 = #{docmd5,jdbcType=VARCHAR},
+            doclen = #{doclen,jdbcType=NUMERIC},
+            rcvkey = #{rcvkey,jdbcType=VARCHAR},
         </set>
         where inr = #{inr,jdbcType=VARCHAR}
     </update>
@@ -356,7 +381,11 @@
             <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>
+            <if test="module.rcvkey != null">rcvkey = #{module.rcvkey,jdbcType=VARCHAR},</if>
         </set>
         ${conditions}
     </update>
@@ -441,6 +470,10 @@
         <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>
+        <if test="rcvkey != null">and rcvkey = #{rcvkey,jdbcType=VARCHAR}</if>
     </select>
 
     <select id="selectRelationSmh" resultMap="BaseResultMap">

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

@@ -55,11 +55,12 @@
         <result property="chnref" column="chnref" jdbcType="VARCHAR"/>
         <result property="cortyp" column="cortyp" jdbcType="VARCHAR"/>
         <result property="frontchannel" column="frontchannel" jdbcType="VARCHAR"/>
+        <result property="act59" column="act59" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
         inr
-        ,objtyp,objinr,objnam,objref,txt,dattim,usr,ssninr,frm,ehtyp,pan,sta,delflg,hldflg,infdsp,inftxt,ownusg,ownusr,channel,smhinr,mapflg,cretrn,ordinr,tardattim,creobjtyp,creobjinr,relcur,relamt,etgextkey,etyextkey,ptainr,payflg,wrkgrp,wrkusr,bchkeyinr,branchinr,vipflg,credat,msgtyp,flg202,ownref,imginr,lstusr,lstgrp,paytyp,eciflg,dfref,ctmnam,chnref,cortyp,frontchannel
+        ,objtyp,objinr,objnam,objref,txt,dattim,usr,ssninr,frm,ehtyp,pan,sta,delflg,hldflg,infdsp,inftxt,ownusg,ownusr,channel,smhinr,mapflg,cretrn,ordinr,tardattim,creobjtyp,creobjinr,relcur,relamt,etgextkey,etyextkey,ptainr,payflg,wrkgrp,wrkusr,bchkeyinr,branchinr,vipflg,credat,msgtyp,flg202,ownref,imginr,lstusr,lstgrp,paytyp,eciflg,dfref,ctmnam,chnref,cortyp,frontchannel,act59
     </sql>
 
     <select id="selectByPrimaryKey" resultMap="BaseResultMap">
@@ -130,6 +131,7 @@
             #{chnref,jdbcType=VARCHAR},
             #{cortyp,jdbcType=VARCHAR},
             #{frontchannel,jdbcType=VARCHAR},
+            #{act59,jdbcType=VARCHAR},
         </trim>
     </insert>
 
@@ -188,6 +190,7 @@
             <if test="chnref != null">chnref,</if>
             <if test="cortyp != null">cortyp,</if>
             <if test="frontchannel != null">frontchannel,</if>
+            <if test="act59 != null">act59,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="inr != null">#{inr,jdbcType=VARCHAR},</if>
@@ -242,6 +245,7 @@
             <if test="chnref != null">#{chnref,jdbcType=VARCHAR},</if>
             <if test="cortyp != null">#{cortyp,jdbcType=VARCHAR},</if>
             <if test="frontchannel != null">#{frontchannel,jdbcType=VARCHAR},</if>
+            <if test="act59 != null">#{act59,jdbcType=VARCHAR},</if>
         </trim>
     </insert>
 
@@ -299,6 +303,7 @@
             <if test="chnref != null">chnref = #{chnref,jdbcType=VARCHAR},</if>
             <if test="cortyp != null">cortyp = #{cortyp,jdbcType=VARCHAR},</if>
             <if test="frontchannel != null">frontchannel = #{frontchannel,jdbcType=VARCHAR},</if>
+            <if test="act59 != null">act59 = #{act59,jdbcType=VARCHAR},</if>
         </set>
         where inr = #{inr,jdbcType=VARCHAR}
     </update>
@@ -357,6 +362,7 @@
             chnref = #{chnref,jdbcType=VARCHAR},
             cortyp = #{cortyp,jdbcType=VARCHAR},
             frontchannel = #{frontchannel,jdbcType=VARCHAR},
+            act59 = #{act59,jdbcType=VARCHAR},
         </set>
         where inr = #{inr,jdbcType=VARCHAR}
     </update>
@@ -422,6 +428,7 @@
             <if test="module.chnref != null">chnref = #{module.chnref,jdbcType=VARCHAR},</if>
             <if test="module.cortyp != null">cortyp = #{module.cortyp,jdbcType=VARCHAR},</if>
             <if test="module.frontchannel != null">frontchannel = #{module.frontchannel,jdbcType=VARCHAR},</if>
+            <if test="module.act59 != null">act59 = #{module.act59,jdbcType=VARCHAR},</if>
         </set>
         ${conditions}
     </update>
@@ -602,6 +609,7 @@
         <if test="chnref != null">and chnref = #{chnref,jdbcType=VARCHAR}</if>
         <if test="cortyp != null">and cortyp = #{cortyp,jdbcType=VARCHAR}</if>
         <if test="frontchannel != null">and frontchannel = #{frontchannel,jdbcType=VARCHAR}</if>
+        <if test="act59 != null">and act59 = #{act59,jdbcType=VARCHAR}</if>
     </select>
     <select id="selectByCreobjtypAndCreobjinrAndHldflg" resultMap="BaseResultMap">
         select

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/component/DyncDaoService.java

@@ -82,7 +82,11 @@ public class DyncDaoService {
         Map<String, Object> params = ImmutableBiMap.of("sql", sql);
         Map<String, Object> result = publicMapper.dyncQueryMap(params);
         if (result != null && result.size() > 0) {
+            if (result.get(field)!=null ){
                 return (T) result.get(field);
+            }else{
+                return (T) result.get(field.toUpperCase());
+            }
         }
         return null;
     }

isc-common-service/src/main/java/com/brilliance/isc/common/component/PtsptaToolComponent.java

 package com.brilliance.isc.common.component;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.brilliance.isc.bo.*;
 import com.brilliance.isc.common.cache.adr.AdrCacheService;
 import com.brilliance.isc.common.cache.pta.PtaCacheService;
@@ -61,6 +62,14 @@ public class PtsptaToolComponent {
     @Autowired
     private PtsptaMapper ptsptaMapper;
 
+    public boolean IsDemestic(PtsptaVo ptsptaVo) {
+        if (ptsptaVo.getAdr() != null && "CN".equals(ptsptaVo.getAdr().getLoccty())) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
     public PtsptaVo getPtsptaFromPts(PtsFeeDetailVo ptsFeeDetail) {
         PtsptaVo ptsptaVo = new PtsptaVo();
         String ptsinr = ptsFeeDetail.getPtsinr();
@@ -997,6 +1006,7 @@ public class PtsptaToolComponent {
 
     /**
      * 根据objinr和objtyp补录缺失的role
+     *
      * @param ptsptaList
      * @param objinr
      * @param objtyp
@@ -1017,6 +1027,7 @@ public class PtsptaToolComponent {
 
     /**
      * 清掉ptspta层的值，通过ptainr重复赋值
+     *
      * @param ptsptaVo
      */
     private void clearPtspta(PtsptaVo ptsptaVo) {
@@ -1026,4 +1037,34 @@ public class PtsptaToolComponent {
         ptsptaVo.setAdrblk("");
         ptsptaVo.setDbfadrblk("");
     }
+
+    /**
+     * source:ptsmod.0003.script
+     */
+    public void ptsmodGetPtsptaFromPtyINR(PtsptaVo argPtspta, String argPtyInr) {
+        //! Sets Argptspta based on ArgptyInr
+        //! that means the main address of party ARGPTYINR is read and based on this PTA argPtspta is filled completely
+        // if no ArgPtaInr is empty, clear argptspta
+        if (MdaUtils.isEmpty(argPtyInr)) {
+//            MdaUtils.clear(argPtspta);
+            PtsptaVo ptspta = new PtsptaVo();
+            BeanUtil.copyProperties(ptspta, argPtspta);
+        } else {
+            // else read PTA
+            Pta maa = ptaCacheService.selectByPtyInrAndUsg(argPtyInr, "MAA");
+//            cacheDbRead2(argPtspta.getPta(), argPtyInr, "PTYINR", "MAA", "USG");
+            if (Objects.isNull(maa)) {
+//                MdaUtils.clear(argPtspta);
+                PtsptaVo ptspta = new PtsptaVo();
+                BeanUtil.copyProperties(ptspta, argPtspta);
+            } else {
+                // if found, get remaining fields
+                argPtspta.setPta(maa);
+//                ptsmodGetPtsptaFromPta(argPtspta);
+                PtsptaVo ptspta = getPtsptaFromPtaINR(maa.getInr());
+                BeanUtil.copyProperties(ptspta, argPtspta);
+            }
+        }
+
+    }
 }

isc-common-service/src/main/java/com/brilliance/isc/common/nosmod/NosmodService.java

+package com.brilliance.isc.common.nosmod;
+
+import com.brilliance.isc.common.nosmod.bo.Nosmod;
+import com.brilliance.isc.common.setmod.vo.SetmodVo;
+import com.brilliance.isc.common.trnmod.vo.TrnmodVo;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @program: isc-core
+ * @ClassName: NosmodService
+ * @description:
+ * @author: huangshunlin
+ * @create: 2024-10-18 20:42
+ */
+public interface NosmodService {
+    void cbsNostroStore(Nosmod nosmod, String cbt, String extid, String trninr, Date dat, String actcur, BigDecimal amt, String nam, String acc, Object obj);
+
+    boolean isSavNostroCbs(SetmodVo setmodVo);
+
+    int getNosRowInSetgll(SetmodVo setmodVo);
+
+    void savNostroCbs(Nosmod nosmod, String trninr, String actcur, BigDecimal amt, String acc, Date dat, String nam, Object obj);
+
+    void savNostro(Nosmod nosmod, SetmodVo setmodVo, TrnmodVo trnmodVo);
+}

isc-common-service/src/main/java/com/brilliance/isc/common/nosmod/impl/NosmodServiceImpl.java

+package com.brilliance.isc.common.nosmod.impl;
+
+import com.brilliance.isc.bo.Act;
+import com.brilliance.isc.common.cbsmod.service.CbsmodService;
+import com.brilliance.isc.common.context.SettleContext;
+import com.brilliance.isc.common.nosmod.NosmodService;
+import com.brilliance.isc.common.nosmod.bo.Nosmod;
+import com.brilliance.isc.common.setgll.vo.SetgllVo;
+import com.brilliance.isc.common.setmod.vo.SetmodVo;
+import com.brilliance.isc.common.trnmod.vo.TrnmodVo;
+import com.brilliance.isc.mda.dao.ActMapper;
+import com.brilliance.isc.utils.StringUtils;
+import com.brilliance.mda.runtime.mda.util.Dates;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import static com.brilliance.mda.runtime.mda.Constants.NULLSTR;
+
+/**
+ * @program: isc-core
+ * @ClassName: NosmodServiceImpl
+ * @description:
+ * @author: huangshunlin
+ * @create: 2024-10-18 20:43
+ */
+@Service
+public class NosmodServiceImpl implements NosmodService {
+
+    @Resource
+    private CbsmodService cbsmodService;
+
+    @Resource
+    private ActMapper actMapper;
+
+
+    /**
+     * source:nosmod.0000.script
+     */
+    public void cbsNostroStore(Nosmod nosmod, String cbt, String extid, String trninr, Date dat, String actcur, BigDecimal amt, String nam, String acc, Object obj) {
+        //!保存存放同业台账
+        nosmod.getWrkcbe().setCbt(cbt);
+        nosmod.getWrkcbe().setExtid(extid);
+        nosmod.getWrkcbe().setTrntyp("TRN");
+        nosmod.getWrkcbe().setTrninr(trninr);
+        nosmod.getWrkcbe().setDat(dat);
+        nosmod.getWrkcbe().setCur(actcur);
+        nosmod.getWrkcbe().setAmt(amt);
+        nosmod.getWrkcbe().setNam(nam);
+        nosmod.getWrkcbe().setAcc(acc);
+        cbsmodService.cbsStoreEntry(nosmod.getWrkcbe(), obj);
+
+    }
+
+    /**
+     * source:nosmod.0001.script
+     */
+    public boolean isSavNostroCbs(SetmodVo setmodVo) {
+        //!判断是否需要保存存放同业的台账
+        return getNosRowInSetgll(setmodVo) >= 0;
+    }
+
+    /**
+     * source:nosmod.0002.script
+     */
+    public int getNosRowInSetgll(SetmodVo setmodVo) {
+        //!取存放同业分录在settlement的位置
+        int row = -1;
+//        int size = Grids.gridCount(MdaDriver.getModuleList("\\SETMOD\\SETGLG\\SETGLL"));
+        List<SetgllVo> setgll = setmodVo.getSetglg().getSetgll();
+        if (CollectionUtils.isEmpty(setgll)) {
+            return row;
+        }
+        String dsp = NULLSTR;
+        for (int i = 0, size = setgll.size(); i < size; i++) {
+//            dsp = Datas.getContent(this, "\\SETMOD\\SETGLG\\SETGLL(" + MdaUtils.toString(i) + ")\\DSP");
+            dsp = setgll.get(i).getDsp();
+            switch (StringUtils.trimToEmpty(dsp)) {
+                case "NOD":
+                case "PAC":
+                case "DBD":
+                case "DBC":
+                    row = i;
+                    break;
+            }
+        }
+        return row;
+
+    }
+
+    /**
+     * source:nosmod.0003.script
+     */
+    public void savNostroCbs(Nosmod nosmod, String trninr, String actcur, BigDecimal amt, String acc, Date dat, String nam, Object obj) {
+        //!保存存放同业台账
+        cbsmodService.cbsTrnSetNew("TRN", trninr);
+        cbsNostroStore(nosmod, "NOSAMT", "AMT1", trninr, dat, actcur, amt, nam, acc, obj);
+
+    }
+
+    /**
+     * source:nosmod.0004.script
+     */
+    public void savNostro(Nosmod nosmod, SetmodVo setmodVo, TrnmodVo trnmodVo) {
+        //! 保存存放同业台账
+        int row = getNosRowInSetgll(setmodVo);
+        String trninr = NULLSTR;
+        int err = 0;
+        String actcur = NULLSTR;
+        BigDecimal amt = null;
+        String act = NULLSTR;
+        List<SetgllVo> setgll = setmodVo.getSetglg().getSetgll();
+        if (row >= 0) {
+//            trninr = Datas.getContent(this, "\\TRNMOD\\TRN\\INR");
+            trninr = trnmodVo.getTrn().getInr();
+//            actcur = Datas.getContent(this, "\\SETMOD\\SETGLG\\SETGLL(" + MdaUtils.toString(row) + ")\\CUR");
+//            amt = Datas.getContentNumeric(this, "\\SETMOD\\SETGLG\\SETGLL(" + MdaUtils.toString(row) + ")\\AMT");
+//            act = Datas.getContent(this, "\\SETMOD\\SETGLG\\SETGLL(" + MdaUtils.toString(row) + ")\\ACT");
+//            actcur = Datas.getContent(this, "\\SETMOD\\SETGLG\\SETGLL(" + MdaUtils.toString(row) + ")\\CUR");
+            amt = setgll.get(row).getAmt();
+            act = setgll.get(row).getAct();
+            actcur = setgll.get(row).getCur();
+            List<Act> actList = actMapper.getActListByExtkey(act);
+            // modify for hzbank,only save when act exist
+            if (CollectionUtils.isNotEmpty(actList)) {
+                nosmod.setRec(actList.get(0));
+                savNostroCbs(nosmod, trninr, actcur, amt, act, Dates.today(), SettleContext.getTransName(), nosmod.getRec());
+            }
+        }
+
+    }
+}

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

@@ -40,19 +40,24 @@ public interface SetmodService {
 
     String getGllRol(String argrol);
 
+    void setglgAllValDat ( SetmodVo setmodVo, Date argValdat , String argFlag   );
+
     //获取币种的节假日，目前前端组件已实现,后端使用isHoliday方法
     @Deprecated
     String getCurCal(String inCur);
 
     /**
      * 判断指定日期是否是节假日
+     *
      * @param cur
      * @param date
      * @return
      */
     boolean isHoliday(String cur, Date date);
 
-    /**指定日期增加天数或者减少天数
+    /**
+     * 指定日期增加天数或者减少天数
+     *
      * @param cur
      * @param beginDate
      * @param days
@@ -137,4 +142,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,12 @@ 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);
+
+    void getTrnUSG(Argument<String> grp);
 }

isc-common-service/src/main/java/com/brilliance/isc/common/transaction/newcheck/setmod/SetgllValidator.java

@@ -391,7 +391,8 @@ public class SetgllValidator extends AbstractModuleValidator<SetgllVo> {
         if (((MdaUtils.compareTo(setgllVo.getAcccur(), rmb) == 0 && MdaUtils.compareTo(setgllVo.getCur(), rmb) != 0 && MdaUtils.compareTo(setgllVo.getAmt(), 0) < 0)
                 || (MdaUtils.compareTo(setgllVo.getAcccur(), rmb) != 0 && MdaUtils.compareTo(setgllVo.getCur(), rmb) == 0 && MdaUtils.compareTo(setgllVo.getAmt(), 0) > 0))) {
             if (MdaUtils.isEmpty(setgllVo.getTrdint())) {
-                return ValidResult.build(false, "请选择结汇方式代码!");
+                return null;
+                //return ValidResult.build(false, "请选择结汇方式代码!");
             }
         }
         return null;
@@ -408,7 +409,8 @@ public class SetgllValidator extends AbstractModuleValidator<SetgllVo> {
         String rmb = xrtmodService.sysiso();
         if (((MdaUtils.compareTo(setgllVo.getAcccur(), rmb) == 0 && MdaUtils.compareTo(setgllVo.getCur(), rmb) != 0 && MdaUtils.compareTo(setgllVo.getAmt(), 0) > 0) || (MdaUtils.compareTo(setgllVo.getAcccur(), rmb) != 0 && MdaUtils.compareTo(setgllVo.getCur(), rmb) == 0 && MdaUtils.compareTo(setgllVo.getAmt(), 0) < 0))) {
             if (MdaUtils.isEmpty(setgllVo.getTrdout())) {
-                return ValidResult.build(false, "请选择售汇方式代码!");
+                return null;
+                //return ValidResult.build(false, "请选择售汇方式代码!");
             }
         }
         return null;

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 {