From 1d1d0b95f2b9cef7adcaf65819572d276cf70ace Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 23 十一月 2021 14:51:42 +0800
Subject: [PATCH] 提交
---
zhengcaioa/Services/ExpertService.cs | 48 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/zhengcaioa/Services/ExpertService.cs b/zhengcaioa/Services/ExpertService.cs
index f7f3d43..786f74b 100644
--- a/zhengcaioa/Services/ExpertService.cs
+++ b/zhengcaioa/Services/ExpertService.cs
@@ -41,6 +41,11 @@
else
{
var updateplExpert = _context.Experts.Find(expert.Id);
+ if(updateplExpert.Creater == "1")
+ {
+ updateplExpert.Creater = expert.Modifier;
+ updateplExpert.Createtime = expert.Modifytime;
+ }
updateplExpert.Name = expert.Name;
updateplExpert.Sex = expert.Sex;
updateplExpert.InfoSource = expert.InfoSource;
@@ -73,6 +78,8 @@
updateplExpert.TitileCerti9 = expert.TitileCerti9;
updateplExpert.TitileCerti10 = expert.TitileCerti10;
updateplExpert.ShenheStatus = expert.ShenheStatus;
+ updateplExpert.Modifier = expert.Modifier;
+ updateplExpert.Modifytime = expert.Modifytime;
}
_context.SaveChanges();
@@ -142,6 +149,22 @@
into csss
from ccc in csss.DefaultIfEmpty()
+ join m in _context.PltUsers
+ on a.Creater equals m.Id
+ into msssss
+ from mmm in msssss.DefaultIfEmpty()
+
+
+ join n in _context.Areas
+ on a.Province equals n.CodeId
+ into nsssss
+ from nnn in nsssss.DefaultIfEmpty()
+
+ join o in _context.Areas
+ on a.City equals o.CodeId
+ into osssss
+ from ooo in osssss.DefaultIfEmpty()
+
where a.RecStatus == "A"
&& (searchEntity.JoinCount<=0 || hhh.JoinCount >= searchEntity.JoinCount)
@@ -169,6 +192,7 @@
Remark = a.Remark,
Creater = a.Creater,
+ CreaterName = mmm.UserName,
Createtime = a.Createtime,
RecStatus = a.RecStatus,
@@ -184,8 +208,10 @@
Sort = a.Sort,
ShenheStatus = a.ShenheStatus,
-
-
+
+ AreaName = nnn.Name + "-" + ooo.Name,
+
+
}).ToList();
if (!string.IsNullOrEmpty(searchEntity.Name))
@@ -236,7 +262,11 @@
{
query = query.Where(m => m.Phone1.Contains(searchEntity.Phone1)).ToList();
}
-
+ if (!string.IsNullOrEmpty(searchEntity.Creater))
+ {
+ query = query.Where(m => m.Creater == searchEntity.Creater).ToList();
+ }
+
query = query.OrderByDescending(x => x.Modifytime).ToList();
//if (searchEntity.totalrows == 0)
@@ -266,9 +296,17 @@
return result;
}
- public List<ExpertDTO> GetList()
+ public List<ExpertDTO> GetList(string[] id = null)
{
- var listExperts = _context.Experts.Where(e => e.RecStatus == "A").ToList();
+ var listExperts = _context.Experts.Where(e => e.RecStatus == "A" && e.ShenheStatus == "A").ToList();
+
+ if (id != null)
+ {
+
+ listExperts = listExperts.Where(r => id.Contains(r.Id)).ToList();
+ }
+
+
var list = _mapper.Map<List<ExpertDTO>>(listExperts);
return list;
}
--
Gitblit v1.9.1