diff --git a/base/etc/S.JMSSVR_ATR.XML b/base/etc/S.JMSSVR_ATR.XML
index 864abe3..9e6c3d9 100644
--- a/base/etc/S.JMSSVR_ATR.XML
+++ b/base/etc/S.JMSSVR_ATR.XML
@@ -7,12 +7,10 @@
 2006.4.23              xu_lw                   创建
 -->
 <Server name="S.JMSSVR" type="CCA" trace="INFO">
-  <Declare name = "listener" class = "com.hisun.listener.HiJMSListener" >
-    <Param name = "factory"     value = "${_QUEUE_FACTORY}"/>
-    <Param name = "queue"       value = "${_QUEUE}"/>
+  <Declare name = "listener" class = "com.hisun.ics.jms.handler.HiJMSListener" >
+    <Param name = "queueName"       value = "_DEFAULT_QUEUE_NAME"/>
     <Param name = "maxThreads"  value = "20"/>
     <Param name = "minThreads"  value = "20"/>
-    <Param name = "timeOut"     value = "10"/>
   </Declare>
   <Process name = "proc1" msgtype = "DEFAULT">
      <SystemHandler name = "callService"/>
diff --git a/base/etc/TIMCON_PUB.XML b/base/etc/TIMCON_PUB.XML
index 42ad553..2cb055d 100644
--- a/base/etc/TIMCON_PUB.XML
+++ b/base/etc/TIMCON_PUB.XML
@@ -27,5 +27,10 @@
    <ROOT/>
   </Data>
  </SchItem>
+
+  <!--定时生成日报表-->
+ <CycleItem istxn='0'  objsvr="OCAPRPT2" txncod='204076' txndatatype='text/etf' txndat='' funcname='' funcpath = ''  sndflag ='0'  tmout="3600" minute='30' hour='1' monthday='*' weekday='*' monthweek='*' month='*' trace='1'>
+        <Data><ROOT><GWA><SYS_CNL>SYS</SYS_CNL></GWA></ROOT></Data>
+    </CycleItem>
    
 </Cycles>
diff --git a/bui/etc/BUI_PUB_CTL.XML b/bui/etc/BUI_PUB_CTL.XML
index fa9d04f..5398f11 100644
--- a/bui/etc/BUI_PUB_CTL.XML
+++ b/bui/etc/BUI_PUB_CTL.XML
@@ -85,7 +85,7 @@
             <Set>token=$TOKEN</Set>
             <Set>funcId=$FUNC_ID</Set>
             <Set>TXN_CD=$TXN_CD</Set>
-            <If condition="IS_NOEQUAL_STRING($TXN_CD,4807106,4807002,0030006,0030004,0030005,2040866,2040841,2040881,2040876,2040867,2040869,2040862,2040860,4908103)">
+            <If condition="IS_NOEQUAL_STRING($TXN_CD,4807106,4807002,0030006,0030004,0030005,2040866,2040841,2040881,2040876,2040867,2040869,2040862,2040860,4908103,204076,4905104)">
                <!--第三方鉴权-->
                <Exec func="PUB:CallThirdComm" error="IGNORE">
                   <Arg name="HTxnCd" value="TokenVerify" />
@@ -149,7 +149,7 @@
                <Exec func="PUB:RollbackWork" error="IGNORE" />
             </Else>
             <!--FLG_LOG值为0：代表此交易不用写入操作日志 ;其他情况则写入操作日志中 --> 
-            <If condition="IS_NOEQUAL_STRING($TXN_CD,4807106,4807002,0030006,0030004,0030005,2040866,2040841,2040881,2040876,2040867,2040862,2040860,4908103)">             
+            <If condition="IS_NOEQUAL_STRING($TXN_CD,4807106,4807002,0030006,0030004,0030005,2040866,2040841,2040881,2040876,2040867,2040862,2040860,4908103,204076,4905104)">             
                <!--操作员流水 --> 
                <Set>MSG_TYP=$GWA.MSG_TYP</Set>               
                <Set>MSG_CD=$GWA.MSG_CD</Set>               
diff --git a/bui/etc/cap/OBUICAP1/2040801_CTL.XML b/bui/etc/cap/OBUICAP1/2040801_CTL.XML
index 91263eb..88e07d3 100644
--- a/bui/etc/cap/OBUICAP1/2040801_CTL.XML
+++ b/bui/etc/cap/OBUICAP1/2040801_CTL.XML
@@ -18,10 +18,11 @@
             AND ('%s' IS NULL OR J.ORD_TYP = '%s')
             AND ('%s' IS NULL OR J.CAP_ORD_NO = '%s')
             AND ('%s' IS NULL OR J.TXN_CNL = '%s')
+            AND ('%s' IS NULL OR J.CORG_DSK_NO = '%s')
             AND (J.ORD_DT &gt;='%s' OR '%s' IS NULL)
             AND (J.ORD_DT &lt;='%s' OR '%s' IS NULL) order by J.TXN_TM desc
          </Sentence>
-         <Fields>MERC_ID|MERC_ID|MERC_ORD_NO|MERC_ORD_NO|DSK_NAM|DSK_NAM|JRN_NO|JRN_NO|CRD_NO|CRD_NO|CORG_NO|CORG_NO|TXN_MOD|TXN_MOD|ORD_TYP|ORD_TYP|CAP_ORD_NO|CAP_ORD_NO|TXN_CNL|TXN_CNL|BEG_DT|BEG_DT|END_DT|END_DT|</Fields>
+         <Fields>MERC_ID|MERC_ID|MERC_ORD_NO|MERC_ORD_NO|DSK_NAM|DSK_NAM|JRN_NO|JRN_NO|CRD_NO|CRD_NO|CORG_NO|CORG_NO|TXN_MOD|TXN_MOD|ORD_TYP|ORD_TYP|CAP_ORD_NO|CAP_ORD_NO|TXN_CNL|TXN_CNL|CORG_DSK_NO|CORG_DSK_NO|BEG_DT|BEG_DT|END_DT|END_DT|</Fields>
       </DynSentence>
 
       <DynSentence name="QRY_CAPTXNJNL_S">   <!--查询成功状态-->
@@ -41,10 +42,11 @@
             AND ('%s' IS NULL OR J.ORD_TYP = '%s')
             AND ('%s' IS NULL OR J.CAP_ORD_NO = '%s')
             AND ('%s' IS NULL OR J.TXN_CNL = '%s')
+            AND ('%s' IS NULL OR J.CORG_DSK_NO = '%s')            
             AND (J.ORD_DT &gt;='%s' OR '%s' IS NULL)
             AND (J.ORD_DT &lt;='%s' OR '%s' IS NULL) order by J.TXN_TM desc
          </Sentence>
-         <Fields>MERC_ID|MERC_ID|MERC_ORD_NO|MERC_ORD_NO|DSK_NAM|DSK_NAM|JRN_NO|JRN_NO|CRD_NO|CRD_NO|CORG_NO|CORG_NO|TXN_MOD|TXN_MOD|ORD_TYP|ORD_TYP|CAP_ORD_NO|CAP_ORD_NO|TXN_CNL|TXN_CNL|BEG_DT|BEG_DT|END_DT|END_DT|</Fields>
+         <Fields>MERC_ID|MERC_ID|MERC_ORD_NO|MERC_ORD_NO|DSK_NAM|DSK_NAM|JRN_NO|JRN_NO|CRD_NO|CRD_NO|CORG_NO|CORG_NO|TXN_MOD|TXN_MOD|ORD_TYP|ORD_TYP|CAP_ORD_NO|CAP_ORD_NO|TXN_CNL|TXN_CNL|CORG_DSK_NO|CORG_DSK_NO|BEG_DT|BEG_DT|END_DT|END_DT|</Fields>
       </DynSentence>
 
       <DynSentence name="QRY_CAPTXNJNL_F">   <!-- 查询失败状态 -->
@@ -64,10 +66,11 @@
             AND ('%s' IS NULL OR J.ORD_TYP = '%s')
             AND ('%s' IS NULL OR J.CAP_ORD_NO = '%s')
             AND ('%s' IS NULL OR J.TXN_CNL = '%s')
+            AND ('%s' IS NULL OR J.CORG_DSK_NO = '%s')            
             AND (J.ORD_DT &gt;='%s' OR '%s' IS NULL)
             AND (J.ORD_DT &lt;='%s' OR '%s' IS NULL) order by J.TXN_TM desc
          </Sentence>
-         <Fields>MERC_ID|MERC_ID|MERC_ORD_NO|MERC_ORD_NO|DSK_NAM|DSK_NAM|JRN_NO|JRN_NO|CRD_NO|CRD_NO|CORG_NO|CORG_NO|TXN_MOD|TXN_MOD|ORD_TYP|ORD_TYP|CAP_ORD_NO|CAP_ORD_NO|TXN_CNL|TXN_CNL|BEG_DT|BEG_DT|END_DT|END_DT|</Fields>
+         <Fields>MERC_ID|MERC_ID|MERC_ORD_NO|MERC_ORD_NO|DSK_NAM|DSK_NAM|JRN_NO|JRN_NO|CRD_NO|CRD_NO|CORG_NO|CORG_NO|TXN_MOD|TXN_MOD|ORD_TYP|ORD_TYP|CAP_ORD_NO|CAP_ORD_NO|TXN_CNL|TXN_CNL|CORG_DSK_NO|CORG_DSK_NO|BEG_DT|BEG_DT|END_DT|END_DT|</Fields>
       </DynSentence>
 
       <DynSentence name="QRY_CAPTXNJNL_U">   <!-- 查询预计状态 -->
@@ -87,10 +90,11 @@
             AND ('%s' IS NULL OR J.ORD_TYP = '%s')
             AND ('%s' IS NULL OR J.CAP_ORD_NO = '%s')
             AND ('%s' IS NULL OR J.TXN_CNL = '%s')
+            AND ('%s' IS NULL OR J.CORG_DSK_NO = '%s')            
             AND (J.ORD_DT &gt;='%s' OR '%s' IS NULL)
             AND (J.ORD_DT &lt;='%s' OR '%s' IS NULL) order by J.TXN_TM desc
          </Sentence>
-         <Fields>MERC_ID|MERC_ID|MERC_ORD_NO|MERC_ORD_NO|DSK_NAM|DSK_NAM|JRN_NO|JRN_NO|CRD_NO|CRD_NO|CORG_NO|CORG_NO|TXN_MOD|TXN_MOD|ORD_TYP|ORD_TYP|CAP_ORD_NO|CAP_ORD_NO|TXN_CNL|TXN_CNL|BEG_DT|BEG_DT|END_DT|END_DT|</Fields>
+         <Fields>MERC_ID|MERC_ID|MERC_ORD_NO|MERC_ORD_NO|DSK_NAM|DSK_NAM|JRN_NO|JRN_NO|CRD_NO|CRD_NO|CORG_NO|CORG_NO|TXN_MOD|TXN_MOD|ORD_TYP|ORD_TYP|CAP_ORD_NO|CAP_ORD_NO|TXN_CNL|TXN_CNL|CORG_DSK_NO|CORG_DSK_NO|BEG_DT|BEG_DT|END_DT|END_DT|</Fields>
       </DynSentence>
 
 
@@ -111,10 +115,11 @@
             AND ('%s' IS NULL OR J.ORD_TYP = '%s')
             AND ('%s' IS NULL OR J.CAP_ORD_NO = '%s')
             AND ('%s' IS NULL OR J.TXN_CNL = '%s')
+            AND ('%s' IS NULL OR J.CORG_DSK_NO = '%s')            
             AND (J.ORD_DT &gt;='%s' OR '%s' IS NULL)
             AND (J.ORD_DT &lt;='%s' OR '%s' IS NULL) order by J.TXN_TM desc
          </Sentence>
-         <Fields>MERC_ID|MERC_ID|MERC_ORD_NO|MERC_ORD_NO|DSK_NAM|DSK_NAM|JRN_NO|JRN_NO|CRD_NO|CRD_NO|CORG_NO|CORG_NO|TXN_MOD|TXN_MOD|ORD_TYP|ORD_TYP|CAP_ORD_NO|CAP_ORD_NO|TXN_CNL|TXN_CNL|BEG_DT|BEG_DT|END_DT|END_DT|</Fields>
+         <Fields>MERC_ID|MERC_ID|MERC_ORD_NO|MERC_ORD_NO|DSK_NAM|DSK_NAM|JRN_NO|JRN_NO|CRD_NO|CRD_NO|CORG_NO|CORG_NO|TXN_MOD|TXN_MOD|ORD_TYP|ORD_TYP|CAP_ORD_NO|CAP_ORD_NO|TXN_CNL|TXN_CNL|CORG_DSK_NO|CORG_DSK_NO|BEG_DT|BEG_DT|END_DT|END_DT|</Fields>
       </DynSentence>
       <FlowCtrl>
 
diff --git a/bui/etc/cap/OBUICAP2/4905104_CTL.XML b/bui/etc/cap/OBUICAP2/4905104_CTL.XML
new file mode 100644
index 0000000..534c840
--- /dev/null
+++ b/bui/etc/cap/OBUICAP2/4905104_CTL.XML
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding='UTF-8'?>
+<Root>
+   <Transaction code="4905104" log_switch="1" desc="查询事务预警规则设置">
+      <DynSentence name="QRY_CAPEVTRLR">
+         <Sentence>
+            SELECT *
+            FROM
+            CAPEVTRLR
+            WHERE
+            (EVT_TYP=? or ? is null)
+         </Sentence>
+         <Fields>EVT_TYP|EVT_TYP|</Fields>
+      </DynSentence>
+      <DynSentence name="QRY_CAPEVTRLR_COUNT">
+         <Sentence>
+            SELECT COUNT(*) TOT_REC_NUM
+            FROM
+            CAPEVTRLR
+            WHERE
+            (EVT_TYP=? or ? is null)
+         </Sentence>
+         <Fields>EVT_TYP|EVT_TYP|</Fields>
+      </DynSentence>
+      <FlowCtrl>
+         <Exec func="PUB:DumpETF"/>
+         <Set>FLAG=$FLAG</Set>
+         <Set>EVT_TYP=$EVT_TYP</Set>
+         <If condition="IS_EQUAL_INT($FLAG,0)">
+            <Exec func="PUB:QueryInGroup" >
+               <Arg name="SqlCmd" value="QRY_CAPEVTRLR" />
+               <Arg name="RecordName" value="CAPEVTRLR" />
+               <Arg name="limit" value="50" />
+            </Exec >
+
+            <If condition="~RetCod=2">
+               <Exec func="PUB:GWASetMsg">
+                  <Arg name="MsgCd" value="CMM00000"/>
+                  <Arg name="MsgDat" value="无查询结果"/>
+               </Exec>
+               <Return/>
+            </If>
+            <ElseIf condition="~RetCod=0">
+               <Exec func="PUB:GWASetMsg">
+                  <Arg name="MsgCd" value="BUI00000"/>
+                  <Arg name="MsgDat" value="查询成功"/>
+               </Exec>
+            </ElseIf>
+            <Else>
+               <Exec func="PUB:GWASetMsg">
+                  <Arg name="MsgCd" value="BUI26006"/>
+                  <Arg name="MsgDat" value="查询数据库出错"/>
+               </Exec>
+               <Return/>
+            </Else>
+         </If>
+
+         <Exec func="PUB:DumpETF"/>
+      </FlowCtrl>
+   </Transaction>
+</Root>
diff --git a/bui/etc/cap/OBUICAP2_CTL.XML b/bui/etc/cap/OBUICAP2_CTL.XML
index 6b27846..f3de4c2 100644
--- a/bui/etc/cap/OBUICAP2_CTL.XML
+++ b/bui/etc/cap/OBUICAP2_CTL.XML
@@ -81,6 +81,8 @@
     <Include file="etc/cap/OBUICAP2/4905102_CTL.XML" />
     <!--查询 -->
     <Include file="etc/cap/OBUICAP2/4905103_CTL.XML" />
+    <!--组查询 -->
+    <Include file="etc/cap/OBUICAP2/4905104_CTL.XML" />
     <!--合作机构信息-->
     <!--查询 -->
     <Include file="etc/cap/OBUICAP2/4906103_CTL.XML" />
diff --git a/bui/etc/cap/SCAHRO1_ATR.XML b/bui/etc/cap/SCAHRO1_ATR.XML
index 9702831..9554f3f 100644
--- a/bui/etc/cap/SCAHRO1_ATR.XML
+++ b/bui/etc/cap/SCAHRO1_ATR.XML
@@ -1,25 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Server PUBLIC "-//HISUN//DTD//ATR" "ATR.dtd">
-<Server name="SCAHRO1" type="SCA" trace="DEBUG">
-
-   <Declare name="connector" class="com.murong.ctg.protocol.http.client.hro.HroHttpConnector">
-      <Param name="url"    value="http://172.17.20.92/rhro-service-1.0/verifyToken" />
-      <Param name="method" value="GET" />
-      <Param name="key" value="7nEBaDBay2vNKXnWBQqSRZX8wEK3iVOP" />
-      <Param name="tmOut"  value="3" />
-      <Param name="charSet"  value="UTF-8" />
-      <Param name="contentType"  value="application/x-www-form-urlencoded" />
-   </Declare>
-
-
-   <Declare name="itfengine" class="com.hisun.engine.HiEngine">
-      <Param name="ITF" value="etc/cap/SCAHRO1_ITF.XML" />
-   </Declare>
-
-   <Process name="proc1" msgtype="DEFAULT">
-      <Handler name="itfengine" />
-      <Handler name="connector" />
-      <Handler name="itfengine" />
-   </Process>
-</Server>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Server PUBLIC "-//HISUN//DTD//ATR" "ATR.dtd">
+<Server name="SCAHRO1" type="SCA" trace="DEBUG">
+
+   <Declare name="connector" class="com.murong.ctg.protocol.http.client.hro.HroHttpConnector">
+      <Param name="url"    value="${_URL}" />
+      <Param name="method" value="${_METHOD}" />
+      <Param name="key" value="${_KEY}" />
+      <Param name="tmOut"  value="${_TM_OUT}" />
+      <Param name="charSet"  value="${_CHAR_SET}" />
+      <Param name="contentType"  value="${_CONTENT_TYPE}" />
+   </Declare>
+
+
+   <Declare name="itfengine" class="com.hisun.engine.HiEngine">
+      <Param name="ITF" value="etc/cap/SCAHRO1_ITF.XML" />
+   </Declare>
+
+   <Process name="proc1" msgtype="DEFAULT">
+      <Handler name="itfengine" />
+      <Handler name="connector" />
+      <Handler name="itfengine" />
+   </Process>
+</Server>
diff --git a/cap/applib/zip4j-2.6.4.jar b/cap/applib/zip4j-2.6.4.jar
new file mode 100644
index 0000000..f7cf67d
Binary files /dev/null and b/cap/applib/zip4j-2.6.4.jar differ
diff --git a/cap/etc/OCAPRPT2/204076_CTL.XML b/cap/etc/OCAPRPT2/204076_CTL.XML
new file mode 100644
index 0000000..71c90a8
--- /dev/null
+++ b/cap/etc/OCAPRPT2/204076_CTL.XML
@@ -0,0 +1,63 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Root>
+   <Transaction code="204076" desc="银行通道统计日报" log_switch="1">
+      <FlowCtrl>
+         <Exec func="PUB:InitGWA"  />              <!--交易初始化 -->
+         <Set>AC_DT=GETDATE()</Set>
+
+
+         <Exec func="PUB:IsExistNode" error="IGNORE">
+            <Arg name="FieldName" value="CHK_DAT"/>
+         </Exec>
+         <If condition="~RetCod=1"> <!--存在-->
+            <Set>CHK_DAT=$CHK_DAT</Set>
+         </If>
+         <Else>
+            <Set>CHK_DAT=CALCDATE($AC_DT,-,d,1)</Set>
+         </Else>
+
+
+         <Set>RPT_KND=RPT_D_006</Set>
+         <Set>raqname=STRCAT($RPT_KND,-,$CHK_DAT,.xls)</Set>
+         <Set>WORKDIR=GETENV(HWORKDIR)</Set>
+         <Set>CR_RPT_FILE=STRCAT($WORKDIR,/app/cap/etc/OCAPRPT2/RPT_D_006.raq)</Set>
+         <Set>RPTNAME=STRCAT(/tmp/data/,$raqname)</Set>
+
+         <Set>RPT_FIL_NM=STRCAT("银行通道统计日报-",FMTDATE($CHK_DAT,0,5),.xls)</Set>
+
+         <Exec func="PUB:GenerateReportNew" error="IGNORE"> <!--报表生成组件-->
+            <Arg name="RptName" value="$RPTNAME" />
+            <Arg name="RptFile" value="$CR_RPT_FILE" />
+            <Arg name="CHK_DAT" value="$CHK_DAT" />
+         </Exec>
+         <If condition="~RetCod=-1">
+            <Exec func="PUB:GWASetMsg">
+               <Arg name="MsgCd" value="CAP00033"/>
+            </Exec>
+            <Return/>
+         </If>
+         <ElseIf condition="~RetCod=0">
+            <Exec func="PUB:GWASetMsg">
+               <Arg name="MsgCd" value="CAP00000" />
+            </Exec>
+         </ElseIf>
+
+         <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>
+         <If condition="ISNULL($RPT_FIL_URL)">
+            <Exec func="PUB:GWASetMsg">
+               <Arg name="MsgCd" value="CAP00032"/>
+            </Exec>
+            <Return/>
+         </If>
+
+         <Set>RPT_TYP=D</Set>
+         <Quote name="Do_SVRPro"/>   <!--插入报表登记表-->
+      </FlowCtrl>
+   </Transaction>
+</Root>
+
diff --git a/cap/etc/OCAPRPT2/RPT_D_006.raq b/cap/etc/OCAPRPT2/RPT_D_006.raq
new file mode 100644
index 0000000..12d706b
Binary files /dev/null and b/cap/etc/OCAPRPT2/RPT_D_006.raq differ
diff --git a/cap/etc/OCAPRPT2_CTL.XML b/cap/etc/OCAPRPT2_CTL.XML
index 916cea1..42b1a7e 100644
--- a/cap/etc/OCAPRPT2_CTL.XML
+++ b/cap/etc/OCAPRPT2_CTL.XML
@@ -65,4 +65,6 @@
   
   <Include file="app/cap/etc/OCAPRPT2/204074_CTL.XML" desc="回单查询" />
 
+  <Include file="app/cap/etc/OCAPRPT2/204076_CTL.XML" desc="银行通道统计日报" />
+
 </Application>