From c21e1950b659a61667f42c22c1eea28bc8e72055 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 24 十月 2025 11:17:52 +0800
Subject: [PATCH] 提交
---
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index 1eb2893..62d4cd8 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -1176,7 +1176,7 @@
new SqlParameter("@createTimeEnd",DBNull.Value){SqlDbType=SqlDbType.Date},
new SqlParameter("@printType",DBNull.Value){SqlDbType=SqlDbType.Int},
new SqlParameter("@orderType",DBNull.Value){SqlDbType=SqlDbType.Int},
- new SqlParameter("@orderState",DBNull.Value){SqlDbType=SqlDbType.Int},
+ new SqlParameter("@orderState",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=20},
new SqlParameter("@orderPayState",DBNull.Value){SqlDbType=SqlDbType.Int},
new SqlParameter("@creater",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=20},
new SqlParameter("@customerLevel",DBNull.Value){SqlDbType=SqlDbType.Int},
@@ -1339,7 +1339,7 @@
/// </summary>
/// <param name="pagination"></param>
/// <returns></returns>
- public IEnumerable<EC_OrderBasic> SelectModelPageWorkBook(Infrastructure.Query.Pagination pagination, Guid _MemberID, string txtBeginDate, string txtEndDate, string txtOrderId, string txtSearchyjname, string selCustormerManager, string selBusinessManager, string selOrderStates)
+ public IEnumerable<EC_OrderBasic> SelectModelPageWorkBook(Infrastructure.Query.Pagination pagination, Guid _MemberID, string txtBeginDate, string txtEndDate, string txtOrderId, string txtSearchyjname, string selCustormerManager, string selBusinessManager, string selOrderStates, string BuyerName)
{
try
{
@@ -1364,6 +1364,9 @@
if (!string.IsNullOrEmpty(txtSearchyjname))
condition += " and ob.DocumentName like '%" + txtSearchyjname + "%'";
+ if (!string.IsNullOrEmpty(BuyerName))
+ condition += " and ob.BuyerName like '%" + BuyerName + "%'";
+
if (!string.IsNullOrEmpty(selCustormerManager))
condition += " and oe.CustomerManagerId = '" + selCustormerManager + "'";
@@ -1371,7 +1374,17 @@
condition += " and oe.BusinessManagerId = '" + selBusinessManager + "'";
if (!string.IsNullOrEmpty(selOrderStates))
- condition += " and ob.OrderState = '" + selOrderStates + "'";
+ {
+ if(selOrderStates == "0")
+ {
+ condition += " and ob.OrderState in (1,2,3,4)";
+ }
+ else if (selOrderStates == "1")
+ {
+ condition += " and ob.OrderState in ( 5,6,-1)";
+ }
+ }
+
--
Gitblit v1.9.1