From 5bf3139b3c70c7fd5ce92a6f895a92fa7ebf1d95 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 27 十二月 2022 13:33:43 +0800
Subject: [PATCH] 提交
---
zhengcaioa/Services/IntentionCustomerService.cs | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/zhengcaioa/Services/IntentionCustomerService.cs b/zhengcaioa/Services/IntentionCustomerService.cs
index e7486d1..4d9b9a9 100644
--- a/zhengcaioa/Services/IntentionCustomerService.cs
+++ b/zhengcaioa/Services/IntentionCustomerService.cs
@@ -101,6 +101,10 @@
updateproject.Weixiner = intentionCustomer.Weixiner;
updateproject.Weixintime = intentionCustomer.Weixintime;
+ if (!string.IsNullOrEmpty(intentionCustomer.HuiyuanId))
+ {
+ updateproject.HuiyuanId = intentionCustomer.HuiyuanId;
+ }
}
_context.SaveChanges();
@@ -288,6 +292,7 @@
Modifier = a.Modifier,
Modifytime = a.Modifytime,
CreatetimeName = a.Createtime.ToString("yyyy-MM-dd"),
+ Customertype = "妗ｆ瀹㈡埛",
Yixiangtime = a.Yixiangtime,
YixiangtimeName = a.Yixiangtime.HasValue? a.Yixiangtime.Value.ToString("yyyy-MM-dd"):"",
Yixiang = a.Yixiang,
@@ -296,16 +301,29 @@
Zuijinzhuizongtime = a.Zuijinzhuizongtime,
ZuijinzhuizongtimeName = a.Zuijinzhuizongtime.HasValue ? a.Zuijinzhuizongtime.Value.ToString("yyyy-MM-dd") : "",
}
- ).OrderByDescending(x => x.Modifytime).ToList();
+ );
if (!string.IsNullOrWhiteSpace(searchEntity.Shifouweixin))
{
- query = query.Where( a=>a.Shifoutianjiaweixin == searchEntity.Shifouweixin.Trim()).ToList();
+ query = query.Where( a=>a.Shifoutianjiaweixin == searchEntity.Shifouweixin.Trim());
}
+ if (!string.IsNullOrWhiteSpace(searchEntity.ShifouDianhua))
+ {
+ if (searchEntity.ShifouDianhua != "A")
+ {
+ query = query.Where(a => a.Tel == null || a.Tel == "");
+ }
+ else
+ {
+ query = query.Where(a => a.Tel != null && a.Tel != "");
+ }
+
+ }
+
//if (searchEntity.totalrows == 0)
searchEntity.totalrows = query.Count();
- var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
+ var lianlist = query.OrderByDescending(x => x.Modifytime).Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
data.LoadData(searchEntity, lianlist);
return data;
}
--
Gitblit v1.9.1