From ad92b901b491d5921dbca2e91b0aafe8e2a0a017 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 27 九月 2024 13:30:53 +0800
Subject: [PATCH] 客户来源选择“政府采购”的才必选“机构代理”，除“政府采购”以外的客户来源，机构代码不用必填 “自联系”改为“上门送样”；“在线”改为“线上校对” 1）所有订单类型中的“印件名称”再增加几个字的长度，现在的格子有段短 （2）所有新增订单均把“客户单位”和“客户级别”这两行改到最前面，原来的“订单类型”这一行自动成为第3行 （3）“交货时间”现在默认的是第2天，全部改为默认第3天 在订单管理的列表中增加“封签”，列表中没打印显示“打印”，打印了就打“√” “订单管理”中，现在的“开票申请”栏目删除 生产安排中，生产“合版施工单”的前提必须是“订单类型”要相同，修改为不必相同。
---
CY_ECommercePlatform/CY.BLL/OA/OA_CorporateClientsBLL.cs | 147 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 144 insertions(+), 3 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_CorporateClientsBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_CorporateClientsBLL.cs
index f9d15c8..8231c31 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_CorporateClientsBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_CorporateClientsBLL.cs
@@ -139,17 +139,32 @@
}
/// <summary>
- /// 鏌ヨ鍚堜綔瀹㈡埛鍒嗛〉鍒楄〃
+ /// 鏌ヨ鍚堜綔瀹㈡埛鍒嗛〉鍒楄〃 鎵�鏈夐潪蹇呰鍙傛暟璁剧疆榛樿鍊�
+ /// //寤� 鏂板鍔犳槸鍚﹂渶瑕佷緥琛岀淮鎶わ紝鏄惁闇�瑕佽妭鍋囨棩缁存姢涓や釜瀛楁鏌ヨ 20210913
/// </summary>
/// <param name="pa"></param>
/// <returns></returns>
- 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)
+ public IEnumerable<OA_CorporateClients> GetModelPageListEx(Pagination pa, Guid FirmId, string UserName = "", DateTime? beginTime = null,
+DateTime? endTime = null, 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 = true, Guid? StaffMemberId = null, int? StaffId = null, string Shifouwanjie = null,
+bool? NeedWeifu = null, bool? NeedJiejiaRiWeiFu = null)
{
string Condition = " and a.FirmId ='" + FirmId + "'";
if (!string.IsNullOrEmpty(UserNum))
Condition += " and CustomerId = " + UserNum;
+
+ //寤� 鏂板鍔犳槸鍚﹂渶瑕佷緥琛岀淮鎶わ紝鏄惁闇�瑕佽妭鍋囨棩缁存姢涓や釜瀛楁鏌ヨ 20210913
+ if (NeedWeifu != null)
+
+ Condition += string.Format(" and NeedWiHu='{0}'", NeedWeifu);
+
+ if (NeedJiejiaRiWeiFu != null)
+
+ Condition += string.Format(" and JieJiaRiWiHu='{0}'", NeedJiejiaRiWeiFu);
+
+
+
if (!string.IsNullOrEmpty(UserName))
Condition += " and CompanyName like '%" + UserName + "%'";
@@ -220,6 +235,125 @@
IList<Criterion> criterias = new List<Criterion>()
{
new Criterion("", Condition),
+
+ new Criterion("orderBy"," CustomerId DESC ")
+ };
+ query.Criteria = criterias;
+ return _IOA_CorporateClientsDal.SelectModelPage(query, pa);
+ }
+
+
+ /// <summary>
+ /// 鏌ヨ鍚堜綔瀹㈡埛鍒嗛〉鍒楄〃
+ /// //寤� 鏂板鍔犳槸鍚﹂渶瑕佷緥琛岀淮鎶わ紝鏄惁闇�瑕佽妭鍋囨棩缁存姢涓や釜瀛楁鏌ヨ 20210913
+ /// </summary>
+ /// <param name="pa"></param>
+ /// <returns></returns>
+ 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, string selHetongshangchuan = null)
+ {
+ string Condition = " and a.FirmId ='" + FirmId + "'";
+
+ if (!string.IsNullOrEmpty(UserNum))
+ Condition += " and CustomerId = " + UserNum;
+
+ //寤� 鏂板鍔犳槸鍚﹂渶瑕佷緥琛岀淮鎶わ紝鏄惁闇�瑕佽妭鍋囨棩缁存姢涓や釜瀛楁鏌ヨ 20210913
+ if (NeedWeifu!=null)
+
+ Condition += string.Format(" and NeedWiHu='{0}'", NeedWeifu);
+
+ if (NeedJiejiaRiWeiFu != null)
+
+ Condition += string.Format(" and JieJiaRiWiHu='{0}'", NeedJiejiaRiWeiFu);
+
+
+
+
+ if (!string.IsNullOrEmpty(UserName))
+ Condition += " and CompanyName like '%" + UserName + "%'";
+
+ if (beginTime.HasValue)
+ Condition += string.Format(" and CAST(CreateTime AS DATE) >='{0}'", beginTime);
+
+ if (endTime.HasValue)
+ Condition += string.Format(" and CAST(CreateTime AS DATE) <='{0}'", endTime);
+
+ if (!string.IsNullOrEmpty(SourcesInfoId))
+ Condition += string.Format(" and SourcesInfoId='{0}'", SourcesInfoId);
+
+ if (!string.IsNullOrEmpty(CustomerIndustriesId))
+ Condition += string.Format(" and CustomerIndustriesId='{0}'", CustomerIndustriesId);
+
+ if (!string.IsNullOrEmpty(AccountManagerId))
+ Condition += string.Format(" and AccountManagerId='{0}'", AccountManagerId);
+
+ if (!string.IsNullOrEmpty(Shifouwanjie))
+ Condition += string.Format(" and Shifouwanjie='{0}'", Shifouwanjie);
+
+ if (!string.IsNullOrEmpty(BusinessManagerId))
+ Condition += string.Format(" and BusinessManagerId='{0}'", BusinessManagerId);
+
+ if (!string.IsNullOrEmpty(CustomerTypeId))
+ Condition += string.Format(" and CustomerTypeId='{0}'", CustomerTypeId);
+
+ if (!string.IsNullOrEmpty(TurnoverIntentionId))
+ Condition += string.Format(" and CreditId='{0}'", TurnoverIntentionId);
+
+ if (!string.IsNullOrEmpty(DegreeImportanId))
+ Condition += string.Format(" and DegreeImportanId='{0}'", DegreeImportanId);
+
+ if (!string.IsNullOrEmpty(selOrderCount) && !string.IsNullOrEmpty(OrderCount))
+ Condition += string.Format(" and OrderCount{0}'{1}'", selOrderCount, OrderCount);
+
+ 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);
+
+ if (IsStaff)
+ {
+ if (!string.IsNullOrEmpty(Province) && !string.IsNullOrEmpty(City) && !string.IsNullOrEmpty(County))
+ Condition += string.Format(" and Province='{0}' and City='{1}' and County='{2}'", Province, City, County);
+ else if (!string.IsNullOrEmpty(Province) && !string.IsNullOrEmpty(City))
+ Condition += string.Format(" and Province='{0}' and City='{1}' and (( ((SELECT TOP(1) Keyid FROM dbo.Sys_CitySite WHERE Name=County AND CityId = (SELECT TOP(1) Keyid FROM dbo.Sys_CitySite WHERE Name=City )) IN (SELECT value FROM dbo.SplitString(CAST((SELECT ISNULL(ManageCountry,'') FROM dbo.OA_Staff WHERE MemberId='{2}') AS VARCHAR(MAX)),',',1)) OR (SELECT TOP(1) Keyid FROM dbo.Sys_CitySite WHERE Name=County AND CityId = (SELECT TOP(1) Keyid FROM dbo.Sys_CitySite WHERE Name=City )) IN (SELECT value FROM dbo.SplitString(CAST((SELECT ISNULL(ManageCountry1,'') FROM dbo.OA_Staff WHERE MemberId='{2}') AS VARCHAR(MAX)),',',1))) ) or AccountManagerId='{3}' or BusinessManagerId='{3}' )", Province, City, StaffMemberId, StaffId);
+ else if (!string.IsNullOrEmpty(Province))
+ Condition += string.Format(" and Province='{0}' and (( City IN (SELECT Name FROM dbo.Sys_CitySite WHERE Keyid IN (SELECT value FROM dbo.SplitString(CAST((SELECT ManageCity FROM dbo.OA_Staff WHERE MemberId='{1}') AS VARCHAR(MAX)),',',1))) and ((SELECT TOP(1) Keyid FROM dbo.Sys_CitySite WHERE Name=County AND CityId = (SELECT TOP(1) Keyid FROM dbo.Sys_CitySite WHERE Name=City )) IN (SELECT value FROM dbo.SplitString(CAST((SELECT ISNULL(ManageCountry,'') FROM dbo.OA_Staff WHERE MemberId='{0}') AS VARCHAR(MAX)),',',1)) OR (SELECT TOP(1) Keyid FROM dbo.Sys_CitySite WHERE Name=County AND CityId = (SELECT TOP(1) Keyid FROM dbo.Sys_CitySite WHERE Name=City )) IN (SELECT value FROM dbo.SplitString(CAST((SELECT ISNULL(ManageCountry1,'') FROM dbo.OA_Staff WHERE MemberId='{1}') AS VARCHAR(MAX)),',',1))) ) or AccountManagerId='{2}' or BusinessManagerId='{2}' )", Province, StaffMemberId, StaffId);
+ else
+ Condition += string.Format(" and (( Province IN (SELECT Name FROM dbo.Sys_CitySite WHERE Keyid IN (SELECT value FROM dbo.SplitString(CAST((SELECT ManageProvince FROM dbo.OA_Staff WHERE MemberId='{0}') AS VARCHAR(MAX)),',',1))) and City IN (SELECT Name FROM dbo.Sys_CitySite WHERE Keyid IN (SELECT value FROM dbo.SplitString(CAST((SELECT ManageCity FROM dbo.OA_Staff WHERE MemberId='{0}') AS VARCHAR(MAX)),',',1))) and ((SELECT TOP(1) Keyid FROM dbo.Sys_CitySite WHERE Name=County AND CityId = (SELECT TOP(1) Keyid FROM dbo.Sys_CitySite WHERE Name=City )) IN (SELECT value FROM dbo.SplitString(CAST((SELECT ISNULL(ManageCountry,'') FROM dbo.OA_Staff WHERE MemberId='{0}') AS VARCHAR(MAX)),',',1)) OR (SELECT TOP(1) Keyid FROM dbo.Sys_CitySite WHERE Name=County AND CityId = (SELECT TOP(1) Keyid FROM dbo.Sys_CitySite WHERE Name=City )) IN (SELECT value FROM dbo.SplitString(CAST((SELECT ISNULL(ManageCountry1,'') FROM dbo.OA_Staff WHERE MemberId='{0}') AS VARCHAR(MAX)),',',1))) ) or AccountManagerId='{1}' or BusinessManagerId='{1}' ) ", StaffMemberId, StaffId);
+ }
+ else
+ {
+ if (!string.IsNullOrEmpty(Province))
+ Condition += string.Format(" and Province='{0}'", Province);
+
+ if (!string.IsNullOrEmpty(City))
+ Condition += string.Format(" and City='{0}'", City);
+
+ if (!string.IsNullOrEmpty(County))
+ Condition += string.Format(" and County='{0}'", County);
+ }
+
+ Query query = new Query();
+ IList<Criterion> criterias = new List<Criterion>()
+ {
+ new Criterion("", Condition),
new Criterion("orderBy"," CustomerId DESC ")
};
@@ -227,6 +361,13 @@
return _IOA_CorporateClientsDal.SelectModelPage(query, pa);
}
+
+
+
+
+
+
+
/// <summary>
/// 鏌ヨ瀹㈡埛棰勪粯娆惧垪琛�
/// </summary>
--
Gitblit v1.9.1