Merge pull request '修改联行名称的取值' (#11) from dev into sit

Reviewed-on: #11

cap/etc/channel/cmb/Batch_CMB.XML

@@ -918,15 +918,15 @@
                <If condition="~RetCod!=0">
                   <Set>Rsp_Cd=80</Set>
                   <Set>Rsp_Msg=更新该批次状态失败</Set>
-                  <Break/>
+                  <Return/>
                </If>
                <Exec func="PUB:CommitWork"/>  <!--提交事务 -->
-               <Break/>
+               
             </If>
             <If condition="IS_NOEQUAL_STRING($reqsta,FIN)">
                <Set>Rsp_Cd=80</Set>
                <Set>Rsp_Msg=第三方业务未完成</Set>
-               <Break/>
+               
             </If>
             <Else>
                <Set>TACC_DT=GETDATE()</Set>             <!--交易日期-->
@@ -1065,7 +1065,7 @@
                   <If condition="~RetCod!=0">
                      <Set>Rsp_Cd=80</Set>
                      <Set>Rsp_Msg=更新该批次状态失败</Set>
-                     <Break/>
+                     <Return/>
                   </If>
                   <Exec func="PUB:CommitWork"/>  <!--提交事务 -->
                </ElseIf>

cap/etc/channel/icbc/BATCH_ICBC.XML

@@ -300,7 +300,7 @@
             '' AS ori_voucher_name,'' AS ori_voucher_no,'' AS related_ref_no,CAP_ORD_NO AS i_seq_no,AC_NO AS payee_account,
             CUS_NAM AS payee_cnname,LBNK_NO AS payee_bank_no,'CNY' AS currency,
             TXN_AMT * 100  AS amount,'工资' AS purpose,POSTSCRIPT AS summary,POSTSCRIPT AS postscript,CAP_ORD_NO AS ref_no,case when BNK_FLG='Y' then '' ELSE  CITY END payee_city,
-            case when BNK_FLG='Y' then ''  when BNK_FLG='N' AND ROUT_FLG='SUPER' then '' ELSE  BANK_NAM END payee_bank_name,'' AS purpose_code,'' AS summary_en,
+            case when BNK_FLG='Y' then ''  when BNK_FLG='N' AND ROUT_FLG='SUPER' then '' ELSE  LBNK_NAM END payee_bank_name,'' AS purpose_code,'' AS summary_en,
             case when BNK_FLG='Y' then '2' when BNK_FLG='N' then decode(ROUT_FLG,'SUPER','3','LARGE','1','SMALL','2') end pay_type,
             decode(BNK_FLG,'Y','1','N','2') AS  io_flag
             FROM CAPTXNJNL

cap/etc/check/HRO_CHK_CTL.XML

@@ -4,11 +4,11 @@
         <DynSentence name="QRY_CAPTXNJNL">
             <Sentence>
                 select DSK_NO DISK_NO,ORD_DT APPLY_DATE,AC_TYP ACCT_TYPE,AC_NO ACCT_NO,CUS_NAM ACCT_NAME,CAP_ORD_NO
-                TRANS_ID,
+                TRANS_ID,TACC_DT,
                 MERC_ORD_NO REF_ID,CORG_JRN_NO BANK_REF_ID, TXN_AMT AMOUNT,BNK_TYP BANK_TYPE,POSTSCRIPT,
                 TAC_NO PAYER_ACCT_NO,TAC_NAM PAYER_ACCT_NAME, CORG_NO ORG_NO,'' REMARK ,
                 TXN_STS TRANS_STS,RSP_MSG RESP_MESSAGE
-                from CAPTXNJNL t where ORD_DT = '%s' AND TXN_STS = 'S' order by to_number(MERC_ORD_NO)
+                from CAPTXNJNL t where TACC_DT = '%s' AND TXN_STS = 'S' order by to_number(MERC_ORD_NO)
             </Sentence>
             <Fields>CHK_DAT|</Fields>
         </DynSentence>