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

---
 web/Dao/GwSpDao.cs |  135 +++++++++++++++++++++++---------------------
 1 files changed, 70 insertions(+), 65 deletions(-)

diff --git a/web/Dao/GwSpDao.cs b/web/Dao/GwSpDao.cs
index df4e482..ecf5d62 100644
--- a/web/Dao/GwSpDao.cs
+++ b/web/Dao/GwSpDao.cs
@@ -237,73 +237,78 @@
       return list1;
     }
 
-    public List<GwSp> LoadInfoList(string spId, string apId, string clientId, int routerType, string opID, int chargeType, int pageIndex, int pageSize, out int recordCount)
-    {
-      List<GwSp> list1 = new List<GwSp>();
-      recordCount = 0;
-      StringBuilder stringBuilder = new StringBuilder();
-      stringBuilder.Append("from GW_SP where 1=1");
-      List<OracleParameter> list2 = new List<OracleParameter>();
-      if (spId != null && spId != "")
-      {
-        list2.Add(new OracleParameter(":SpID", (object) spId));
-        stringBuilder.Append(" and SP_ID=:SpID");
-      }
-      if (apId != null && apId != "")
-      {
-        list2.Add(new OracleParameter(":ApID", (object) apId));
-        stringBuilder.Append(" and AP_ID=:ApID");
-      }
-      if (clientId != null && clientId != "")
-      {
-        list2.Add(new OracleParameter(":ClientID", (object) clientId));
-        stringBuilder.Append(" and CLIENT_ID=:ClientID");
-      }
-      if (chargeType > 0)
-      {
-        list2.Add(new OracleParameter(":ChargeType", (object) chargeType));
-        stringBuilder.Append(" and CHARGE_TYPE=:ChargeType");
-      }
-      if (routerType > 0)
-      {
-        if (routerType == 1)
+        public List<GwSp> LoadInfoList(string spId, string apId, string clientId, int routerType, string opID, int chargeType, int pageIndex, int pageSize, string resendStatus, out int recordCount)
         {
-          list2.Add(new OracleParameter(":ROUTER_TYPE", (object) routerType));
-          stringBuilder.Append(" and ROUTER_TYPE=:ROUTER_TYPE");
-          if (!string.IsNullOrEmpty(opID))
-          {
-            stringBuilder.Append(" and (CM_OP_ID=:OPID) OR (CT_OP_ID=:OPID) OR (UN_OP_ID=:OPID) ");
-            list2.Add(new OracleParameter(":OPID", (object) opID));
-          }
+            List<GwSp> list1 = new List<GwSp>();
+            recordCount = 0;
+            StringBuilder stringBuilder = new StringBuilder();
+            stringBuilder.Append("from GW_SP where 1=1");
+            List<OracleParameter> list2 = new List<OracleParameter>();
+            if (spId != null && spId != "")
+            {
+                list2.Add(new OracleParameter(":SpID", (object)spId));
+                stringBuilder.Append(" and SP_ID=:SpID");
+            }
+            if (apId != null && apId != "")
+            {
+                list2.Add(new OracleParameter(":ApID", (object)apId));
+                stringBuilder.Append(" and AP_ID=:ApID");
+            }
+            if (resendStatus != null && resendStatus != "" &&int.Parse( resendStatus)!=3)
+            {
+                list2.Add(new OracleParameter(":RESENDSTATUS", (object)resendStatus));
+                stringBuilder.Append(" and RESEND_STATUS=:RESENDSTATUS");
+            }
+            if (clientId != null && clientId != "")
+            {
+                list2.Add(new OracleParameter(":ClientID", (object)clientId));
+                stringBuilder.Append(" and CLIENT_ID=:ClientID");
+            }
+            if (chargeType > 0)
+            {
+                list2.Add(new OracleParameter(":ChargeType", (object)chargeType));
+                stringBuilder.Append(" and CHARGE_TYPE=:ChargeType");
+            }
+            if (routerType > 0)
+            {
+                if (routerType == 1)
+                {
+                    list2.Add(new OracleParameter(":ROUTER_TYPE", (object)routerType));
+                    stringBuilder.Append(" and ROUTER_TYPE=:ROUTER_TYPE");
+                    if (!string.IsNullOrEmpty(opID))
+                    {
+                        stringBuilder.Append(" and (CM_OP_ID=:OPID) OR (CT_OP_ID=:OPID) OR (UN_OP_ID=:OPID) ");
+                        list2.Add(new OracleParameter(":OPID", (object)opID));
+                    }
+                }
+                if (routerType == 3)
+                {
+                    list2.Add(new OracleParameter(":ROUTER_TYPE", (object)routerType));
+                    stringBuilder.Append(" and ROUTER_TYPE=:ROUTER_TYPE");
+                    if (!string.IsNullOrEmpty(opID))
+                    {
+                        stringBuilder.Append(" and (CM_GROUP_ID=:OPID) OR (CU_GROUP_ID=:OPID) OR (CT_GROUP_ID=:OPID) ");
+                        list2.Add(new OracleParameter(":OPID", (object)opID));
+                    }
+                }
+            }
+            stringBuilder.Append(" order by ID DESC");
+            using (OracleDataReader reader = OracleHelper.ExecuteReader("select count(*) as count " + stringBuilder.ToString(), OracleHelper.Connection, list2.ToArray()))
+            {
+                while (((DbDataReader)reader).Read())
+                    recordCount = this.ReadCount(reader);
+            }
+            using (OracleDataReader reader = OracleHelper.ExecuteReader(PubConstant.doOracleSql(pageIndex, pageSize, recordCount, "select * " + stringBuilder.ToString()).ToString(), OracleHelper.Connection, list2.ToArray()))
+            {
+                while (((DbDataReader)reader).Read())
+                {
+                    GwSp o = new GwSp();
+                    if (this.ReadInfo(reader, o))
+                        list1.Add(o);
+                }
+            }
+            return list1;
         }
-        if (routerType == 3)
-        {
-          list2.Add(new OracleParameter(":ROUTER_TYPE", (object) routerType));
-          stringBuilder.Append(" and ROUTER_TYPE=:ROUTER_TYPE");
-          if (!string.IsNullOrEmpty(opID))
-          {
-            stringBuilder.Append(" and (CM_GROUP_ID=:OPID) OR (CU_GROUP_ID=:OPID) OR (CT_GROUP_ID=:OPID) ");
-            list2.Add(new OracleParameter(":OPID", (object) opID));
-          }
-        }
-      }
-      stringBuilder.Append(" order by ID DESC");
-      using (OracleDataReader reader = OracleHelper.ExecuteReader("select count(*) as count " + stringBuilder.ToString(), OracleHelper.Connection, list2.ToArray()))
-      {
-        while (((DbDataReader) reader).Read())
-          recordCount = this.ReadCount(reader);
-      }
-      using (OracleDataReader reader = OracleHelper.ExecuteReader(PubConstant.doOracleSql(pageIndex, pageSize, recordCount, "select * " + stringBuilder.ToString()).ToString(), OracleHelper.Connection, list2.ToArray()))
-      {
-        while (((DbDataReader) reader).Read())
-        {
-          GwSp o = new GwSp();
-          if (this.ReadInfo(reader, o))
-            list1.Add(o);
-        }
-      }
-      return list1;
-    }
 
     public bool Update(GwSp o)
     {

--
Gitblit v1.9.1