From 5944b55b1486943c696a3beb004d564dceb81cf2 Mon Sep 17 00:00:00 2001
From: wangsheng <123456>
Date: 星期二, 01 三月 2022 20:43:48 +0800
Subject: [PATCH] 待审核新增按通道查询

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

diff --git a/web/web/logs/err.txt b/web/web/logs/err.txt
index 74a7495..3ede951 100644
--- a/web/web/logs/err.txt
+++ b/web/web/logs/err.txt
@@ -588,6 +588,7 @@
    在 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)
@@ -647,4 +648,9 @@
    在 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