From 111fae25722710296a2ed9dce65dced57bb79419 Mon Sep 17 00:00:00 2001 From: username@email.com <yzy2002yzy@163.com> Date: 星期二, 25 三月 2025 08:43:25 +0800 Subject: [PATCH] 20250324 修改供应商名字不能重复 外协供应商对应 完成 --- CY_ECommercePlatform/CY.BLL/OA/OA_CorporateClientsBLL.cs | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_CorporateClientsBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_CorporateClientsBLL.cs index 0320225..8231c31 100644 --- a/CY_ECommercePlatform/CY.BLL/OA/OA_CorporateClientsBLL.cs +++ b/CY_ECommercePlatform/CY.BLL/OA/OA_CorporateClientsBLL.cs @@ -252,7 +252,7 @@ public IEnumerable<OA_CorporateClients> GetModelPageList(Pagination pa, Guid FirmId, string UserName, DateTime? beginTime, DateTime? endTime, string AccountManagerId, string BusinessManagerId, string CustomerIndustriesId, string CustomerTypeId, string DegreeImportanId,string LastOrderTime, string selOrderCount, string selOrderMoney, string SourcesInfoId, string TurnoverIntentionId, string OrderCount, string OrderMoney, string UserNum, string selLastOrderTime, string Province, string City, string County, bool IsStaff, Guid StaffMemberId,int? StaffId,string Shifouwanjie=null, -bool? NeedWeifu=null,bool?NeedJiejiaRiWeiFu=null) +bool? NeedWeifu=null,bool?NeedJiejiaRiWeiFu=null, string selHetongshangchuan = null) { string Condition = " and a.FirmId ='" + FirmId + "'"; @@ -310,6 +310,20 @@ if (!string.IsNullOrEmpty(selOrderMoney) && !string.IsNullOrEmpty(OrderMoney)) Condition += string.Format(" and OrderMoney{0}'{1}'", selOrderMoney, OrderMoney); + if (!string.IsNullOrEmpty(selHetongshangchuan)) + { + if (selHetongshangchuan == "1") + { + Condition += string.Format(" and a.Keyid in ( select CorporateClientsid from [dbo].[OA_CorporateClientContract] ) "); + } + else + { + Condition += string.Format(" and a.Keyid not in ( select CorporateClientsid from [dbo].[OA_CorporateClientContract] ) "); + } + } + + + if (!string.IsNullOrEmpty(selLastOrderTime) && !string.IsNullOrEmpty(LastOrderTime)) Condition += string.Format(" and CAST(LastOrderTime AS DATE) {0} CAST(getdate()-{1} AS date)", LastOrderTime, selLastOrderTime); -- Gitblit v1.9.1