From adee7a71ba7ab1b63cab63381dfe1846437853d6 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期四, 02 三月 2023 17:37:05 +0800
Subject: [PATCH] 增加分销商配置
---
web/Dao/GwSmDao.cs | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/web/Dao/GwSmDao.cs b/web/Dao/GwSmDao.cs
index 14b7cc3..e073abb 100644
--- a/web/Dao/GwSmDao.cs
+++ b/web/Dao/GwSmDao.cs
@@ -1,7 +1,7 @@
锘�//鍖哄煙鏆傛椂娌℃湁鍐欏叆鏁版嵁搴�
using Common;
using Model;
-using Oracle.DataAccess.Client;
+using Oracle.ManagedDataAccess.Client;
using System;
using System.Collections.Generic;
using System.Data;
@@ -31,7 +31,7 @@
{
string str = sDate.Replace("-", "");
StringBuilder stringBuilder = new StringBuilder();
- stringBuilder.Append("select AP_MID,CLIENT_ID,a.SP_ID,AP_ID,a.OP_ID,a.ACCESS_CODE,MOBILE,PK_NUMBER,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 from LG_SM_").Append(str).Append(" a left join gw_op b on a.op_id=b.op_id where 1=1 ");
+ stringBuilder.Append("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,ROUND(TO_NUMBER(a.op_deliver_time-a.ap_submit_time)*24*60*60,0) as OUT_TIME from LG_SM_").Append(str).Append(" a left join gw_op b on a.op_id=b.op_id where 1=1 ");
OracleParameter[] oracleParameterArray = new OracleParameter[11];
if (apID != null && apID != "")
{
@@ -323,7 +323,7 @@
/// <param name="pageSize"></param>
/// <param name="pageIndex"></param>
/// <returns></returns>
- public List<GwSm> LoadInfoList(string apMID, string opName, string clientID, string spID, string destnationId, string sDate, string beginTime, string endTime, string content, string opstat, int TStatus, out int recordcount, int pageSize, int pageIndex)
+ public List<GwSm> LoadInfoList(string apMID, string opName, string clientID, string spID, string destnationId, string sDate, string beginTime, string endTime, string content, string opstat, int TStatus, string permissionsSQL, out int recordcount, int pageSize, int pageIndex,string ReSend=null)
{
List<GwSm> list1 = new List<GwSm>();
recordcount = 0;
@@ -331,8 +331,15 @@
{
string str = sDate.Replace("-", "");
StringBuilder stringBuilder = new StringBuilder();
- stringBuilder.Append("from LG_SM_").Append(str).Append(" sm left join GW_OP op on sm.op_id=op.op_id where 1=1 ");
- List<OracleParameter> list2 = new List<OracleParameter>();
+ if (ReSend == "ReSend")
+ {
+ stringBuilder.Append("from LG_SM_").Append(str).Append(" sm left join GW_OP op on sm.op_id=op.op_id where 1=1 and ResendStatus = 1 and ResendFlag = 0 ");
+ }
+ else
+ {
+ stringBuilder.Append("from LG_SM_").Append(str).Append(" sm left join GW_OP op on sm.op_id=op.op_id where 1=1 ");
+ }
+ List<OracleParameter> list2 = new List<OracleParameter>();
if (apMID != null && apMID != "")
{
OracleParameter oracleParameter = new OracleParameter(":ApMID", (OracleDbType)126);
@@ -396,6 +403,10 @@
list2.Add(oracleParameter2);
((DbParameter)oracleParameter2).Value = (object)DateTime.Parse(sDate + " " + endTime);
stringBuilder.Append(" and sm.AP_SUBMIT_TIME BETWEEN :BEGIN_TIME AND :END_TIME");
+
+ //瀹㈡埛鏉冮檺SQL鑴氭湰
+ stringBuilder.Append(permissionsSQL);
+
using (OracleDataReader reader = OracleHelper.ExecuteReader("select count(*) as count " + stringBuilder.ToString(), OracleHelper.Connection, list2.ToArray()))
{
if (((DbDataReader)reader).Read())
--
Gitblit v1.9.1