diff --git a/bui/etc/SVRLST.XML b/bui/etc/SVRLST.XML
index 9041ab7..a54f3e2 100644
--- a/bui/etc/SVRLST.XML
+++ b/bui/etc/SVRLST.XML
@@ -24,8 +24,8 @@
    </Group>
    -->
    <Group name="bui-cap"  desc="代收代付UI">
-      <Server name="OBUICAP1" desc="代收代付"  min="1" max="1" config_file="app/bui/etc/cap/OBUICAP1_ATR.XML"></Server>
-      <Server name="OBUICAP2" desc="代集团收代付新需求"  min="1" max="1" config_file="app/bui/etc/cap/OBUICAP2_ATR.XML"></Server>
+      <Server name="OBUICAP1" desc="代收代付服务"  min="1" max="1" config_file="app/bui/etc/cap/OBUICAP1_ATR.XML"></Server>
+      <Server name="OBUICAP2" desc="代收代付新服务"  min="1" max="1" config_file="app/bui/etc/cap/OBUICAP2_ATR.XML"></Server>
       <Server name="OBUICAP3" desc="代收付应用场景"  min="1" max="1" config_file="app/bui/etc/cap/OBUICAP3_ATR.XML"></Server>
       <Server name="SCAHRO1"  desc="鉴权接出服务"    min="1" max="1" config_file="app/bui/etc/cap/SCAHRO1_ATR.XML"  />
    </Group>
diff --git a/bui/etc/cap/OBUICAP1/2040804_CTL.XML b/bui/etc/cap/OBUICAP1/2040804_CTL.XML
index 5a7df48..0b839d0 100644
--- a/bui/etc/cap/OBUICAP1/2040804_CTL.XML
+++ b/bui/etc/cap/OBUICAP1/2040804_CTL.XML
@@ -3,7 +3,8 @@
     <Transaction code='2040804' log_switch='1' desc='报表查询下载信息分页查询'>
         <DynSentence name='QRY_CMMTRPTREGINFO'>
             <Sentence>
-                SELECT * FROM  CMMTRPTREG  
+                SELECT A.RPT_DAT,A.RPT_TYP,A.RPT_KND,A.RPT_FIL,A.RPT_FIL_NM,(A.RPT_FIL_URL||B.P_VALUES) AS  RPT_FIL_URL
+                FROM  CMMTRPTREG A LEFT JOIN CAPPARAMTER B ON B.P_KEY = 'FIL_TOKEN''  
                 WHERE  
                 (RPT_TYP LIKE '%%s%' OR '%s' IS NULL OR '%s' = '') AND 
 				(RPT_KND = '%s' OR '%s' IS NULL OR '%s' = '') AND 
diff --git a/cap/etc/OCAPRPT2/204071_CTL.XML b/cap/etc/OCAPRPT2/204071_CTL.XML
index ad9d9bc..1fec167 100644
--- a/cap/etc/OCAPRPT2/204071_CTL.XML
+++ b/cap/etc/OCAPRPT2/204071_CTL.XML
@@ -34,16 +34,19 @@
 
          <Set>RPT_FIL_NM=STRCAT("交易成功率统计报表-",FMTDATE($AC_DT,0,5),.xls)</Set>
 
+         <Exec func="PUB:SwitchDS">
+            <Arg name="name" value="_DB_NAME2" />
+         </Exec>
          <Exec func="PUB:GenerateReportNew" error="IGNORE"> <!--报表生成组件-->
             <Arg name="RptName" value="$RPTNAME" />
             <Arg name="RptFile" value="$CR_RPT_FILE" />
             <Arg name="STAT_DT" value="$STAT_DT" />
             <Arg name="END_DT" value="$END_DT" />
          </Exec>
-
          <If condition="~RetCod=-1">
             <Set>Rsp_Cd=20499</Set>
             <Set>Rsp_Msg=失败</Set>
+            <Exec func="PUB:SwitchDS"/>              
             <Return/>
          </If>
          <ElseIf condition="~RetCod=0">
@@ -52,10 +55,9 @@
             <Exec func="PUB:GWASetMsg">
                <Arg name="MsgCd" value="CAP00000" />
             </Exec>
-
-
          </ElseIf>
-
+         <Exec func="PUB:SwitchDS"/>  
+         
          <Set>FILE_NAME=$RPTNAME</Set>
          <Call package="UPLOAD_FILE" function="UPLOAD_FILE">
          </Call>          
diff --git a/cap/etc/OCAPRPT2/204072_CTL.XML b/cap/etc/OCAPRPT2/204072_CTL.XML
index 461b9a0..d1ba4ec 100644
--- a/cap/etc/OCAPRPT2/204072_CTL.XML
+++ b/cap/etc/OCAPRPT2/204072_CTL.XML
@@ -1,77 +1,78 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <Root>
-  <Transaction code="204072" desc="批量执行情况报表" log_switch="1">
-    <FlowCtrl>
-      <Exec func="PUB:InitGWA"  />              <!--交易初始化 -->
-      <Set>AC_DT=GETDATE()</Set>
-      
-      <Exec func="PUB:IsExistNode" error="IGNORE">
-          <Arg name="FieldName" value="END_DT"/>
-      </Exec>
-      <If condition="~RetCod=1"> <!--存在-->
-          <Set>END_DT=$END_DT</Set>
-      </If>
-      <Else>
-         <Set>END_DT=CALCDATE($AC_DT,-,d,1)</Set>
-      </Else>
-      
-      <Exec func="PUB:IsExistNode" error="IGNORE">
-          <Arg name="FieldName" value="STAT_DT"/>
-      </Exec>
-      <If condition="~RetCod=1"> <!--存在-->
-          <Set>STAT_DT=$STAT_DT</Set>
-      </If>
-      <Else>
-         <Set>STAT_DT=CALCDATE($END_DT,-,d,6)</Set>
-      </Else>
-      
-      <Exec func="PUB:IsExistNode" error="IGNORE">
-          <Arg name="FieldName" value="CORG_NO"/>
-      </Exec>
-      <If condition="~RetCod=1"> <!--存在-->
-          <Set>CORG_NO=$CORG_NO</Set>
-      </If>
-      <Else>
-         <Set>CORG_NO=</Set>
-      </Else>
-      
-      <Set>RPT_KND=RPT_D_002</Set>
-      <Set>raqname=STRCAT($RPT_KND,-,$AC_DT,.xls)</Set>
-      <Set>WORKDIR=GETENV(HWORKDIR)</Set>
-      <Set>CR_RPT_FILE=STRCAT($WORKDIR,/app/cap/etc/OCAPRPT2/RPT_D_002.raq)</Set>
-      <Set>RPTNAME=STRCAT(/tmp/data/,$raqname)</Set>
-      
-      <Set>RPT_FIL_NM=STRCAT("批量执行情况报表-",FMTDATE($AC_DT,0,5),.xls)</Set>
+   <Transaction code="204072" desc="批量执行情况报表" log_switch="1">
+      <FlowCtrl>
+         <Exec func="PUB:InitGWA"  />              <!--交易初始化 -->
+         <Set>AC_DT=GETDATE()</Set>
 
-      <Exec func="PUB:GenerateReportNew" error="IGNORE"> <!--报表生成组件-->
-          <Arg name="RptName" value="$RPTNAME" />
-          <Arg name="RptFile" value="$CR_RPT_FILE" />
-          <Arg name="STAT_DT" value="$STAT_DT" />
-          <Arg name="END_DT" value="$END_DT" />
-          <Arg name="CORG_NO" value="$CORG_NO" />
-      </Exec>
+         <Exec func="PUB:IsExistNode" error="IGNORE">
+            <Arg name="FieldName" value="END_DT"/>
+         </Exec>
+         <If condition="~RetCod=1"> <!--存在-->
+            <Set>END_DT=$END_DT</Set>
+         </If>
+         <Else>
+            <Set>END_DT=CALCDATE($AC_DT,-,d,1)</Set>
+         </Else>
 
+         <Exec func="PUB:IsExistNode" error="IGNORE">
+            <Arg name="FieldName" value="STAT_DT"/>
+         </Exec>
+         <If condition="~RetCod=1"> <!--存在-->
+            <Set>STAT_DT=$STAT_DT</Set>
+         </If>
+         <Else>
+            <Set>STAT_DT=CALCDATE($END_DT,-,d,6)</Set>
+         </Else>
+
+         <Exec func="PUB:IsExistNode" error="IGNORE">
+            <Arg name="FieldName" value="CORG_NO"/>
+         </Exec>
+         <If condition="~RetCod=1"> <!--存在-->
+            <Set>CORG_NO=$CORG_NO</Set>
+         </If>
+         <Else>
+            <Set>CORG_NO=</Set>
+         </Else>
+
+         <Set>RPT_KND=RPT_D_002</Set>
+         <Set>raqname=STRCAT($RPT_KND,-,$AC_DT,.xls)</Set>
+         <Set>WORKDIR=GETENV(HWORKDIR)</Set>
+         <Set>CR_RPT_FILE=STRCAT($WORKDIR,/app/cap/etc/OCAPRPT2/RPT_D_002.raq)</Set>
+         <Set>RPTNAME=STRCAT(/tmp/data/,$raqname)</Set>
+
+         <Set>RPT_FIL_NM=STRCAT("批量执行情况报表-",FMTDATE($AC_DT,0,5),.xls)</Set>
+         <Exec func="PUB:SwitchDS">
+            <Arg name="name" value="_DB_NAME2" />
+         </Exec>
+         <Exec func="PUB:GenerateReportNew" error="IGNORE"> <!--报表生成组件-->
+            <Arg name="RptName" value="$RPTNAME" />
+            <Arg name="RptFile" value="$CR_RPT_FILE" />
+            <Arg name="STAT_DT" value="$STAT_DT" />
+            <Arg name="END_DT" value="$END_DT" />
+            <Arg name="CORG_NO" value="$CORG_NO" />
+         </Exec>
          <If condition="~RetCod=-1">
-            <Set>Rsp_Cd=20499</Set>
-            <Set>Rsp_Msg=失败</Set>
+            <Exec func="PUB:GWASetMsg">
+               <Arg name="MsgCd" value="CAP00033"/>
+            </Exec>
+            <Exec func="PUB:SwitchDS"/>
             <Return/>
          </If>
          <ElseIf condition="~RetCod=0">
-            <Set>Rsp_Cd=00000</Set>
-            <Set>Rsp_Msg=成功</Set>
             <Exec func="PUB:GWASetMsg">
                <Arg name="MsgCd" value="CAP00000" />
             </Exec>
-
-
          </ElseIf>
 
+         <Exec func="PUB:SwitchDS"/>
+
          <Set>FILE_NAME=$RPTNAME</Set>
          <Call package="UPLOAD_FILE" function="UPLOAD_FILE">
-         </Call>          
-          
-          <Exec func="PUB:DumpETF" />
-         <Set>RPT_FIL_URL=$OUT_DAT.FILE_URL</Set>         
+         </Call>
+
+         <Exec func="PUB:DumpETF" />
+         <Set>RPT_FIL_URL=$OUT_DAT.FILE_URL</Set>
          <If condition="ISNULL($RPT_FIL_URL)">
             <Exec func="PUB:GWASetMsg">
                <Arg name="MsgCd" value="CAP00032"/>
@@ -81,7 +82,7 @@
 
          <Set>RPT_TYP=D</Set>
          <Quote name="Do_SVRPro"/>   <!--插入报表登记表-->
-    </FlowCtrl>
-  </Transaction>
+      </FlowCtrl>
+   </Transaction>
 </Root>
-    
+
diff --git a/cap/etc/OCAPRPT2/204073_CTL.XML b/cap/etc/OCAPRPT2/204073_CTL.XML
index de799b3..1297290 100644
--- a/cap/etc/OCAPRPT2/204073_CTL.XML
+++ b/cap/etc/OCAPRPT2/204073_CTL.XML
@@ -33,27 +33,30 @@
          <Set>RPTNAME=STRCAT(/tmp/data/,$raqname)</Set>
 
          <Set>RPT_FIL_NM=STRCAT("交易失败原因统计-",FMTDATE($AC_DT,0,5),.xls)</Set>
-
+         <Exec func="PUB:SwitchDS">
+            <Arg name="name" value="_DB_NAME2" />
+         </Exec>
          <Exec func="PUB:GenerateReportNew" error="IGNORE"> <!--报表生成组件-->
             <Arg name="RptName" value="$RPTNAME" />
             <Arg name="RptFile" value="$CR_RPT_FILE" />
             <Arg name="STAT_DT" value="$STAT_DT" />
             <Arg name="END_DT" value="$END_DT" />
          </Exec>
-
          <If condition="~RetCod=-1">
-            <Set>Rsp_Cd=20499</Set>
-            <Set>Rsp_Msg=失败</Set>
+            <Exec func="PUB:GWASetMsg">
+               <Arg name="MsgCd" value="CAP00033"/>
+            </Exec>
+            <Exec func="PUB:SwitchDS"/>
             <Return/>
          </If>
          <ElseIf condition="~RetCod=0">
-            <Set>Rsp_Cd=00000</Set>
-            <Set>Rsp_Msg=成功</Set>
             <Exec func="PUB:GWASetMsg">
                <Arg name="MsgCd" value="CAP00000" />
             </Exec>
          </ElseIf>
 
+         <Exec func="PUB:SwitchDS"/>
+
          <Set>FILE_NAME=$RPTNAME</Set>
          <Call package="UPLOAD_FILE" function="UPLOAD_FILE">
          </Call>
diff --git a/cap/etc/OCAPRPT2/204076_CTL.XML b/cap/etc/OCAPRPT2/204076_CTL.XML
index 71c90a8..35eeb2d 100644
--- a/cap/etc/OCAPRPT2/204076_CTL.XML
+++ b/cap/etc/OCAPRPT2/204076_CTL.XML
@@ -24,7 +24,9 @@
          <Set>RPTNAME=STRCAT(/tmp/data/,$raqname)</Set>
 
          <Set>RPT_FIL_NM=STRCAT("银行通道统计日报-",FMTDATE($CHK_DAT,0,5),.xls)</Set>
-
+         <Exec func="PUB:SwitchDS">
+            <Arg name="name" value="_DB_NAME2" />
+         </Exec>
          <Exec func="PUB:GenerateReportNew" error="IGNORE"> <!--报表生成组件-->
             <Arg name="RptName" value="$RPTNAME" />
             <Arg name="RptFile" value="$CR_RPT_FILE" />
@@ -34,6 +36,7 @@
             <Exec func="PUB:GWASetMsg">
                <Arg name="MsgCd" value="CAP00033"/>
             </Exec>
+            <Exec func="PUB:SwitchDS"/>
             <Return/>
          </If>
          <ElseIf condition="~RetCod=0">
@@ -42,6 +45,8 @@
             </Exec>
          </ElseIf>
 
+         <Exec func="PUB:SwitchDS"/>
+
          <Set>FILE_NAME=$RPTNAME</Set>
          <Call package="UPLOAD_FILE" function="UPLOAD_FILE">
          </Call>
diff --git a/cap/etc/OCAPRPT2/204077_CTL.XML b/cap/etc/OCAPRPT2/204077_CTL.XML
index 5a5b1b4..0380cc4 100644
--- a/cap/etc/OCAPRPT2/204077_CTL.XML
+++ b/cap/etc/OCAPRPT2/204077_CTL.XML
@@ -24,7 +24,9 @@
          <Set>RPTNAME=STRCAT(/tmp/data/,$raqname)</Set>
 
          <Set>RPT_FIL_NM=STRCAT("失败原因统计日报-",FMTDATE($ORD_DT,0,5),.xls)</Set>
-
+         <Exec func="PUB:SwitchDS">
+            <Arg name="name" value="_DB_NAME2" />
+         </Exec>
          <Exec func="PUB:GenerateReportNew" error="IGNORE"> <!--报表生成组件-->
             <Arg name="RptName" value="$RPTNAME" />
             <Arg name="RptFile" value="$CR_RPT_FILE" />
@@ -34,6 +36,7 @@
             <Exec func="PUB:GWASetMsg">
                <Arg name="MsgCd" value="CAP00033"/>
             </Exec>
+            <Exec func="PUB:SwitchDS"/>
             <Return/>
          </If>
          <ElseIf condition="~RetCod=0">
@@ -42,6 +45,8 @@
             </Exec>
          </ElseIf>
 
+         <Exec func="PUB:SwitchDS"/>
+
          <Set>FILE_NAME=$RPTNAME</Set>
          <Call package="UPLOAD_FILE" function="UPLOAD_FILE">
          </Call>
diff --git a/cap/etc/OCAPRPT2/204078_CTL.XML b/cap/etc/OCAPRPT2/204078_CTL.XML
index 108f036..e768421 100644
--- a/cap/etc/OCAPRPT2/204078_CTL.XML
+++ b/cap/etc/OCAPRPT2/204078_CTL.XML
@@ -26,7 +26,9 @@
          <Set>RPTNAME=STRCAT(/tmp/data/,$raqname)</Set>
 
          <Set>RPT_FIL_NM=STRCAT("失败原因统计月报-",$MONTH,.xls)</Set>
-
+         <Exec func="PUB:SwitchDS">
+            <Arg name="name" value="_DB_NAME2" />
+         </Exec>
          <Exec func="PUB:GenerateReportNew" error="IGNORE"> <!--报表生成组件-->
             <Arg name="RptName" value="$RPTNAME" />
             <Arg name="RptFile" value="$CR_RPT_FILE" />
@@ -37,6 +39,7 @@
             <Exec func="PUB:GWASetMsg">
                <Arg name="MsgCd" value="CAP00033"/>
             </Exec>
+            <Exec func="PUB:SwitchDS"/>
             <Return/>
          </If>
          <ElseIf condition="~RetCod=0">
@@ -45,6 +48,8 @@
             </Exec>
          </ElseIf>
 
+         <Exec func="PUB:SwitchDS"/>
+
          <Set>FILE_NAME=$RPTNAME</Set>
          <Call package="UPLOAD_FILE" function="UPLOAD_FILE">
          </Call>
diff --git a/cap/etc/OCAPRPT2/204079_CTL.XML b/cap/etc/OCAPRPT2/204079_CTL.XML
index a30e89a..88c0979 100644
--- a/cap/etc/OCAPRPT2/204079_CTL.XML
+++ b/cap/etc/OCAPRPT2/204079_CTL.XML
@@ -24,7 +24,9 @@
          <Set>RPTNAME=STRCAT(/tmp/data/,$raqname)</Set>
 
          <Set>RPT_FIL_NM=STRCAT("银行渠道统计日报表-",FMTDATE($ORD_DT,0,5),.xls)</Set>
-
+         <Exec func="PUB:SwitchDS">
+            <Arg name="name" value="_DB_NAME2" />
+         </Exec>
          <Exec func="PUB:GenerateReportNew" error="IGNORE"> <!--报表生成组件-->
             <Arg name="RptName" value="$RPTNAME" />
             <Arg name="RptFile" value="$CR_RPT_FILE" />
@@ -34,6 +36,7 @@
             <Exec func="PUB:GWASetMsg">
                <Arg name="MsgCd" value="CAP00033"/>
             </Exec>
+            <Exec func="PUB:SwitchDS"/>
             <Return/>
          </If>
          <ElseIf condition="~RetCod=0">
@@ -42,6 +45,8 @@
             </Exec>
          </ElseIf>
 
+         <Exec func="PUB:SwitchDS"/>
+
          <Set>FILE_NAME=$RPTNAME</Set>
          <Call package="UPLOAD_FILE" function="UPLOAD_FILE">
          </Call>
diff --git a/cap/etc/OCAPRPT2/204080_CTL.XML b/cap/etc/OCAPRPT2/204080_CTL.XML
index ee68b49..0c3ef02 100644
--- a/cap/etc/OCAPRPT2/204080_CTL.XML
+++ b/cap/etc/OCAPRPT2/204080_CTL.XML
@@ -26,7 +26,9 @@
          <Set>RPTNAME=STRCAT(/tmp/data/,$raqname)</Set>
 
          <Set>RPT_FIL_NM=STRCAT("银行渠道统计月报表-",$MONTH,.xls)</Set>
-
+         <Exec func="PUB:SwitchDS">
+            <Arg name="name" value="_DB_NAME2" />
+         </Exec>
          <Exec func="PUB:GenerateReportNew" error="IGNORE"> <!--报表生成组件-->
             <Arg name="RptName" value="$RPTNAME" />
             <Arg name="RptFile" value="$CR_RPT_FILE" />
@@ -37,6 +39,7 @@
             <Exec func="PUB:GWASetMsg">
                <Arg name="MsgCd" value="CAP00033"/>
             </Exec>
+            <Exec func="PUB:SwitchDS"/>
             <Return/>
          </If>
          <ElseIf condition="~RetCod=0">
@@ -45,6 +48,8 @@
             </Exec>
          </ElseIf>
 
+         <Exec func="PUB:SwitchDS"/>
+
          <Set>FILE_NAME=$RPTNAME</Set>
          <Call package="UPLOAD_FILE" function="UPLOAD_FILE">
          </Call>
diff --git a/cap/etc/OCAPRPT2/204081_CTL.XML b/cap/etc/OCAPRPT2/204081_CTL.XML
index 974064a..6c08dd0 100644
--- a/cap/etc/OCAPRPT2/204081_CTL.XML
+++ b/cap/etc/OCAPRPT2/204081_CTL.XML
@@ -24,7 +24,9 @@
          <Set>RPTNAME=STRCAT(/tmp/data/,$raqname)</Set>
 
          <Set>RPT_FIL_NM=STRCAT("易才集团支付情况统计日报表-",FMTDATE($ORD_DT,0,5),.xls)</Set>
-
+         <Exec func="PUB:SwitchDS">
+            <Arg name="name" value="_DB_NAME2" />
+         </Exec>
          <Exec func="PUB:GenerateReportNew" error="IGNORE"> <!--报表生成组件-->
             <Arg name="RptName" value="$RPTNAME" />
             <Arg name="RptFile" value="$CR_RPT_FILE" />
@@ -34,6 +36,7 @@
             <Exec func="PUB:GWASetMsg">
                <Arg name="MsgCd" value="CAP00033"/>
             </Exec>
+            <Exec func="PUB:SwitchDS"/>
             <Return/>
          </If>
          <ElseIf condition="~RetCod=0">
@@ -42,6 +45,8 @@
             </Exec>
          </ElseIf>
 
+         <Exec func="PUB:SwitchDS"/>
+
          <Set>FILE_NAME=$RPTNAME</Set>
          <Call package="UPLOAD_FILE" function="UPLOAD_FILE">
          </Call>
diff --git a/cap/etc/OCAPRPT2/204082_CTL.XML b/cap/etc/OCAPRPT2/204082_CTL.XML
index 974be80..c164872 100644
--- a/cap/etc/OCAPRPT2/204082_CTL.XML
+++ b/cap/etc/OCAPRPT2/204082_CTL.XML
@@ -26,7 +26,11 @@
          <Set>RPTNAME=STRCAT(/tmp/data/,$raqname)</Set>
 
          <Set>RPT_FIL_NM=STRCAT("易才集团支付情况统计月报表-",$MONTH,.xls)</Set>
+         
 
+         <Exec func="PUB:SwitchDS">
+            <Arg name="name" value="_DB_NAME2" />
+         </Exec>
          <Exec func="PUB:GenerateReportNew" error="IGNORE"> <!--报表生成组件-->
             <Arg name="RptName" value="$RPTNAME" />
             <Arg name="RptFile" value="$CR_RPT_FILE" />
@@ -37,6 +41,7 @@
             <Exec func="PUB:GWASetMsg">
                <Arg name="MsgCd" value="CAP00033"/>
             </Exec>
+            <Exec func="PUB:SwitchDS"/>            
             <Return/>
          </If>
          <ElseIf condition="~RetCod=0">
@@ -44,6 +49,8 @@
                <Arg name="MsgCd" value="CAP00000" />
             </Exec>
          </ElseIf>
+          
+         <Exec func="PUB:SwitchDS"/>
 
          <Set>FILE_NAME=$RPTNAME</Set>
          <Call package="UPLOAD_FILE" function="UPLOAD_FILE">
diff --git a/cap/etc/OCAPRPT2/204083_CTL.XML b/cap/etc/OCAPRPT2/204083_CTL.XML
index 7ae8389..550d595 100644
--- a/cap/etc/OCAPRPT2/204083_CTL.XML
+++ b/cap/etc/OCAPRPT2/204083_CTL.XML
@@ -24,7 +24,9 @@
          <Set>RPTNAME=STRCAT(/tmp/data/,$raqname)</Set>
 
          <Set>RPT_FIL_NM=STRCAT("客户发放情况统计日报表-",FMTDATE($ORD_DT,0,5),.xls)</Set>
-
+         <Exec func="PUB:SwitchDS">
+            <Arg name="name" value="_DB_NAME2" />
+         </Exec>
          <Exec func="PUB:GenerateReportNew" error="IGNORE"> <!--报表生成组件-->
             <Arg name="RptName" value="$RPTNAME" />
             <Arg name="RptFile" value="$CR_RPT_FILE" />
@@ -34,6 +36,7 @@
             <Exec func="PUB:GWASetMsg">
                <Arg name="MsgCd" value="CAP00033"/>
             </Exec>
+            <Exec func="PUB:SwitchDS"/>
             <Return/>
          </If>
          <ElseIf condition="~RetCod=0">
@@ -42,6 +45,8 @@
             </Exec>
          </ElseIf>
 
+         <Exec func="PUB:SwitchDS"/>
+
          <Set>FILE_NAME=$RPTNAME</Set>
          <Call package="UPLOAD_FILE" function="UPLOAD_FILE">
          </Call>
diff --git a/cap/etc/OCAPRPT2/204084_CTL.XML b/cap/etc/OCAPRPT2/204084_CTL.XML
index e1194aa..6413c0b 100644
--- a/cap/etc/OCAPRPT2/204084_CTL.XML
+++ b/cap/etc/OCAPRPT2/204084_CTL.XML
@@ -26,7 +26,9 @@
          <Set>RPTNAME=STRCAT(/tmp/data/,$raqname)</Set>
 
          <Set>RPT_FIL_NM=STRCAT("客户发放情况统计月报表-",$MONTH,.xls)</Set>
-
+         <Exec func="PUB:SwitchDS">
+            <Arg name="name" value="_DB_NAME2" />
+         </Exec>
          <Exec func="PUB:GenerateReportNew" error="IGNORE"> <!--报表生成组件-->
             <Arg name="RptName" value="$RPTNAME" />
             <Arg name="RptFile" value="$CR_RPT_FILE" />
@@ -37,6 +39,7 @@
             <Exec func="PUB:GWASetMsg">
                <Arg name="MsgCd" value="CAP00033"/>
             </Exec>
+            <Exec func="PUB:SwitchDS"/>
             <Return/>
          </If>
          <ElseIf condition="~RetCod=0">
@@ -45,6 +48,8 @@
             </Exec>
          </ElseIf>
 
+         <Exec func="PUB:SwitchDS"/>
+
          <Set>FILE_NAME=$RPTNAME</Set>
          <Call package="UPLOAD_FILE" function="UPLOAD_FILE">
          </Call>
diff --git a/cap/etc/OCAPRPT2/204085_CTL.XML b/cap/etc/OCAPRPT2/204085_CTL.XML
index 0299714..1b335f4 100644
--- a/cap/etc/OCAPRPT2/204085_CTL.XML
+++ b/cap/etc/OCAPRPT2/204085_CTL.XML
@@ -26,7 +26,9 @@
          <Set>RPTNAME=STRCAT(/tmp/data/,$raqname)</Set>
 
          <Set>RPT_FIL_NM=STRCAT("招行退票统计月报表-",$MONTH,.xls)</Set>
-
+         <Exec func="PUB:SwitchDS">
+            <Arg name="name" value="_DB_NAME2" />
+         </Exec>
          <Exec func="PUB:GenerateReportNew" error="IGNORE"> <!--报表生成组件-->
             <Arg name="RptName" value="$RPTNAME" />
             <Arg name="RptFile" value="$CR_RPT_FILE" />
@@ -37,6 +39,7 @@
             <Exec func="PUB:GWASetMsg">
                <Arg name="MsgCd" value="CAP00033"/>
             </Exec>
+            <Exec func="PUB:SwitchDS"/>
             <Return/>
          </If>
          <ElseIf condition="~RetCod=0">
@@ -45,6 +48,8 @@
             </Exec>
          </ElseIf>
 
+         <Exec func="PUB:SwitchDS"/>
+
          <Set>FILE_NAME=$RPTNAME</Set>
          <Call package="UPLOAD_FILE" function="UPLOAD_FILE">
          </Call>
diff --git a/cap/etc/OCAPRPT2/204087_CTL.XML b/cap/etc/OCAPRPT2/204087_CTL.XML
index 34db70f..0162451 100644
--- a/cap/etc/OCAPRPT2/204087_CTL.XML
+++ b/cap/etc/OCAPRPT2/204087_CTL.XML
@@ -24,7 +24,9 @@
          <Set>RPTNAME=STRCAT(/tmp/data/,$raqname)</Set>
 
          <Set>RPT_FIL_NM=STRCAT("本行跨行支付情况统计日报表-",FMTDATE($ORD_DT,0,5),.xls)</Set>
-
+         <Exec func="PUB:SwitchDS">
+            <Arg name="name" value="_DB_NAME2" />
+         </Exec>
          <Exec func="PUB:GenerateReportNew" error="IGNORE"> <!--报表生成组件-->
             <Arg name="RptName" value="$RPTNAME" />
             <Arg name="RptFile" value="$CR_RPT_FILE" />
@@ -34,6 +36,7 @@
             <Exec func="PUB:GWASetMsg">
                <Arg name="MsgCd" value="CAP00033"/>
             </Exec>
+            <Exec func="PUB:SwitchDS"/>
             <Return/>
          </If>
          <ElseIf condition="~RetCod=0">
@@ -42,6 +45,8 @@
             </Exec>
          </ElseIf>
 
+         <Exec func="PUB:SwitchDS"/>
+
          <Set>FILE_NAME=$RPTNAME</Set>
          <Call package="UPLOAD_FILE" function="UPLOAD_FILE">
          </Call>
diff --git a/cap/etc/OCAPRPT2/204088_CTL.XML b/cap/etc/OCAPRPT2/204088_CTL.XML
index 070d82a..5a42f60 100644
--- a/cap/etc/OCAPRPT2/204088_CTL.XML
+++ b/cap/etc/OCAPRPT2/204088_CTL.XML
@@ -26,7 +26,9 @@
          <Set>RPTNAME=STRCAT(/tmp/data/,$raqname)</Set>
 
          <Set>RPT_FIL_NM=STRCAT("本行跨行支付情况统计月报表-",$MONTH,.xls)</Set>
-
+         <Exec func="PUB:SwitchDS">
+            <Arg name="name" value="_DB_NAME2" />
+         </Exec>
          <Exec func="PUB:GenerateReportNew" error="IGNORE"> <!--报表生成组件-->
             <Arg name="RptName" value="$RPTNAME" />
             <Arg name="RptFile" value="$CR_RPT_FILE" />
@@ -37,6 +39,7 @@
             <Exec func="PUB:GWASetMsg">
                <Arg name="MsgCd" value="CAP00033"/>
             </Exec>
+            <Exec func="PUB:SwitchDS"/>
             <Return/>
          </If>
          <ElseIf condition="~RetCod=0">
@@ -45,6 +48,8 @@
             </Exec>
          </ElseIf>
 
+         <Exec func="PUB:SwitchDS"/>
+
          <Set>FILE_NAME=$RPTNAME</Set>
          <Call package="UPLOAD_FILE" function="UPLOAD_FILE">
          </Call>
diff --git a/cap/etc/OCAPRPT2/UPLOAD_FILE_PKG.XML b/cap/etc/OCAPRPT2/UPLOAD_FILE_PKG.XML
index 4b6c679..5ef5df9 100644
--- a/cap/etc/OCAPRPT2/UPLOAD_FILE_PKG.XML
+++ b/cap/etc/OCAPRPT2/UPLOAD_FILE_PKG.XML
@@ -47,7 +47,7 @@
             </Exec>
             <Return/>
          </If>
-         <Set>FILE_URL=STRCAT($URL,/file/download/,$OUT_DAT.FILE_ID,?token=,$TOKEN)</Set>
+         <Set>FILE_URL=STRCAT($URL,/file/download/,$OUT_DAT.FILE_ID,?token=)</Set>
          <Set>OUT_DAT.FILE_URL=$FILE_URL</Set>
 
          <Exec func="PUB:CmpSetMsg">
diff --git a/cap/etc/OCAPRPT2_CTL.XML b/cap/etc/OCAPRPT2_CTL.XML
index 8de01a8..d95a8e9 100644
--- a/cap/etc/OCAPRPT2_CTL.XML
+++ b/cap/etc/OCAPRPT2_CTL.XML
@@ -6,9 +6,9 @@
     <Macro name="Do_SVRInf">
       <DynSentence name="Insrpt">
         <Sentence>
-          INSERT INTO CMMTRPTREG (RPT_DAT,RPT_TYP,RPT_KND,RPT_FIL,RPT_FIL_NM,RPT_FIL_URL) VALUES('%s','%s','%s','%s','%s','%s')
+          INSERT INTO CMMTRPTREG (RPT_DAT,RPT_TYP,RPT_KND,RPT_FIL,RPT_FIL_NM,RPT_FIL_URL,TM_SMP) VALUES(?,?,?,?,?,?,?)
         </Sentence>
-        <Fields>RPT_DAT|RPT_TYP|RPT_KND|RPT_FIL|RPT_FIL_NM|RPT_FIL_URL|</Fields>
+        <Fields>RPT_DAT|RPT_TYP|RPT_KND|RPT_FIL|RPT_FIL_NM|RPT_FIL_URL|INSTMSMP|</Fields>
       </DynSentence>
       <DynSentence name="Delrpt">
         <Sentence>
@@ -22,7 +22,7 @@
       <Set>RPT_DAT=GETDATE()</Set>
       <Set>RPT_KND=$RPT_KND</Set>
       <Set>RPT_FIL=$raqname</Set>
-      <!--Set>TM_SMP=GETDATETIME()</Set-->
+      <Set>INSTMSMP=GETDATETIME()</Set>
 
       <Exec func="PUB:ExecSql" error="IGNORE">
         <Arg name="SqlCmd" value="Delrpt"/>
diff --git a/cap/etc/SVRLST.XML b/cap/etc/SVRLST.XML
index 75a48b5..4cb4d21 100644
--- a/cap/etc/SVRLST.XML
+++ b/cap/etc/SVRLST.XML
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <FrontTab>
-	<Group name="cap" desc="平安代收付">
-              <Server name="OCAPRPT1" min="1" max="1"	config_file="app/cap/etc/OCAPRPT1_ATR.XML" desc="平安代收付OTA服务-报表" />
-              <Server name="OCAPRPT2" min="1" max="1"   config_file="app/cap/etc/OCAPRPT2_ATR.XML" desc="集团代收付新需求报表" />
-	</Group>
+   <Group name="cap" desc="代收付报表">
+      <Server name="OCAPRPT1" min="1" max="1"	config_file="app/cap/etc/OCAPRPT1_ATR.XML" desc="代收付报表服务-报表" />
+      <Server name="OCAPRPT2" min="1" max="1"   config_file="app/cap/etc/OCAPRPT2_ATR.XML" desc="代收付报表服务-新报表" />
+   </Group>
 </FrontTab>