From 064d7cb908b5ff528dfb3310c49b2f010bd28079 Mon Sep 17 00:00:00 2001
From: wangsheng <123456>
Date: 星期二, 22 三月 2022 10:29:23 +0800
Subject: [PATCH] 合并所有修改操作

---
 web/web/logs/logx.txt |   75 +++++++++++++++++++++++++++++++++++++
 1 files changed, 75 insertions(+), 0 deletions(-)

diff --git a/web/web/logs/logx.txt b/web/web/logs/logx.txt
index 8c71894..3ede951 100644
--- a/web/web/logs/logx.txt
+++ b/web/web/logs/logx.txt
@@ -535,6 +535,15 @@
 Process ID: 7904
 Session ID: 6 Serial number: 11866
 
+<<<<<<< HEAD
+#60  2021-09-03 18:15:41,682 Common.dll OracleHelper.ExecuteReader              SQL=select A.*,NVL(b.OP_OUT_COUNT,0) OP_OUT_COUNT,NVL(B.OP_SUCCESS_COUNT,0) OP_SUCCESS_COUNT,NVL(b.OP_FAILED_COUNT,0) OP_FAILED_COUNT FROM GW_OP A LEFT JOIN
+                    (select OP_ID,NVL(SUM(OP_FEE_COUNT),0) OP_OUT_COUNT,
+	                    NVL(SUM(CASE WHEN STATUS=4 THEN OP_FEE_COUNT ELSE 0 END),0) OP_SUCCESS_COUNT,
+	                    NVL(SUM(CASE WHEN STATUS=5 THEN OP_FEE_COUNT ELSE 0 END),0) OP_FAILED_COUNT
+                    from LG_SM_20210903 where OP_SUBMIT_TIME > SYSDATE - 5.0/1440 GROUP BY OP_ID) b ON A.OP_ID = b.OP_ID WHERE a.OP_STATUS=1 ORDER BY a.OP_ID ASC Message=ORA-03113: end-of-file on communication channel
+Process ID: 15796
+Session ID: 204 Serial number: 5465
+=======
 #6   2021-09-03 11:07:11,651 Common.dll OracleHelper.ExecuteReader              ORA-00933: SQL 命令未正确结束
    在 Oracle.DataAccess.Client.OracleException.HandleErrorHelper(Int32 errCode, OracleConnection conn, IntPtr opsErrCtx, OpoSqlValCtx* pOpoSqlValCtx, Object src, String procedure, Boolean bCheck)
    在 Oracle.DataAccess.Client.OracleException.HandleError(Int32 errCode, OracleConnection conn, String procedure, IntPtr opsErrCtx, OpoSqlValCtx* pOpoSqlValCtx, Object src, Boolean bCheck)
@@ -579,3 +588,69 @@
    在 Common.OracleHelper.ExecuteReader(String sql, OracleConnection x, OracleParameter[] cmdParms) 位置 C:\Users\mac\Desktop\Work-Archives\SMGW\SMGW_NewCode\web\Common\OracleHelper.cs:行号 227
    在 Dao.GwSmDao.LoadInfoList(String apMID, String opName, String clientID, String spID, String destnationId, String sDate, String beginTime, String endTime, String content, String opstat, Int32 TStatus, Int32& recordcount, Int32 pageSize, Int32 pageIndex, String Resend)
 
+<<<<<<< Updated upstream
+#8   2021-09-15 15:08:29,581 Common.dll OracleHelper.ExecuteReader              ORA-00918: 未明确定义列
+   在 Oracle.DataAccess.Client.OracleException.HandleErrorHelper(Int32 errCode, OracleConnection conn, IntPtr opsErrCtx, OpoSqlValCtx* pOpoSqlValCtx, Object src, String procedure, Boolean bCheck)
+   在 Oracle.DataAccess.Client.OracleException.HandleError(Int32 errCode, OracleConnection conn, String procedure, IntPtr opsErrCtx, OpoSqlValCtx* pOpoSqlValCtx, Object src, Boolean bCheck)
+   在 Oracle.DataAccess.Client.OracleCommand.ExecuteReader(Boolean requery, Boolean fillRequest, CommandBehavior behavior)
+   在 Oracle.DataAccess.Client.OracleCommand.ExecuteReader(CommandBehavior behavior)
+   在 Common.OracleHelper.ExecuteReader(String sql, OracleConnection x, OracleParameter[] cmdParms) 位置 D:\Company\SMGW_NewWeb\web\Common\OracleHelper.cs:行号 219
+
+#8   2021-09-15 15:08:29,616 Dao.dll GwSmDao.LoadInfoListcount                  ORA-00918: 未明确定义列select * from (select rownum r,t.* from (select a.*,b.op_id,b.op_name from LG_SM_20210915 a left join gw_op b on a.op_id=b.op_id where 1=1  and AP_SUBMIT_TIME BETWEEN :BEGIN_TIME AND :END_TIME ORDER BY AP_SUBMIT_TIME DESC) t where rownum <= 5)
+   在 Common.OracleHelper.ExecuteReader(String sql, OracleConnection x, OracleParameter[] cmdParms) 位置 D:\Company\SMGW_NewWeb\web\Common\OracleHelper.cs:行号 227
+   在 Dao.GwSmDao.LoadInfoListcount(String apID, String opName, String clientID, String spID, String destnationId, String sDate, String beginTime, String endTime, String content, String opstat, Int32 TStatus, Int32& recordcount) 位置 D:\Company\SMGW_NewWeb\web\Dao\GwSmDao.cs:行号 197
+
+#5   2021-09-15 15:19:02,877 Common.dll OracleHelper.ExecuteReader              ORA-00918: 未明确定义列
+   在 Oracle.DataAccess.Client.OracleException.HandleErrorHelper(Int32 errCode, OracleConnection conn, IntPtr opsErrCtx, OpoSqlValCtx* pOpoSqlValCtx, Object src, String procedure, Boolean bCheck)
+   在 Oracle.DataAccess.Client.OracleException.HandleError(Int32 errCode, OracleConnection conn, String procedure, IntPtr opsErrCtx, OpoSqlValCtx* pOpoSqlValCtx, Object src, Boolean bCheck)
+   在 Oracle.DataAccess.Client.OracleCommand.ExecuteReader(Boolean requery, Boolean fillRequest, CommandBehavior behavior)
+   在 Oracle.DataAccess.Client.OracleCommand.ExecuteReader(CommandBehavior behavior)
+   在 Common.OracleHelper.ExecuteReader(String sql, OracleConnection x, OracleParameter[] cmdParms) 位置 D:\Company\SMGW_NewWeb\web\Common\OracleHelper.cs:行号 219
+
+#5   2021-09-15 15:19:02,902 Dao.dll GwSmDao.LoadInfoListcount                  ORA-00918: 未明确定义列select * from (select rownum r,t.* from (select a.*,b.op_id,b.op_name from LG_SM_20210915 a left join gw_op b on a.op_id=b.op_id where 1=1  and AP_SUBMIT_TIME BETWEEN :BEGIN_TIME AND :END_TIME ORDER BY AP_SUBMIT_TIME DESC) t where rownum <= 8)
+   在 Common.OracleHelper.ExecuteReader(String sql, OracleConnection x, OracleParameter[] cmdParms) 位置 D:\Company\SMGW_NewWeb\web\Common\OracleHelper.cs:行号 227
+   在 Dao.GwSmDao.LoadInfoListcount(String apID, String opName, String clientID, String spID, String destnationId, String sDate, String beginTime, String endTime, String content, String opstat, Int32 TStatus, Int32& recordcount)
+
+#19  2021-09-15 15:26:27,580 Common.dll OracleHelper.ExecuteReader              ORA-00918: 未明确定义列
+   在 Oracle.DataAccess.Client.OracleException.HandleErrorHelper(Int32 errCode, OracleConnection conn, IntPtr opsErrCtx, OpoSqlValCtx* pOpoSqlValCtx, Object src, String procedure, Boolean bCheck)
+   在 Oracle.DataAccess.Client.OracleException.HandleError(Int32 errCode, OracleConnection conn, String procedure, IntPtr opsErrCtx, OpoSqlValCtx* pOpoSqlValCtx, Object src, Boolean bCheck)
+   在 Oracle.DataAccess.Client.OracleCommand.ExecuteReader(Boolean requery, Boolean fillRequest, CommandBehavior behavior)
+   在 Oracle.DataAccess.Client.OracleCommand.ExecuteReader(CommandBehavior behavior)
+   在 Common.OracleHelper.ExecuteReader(String sql, OracleConnection x, OracleParameter[] cmdParms) 位置 D:\Company\SMGW_NewWeb\web\Common\OracleHelper.cs:行号 219
+
+#19  2021-09-15 15:26:27,610 Dao.dll GwSmDao.LoadInfoListcount                  ORA-00918: 未明确定义列select * from (select rownum r,t.* from (select a.*,b.op_id,b.op_name from LG_SM_20210915 a left join gw_op b on a.op_id=b.op_id where 1=1  and AP_SUBMIT_TIME BETWEEN :BEGIN_TIME AND :END_TIME ORDER BY AP_SUBMIT_TIME DESC) t where rownum <= 8)
+   在 Common.OracleHelper.ExecuteReader(String sql, OracleConnection x, OracleParameter[] cmdParms) 位置 D:\Company\SMGW_NewWeb\web\Common\OracleHelper.cs:行号 227
+   在 Dao.GwSmDao.LoadInfoListcount(String apID, String opName, String clientID, String spID, String destnationId, String sDate, String beginTime, String endTime, String content, String opstat, Int32 TStatus, Int32& recordcount)
+
+#19  2021-09-15 15:26:27,878 Common.dll OracleHelper.Execute                    SQL=select * from (select rownum r,t.* from (select AP_MID,CLIENT_ID,a.SP_ID,AP_ID,b.OP_NAME,a.ACCESS_CODE,MOBILE,PK_NUMBER,PK_TOTAL,AP_FEE_COUNT,OP_FEE_COUNT,TPUDHI,a.PRIORITY,RD_FLAG,a.MSG_FORMAT,MSG_LENGTH,AP_RESULT,OP_MID,OP_RESULT,AP_SUBMIT_TIME,OP_SUBMIT_TIME,OP_DELIVER_TIME,MSG_CONTENT,STAT,b.op_name,ROUND(TO_NUMBER(a.op_deliver_time-a.ap_submit_time)*24*60*60,0) as OUT_TIME from LG_SM_20210915 a left join gw_op b on a.op_id=b.op_id where 1=1  and AP_SUBMIT_TIME BETWEEN :BEGIN_TIME AND :END_TIME) t where rownum <= 100000) Message=ORA-00918: 未明确定义列
+
+#19  2021-09-15 15:27:44,480 Common.dll OracleHelper.ExecuteReader              ORA-00918: 未明确定义列
+   在 Oracle.DataAccess.Client.OracleException.HandleErrorHelper(Int32 errCode, OracleConnection conn, IntPtr opsErrCtx, OpoSqlValCtx* pOpoSqlValCtx, Object src, String procedure, Boolean bCheck)
+   在 Oracle.DataAccess.Client.OracleException.HandleError(Int32 errCode, OracleConnection conn, String procedure, IntPtr opsErrCtx, OpoSqlValCtx* pOpoSqlValCtx, Object src, Boolean bCheck)
+   在 Oracle.DataAccess.Client.OracleCommand.ExecuteReader(Boolean requery, Boolean fillRequest, CommandBehavior behavior)
+   在 Oracle.DataAccess.Client.OracleCommand.ExecuteReader(CommandBehavior behavior)
+   在 Common.OracleHelper.ExecuteReader(String sql, OracleConnection x, OracleParameter[] cmdParms) 位置 D:\Company\SMGW_NewWeb\web\Common\OracleHelper.cs:行号 219
+
+#19  2021-09-15 15:27:44,509 Dao.dll GwSmDao.LoadInfoListcount                  ORA-00918: 未明确定义列select * from (select rownum r,t.* from (select a.*,b.op_id,b.op_name from LG_SM_20210915 a left join gw_op b on a.op_id=b.op_id where 1=1  and AP_SUBMIT_TIME BETWEEN :BEGIN_TIME AND :END_TIME ORDER BY AP_SUBMIT_TIME DESC) t where rownum <= 8)
+   在 Common.OracleHelper.ExecuteReader(String sql, OracleConnection x, OracleParameter[] cmdParms) 位置 D:\Company\SMGW_NewWeb\web\Common\OracleHelper.cs:行号 227
+   在 Dao.GwSmDao.LoadInfoListcount(String apID, String opName, String clientID, String spID, String destnationId, String sDate, String beginTime, String endTime, String content, String opstat, Int32 TStatus, Int32& recordcount)
+
+#19  2021-09-15 15:27:44,559 Common.dll OracleHelper.Execute                    SQL=select * from (select rownum r,t.* from (select AP_MID,CLIENT_ID,a.SP_ID,AP_ID,b.OP_NAME,a.ACCESS_CODE,MOBILE,PK_NUMBER,PK_TOTAL,AP_FEE_COUNT,OP_FEE_COUNT,TPUDHI,a.PRIORITY,RD_FLAG,a.MSG_FORMAT,MSG_LENGTH,AP_RESULT,OP_MID,OP_RESULT,AP_SUBMIT_TIME,OP_SUBMIT_TIME,OP_DELIVER_TIME,MSG_CONTENT,STAT,b.op_name,ROUND(TO_NUMBER(a.op_deliver_time-a.ap_submit_time)*24*60*60,0) as OUT_TIME from LG_SM_20210915 a left join gw_op b on a.op_id=b.op_id where 1=1  and AP_SUBMIT_TIME BETWEEN :BEGIN_TIME AND :END_TIME) t where rownum <= 100000) Message=ORA-00918: 未明确定义列
+
+#8   2021-09-15 15:31:58,906 Common.dll OracleHelper.ExecuteReader              ORA-00918: 未明确定义列
+   在 Oracle.DataAccess.Client.OracleException.HandleErrorHelper(Int32 errCode, OracleConnection conn, IntPtr opsErrCtx, OpoSqlValCtx* pOpoSqlValCtx, Object src, String procedure, Boolean bCheck)
+   在 Oracle.DataAccess.Client.OracleException.HandleError(Int32 errCode, OracleConnection conn, String procedure, IntPtr opsErrCtx, OpoSqlValCtx* pOpoSqlValCtx, Object src, Boolean bCheck)
+   在 Oracle.DataAccess.Client.OracleCommand.ExecuteReader(Boolean requery, Boolean fillRequest, CommandBehavior behavior)
+   在 Oracle.DataAccess.Client.OracleCommand.ExecuteReader(CommandBehavior behavior)
+   在 Common.OracleHelper.ExecuteReader(String sql, OracleConnection x, OracleParameter[] cmdParms) 位置 D:\Company\SMGW_NewWeb\web\Common\OracleHelper.cs:行号 219
+
+#8   2021-09-15 15:31:58,942 Dao.dll GwSmDao.LoadInfoListcount                  ORA-00918: 未明确定义列select * from (select rownum r,t.* from (select a.*,b.op_id,b.op_name from LG_SM_20210915 a left join gw_op b on a.op_id=b.op_id where 1=1  and AP_SUBMIT_TIME BETWEEN :BEGIN_TIME AND :END_TIME ORDER BY AP_SUBMIT_TIME DESC) t where rownum <= 8)
+   在 Common.OracleHelper.ExecuteReader(String sql, OracleConnection x, OracleParameter[] cmdParms) 位置 D:\Company\SMGW_NewWeb\web\Common\OracleHelper.cs:行号 227
+   在 Dao.GwSmDao.LoadInfoListcount(String apID, String opName, String clientID, String spID, String destnationId, String sDate, String beginTime, String endTime, String content, String opstat, Int32 TStatus, Int32& recordcount) 位置 D:\Company\SMGW_NewWeb\web\Dao\GwSmDao.cs:行号 197
+>>>>>>> Release
+=======
+#15  2022-02-16 17:16:59,360 Common.dll OracleHelper.ExecuteScalar              SQL=select count(1) FROM GW_AUDIT_CACHE ca left join gw_op op on ca.op_id=op.op_id WHERE  0 ca.AP_SUBMIT_TIME BETWEEN :START_TIME AND :END_TIME AND (ca.MSG_CONTENT LIKE :CONTENT OR :CONTENT='%%') AND ca.AUDITING_STATUS=:AUDITING_STATUS  
 Message=ORA-00920: 无效的关系运算符
+
+#20  2022-02-16 17:24:53,794 Common.dll OracleHelper.ExecuteScalar              SQL=select count(1) FROM GW_AUDIT_CACHE ca left join gw_op op on ca.op_id=op.op_id WHERE   ca.AP_SUBMIT_TIME BETWEEN :START_TIME AND :END_TIME AND (ca.MSG_CONTENT LIKE :CONTENT OR :CONTENT='%%') AND ca.AUDITING_STATUS=:AUDITING_STATUS and op.OP_NAME=移动通道 
 Message=ORA-00904: "移动通道": 标识符无效
+>>>>>>> Stashed changes
+

--
Gitblit v1.9.1