From ac4f98f9d24552d1c43935f20a969a2fda0723f0 Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期五, 25 六月 2021 10:40:03 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa
---
zhengcaioa/Services/ExpertService.cs | 95 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 90 insertions(+), 5 deletions(-)
diff --git a/zhengcaioa/Services/ExpertService.cs b/zhengcaioa/Services/ExpertService.cs
index 09aa47a..cb7a5f4 100644
--- a/zhengcaioa/Services/ExpertService.cs
+++ b/zhengcaioa/Services/ExpertService.cs
@@ -62,6 +62,17 @@
updateplExpert.CertiBack = expert.CertiBack;
updateplExpert.TitileCerti = expert.TitileCerti;
updateplExpert.Remark = expert.Remark;
+ updateplExpert.TitileCerti1 = expert.TitileCerti1;
+ updateplExpert.TitileCerti2 = expert.TitileCerti2;
+ updateplExpert.TitileCerti3 = expert.TitileCerti3;
+ updateplExpert.TitileCerti4 = expert.TitileCerti4;
+ updateplExpert.TitileCerti5 = expert.TitileCerti5;
+ updateplExpert.TitileCerti6 = expert.TitileCerti6;
+ updateplExpert.TitileCerti7 = expert.TitileCerti7;
+ updateplExpert.TitileCerti8 = expert.TitileCerti8;
+ updateplExpert.TitileCerti9 = expert.TitileCerti9;
+ updateplExpert.TitileCerti10 = expert.TitileCerti10;
+ updateplExpert.ShenheStatus = expert.ShenheStatus;
}
_context.SaveChanges();
@@ -90,6 +101,26 @@
public ResultDataEntity<ExpertDTO> SearchByPaging(ExpertDTOSearch searchEntity)
{
+
+
+ var listCode = (from a in _context.SysCodeDtls
+ join b in _context.SysCodes
+ on a.CodeId equals b.Id
+ where a.RecStatus == "A"
+ && b.RecStatus == "A"
+ select new CodeDataEntity()
+ {
+ CodeId = b.Id,
+ CodeTable = b.CodeTable,
+ CodeField = b.CodeField,
+ CodeSn = a.CodeSn,
+ Comments = a.Comments,
+ Contents = a.Contents,
+ RecStatus = a.RecStatus,
+ Sort = a.Sort
+ }
+ );
+
ResultDataEntity<ExpertDTO> data = new ResultDataEntity<ExpertDTO>();
List<ExpertDTO> list = new List<ExpertDTO>();
//绛涢��
@@ -98,18 +129,72 @@
{
ExpertId = q.Key.ExpertId,
JoinCount = q.Count(),
- }
- )
+ })
+
+
on a.Id equals h.ExpertId
into hsss
from hhh in hsss.DefaultIfEmpty()
+
+
+ join c in listCode.Where(x => x.CodeTable == "experts" && x.CodeField == "level")
+ on a.Level equals c.CodeSn
+ into csss
+ from ccc in csss.DefaultIfEmpty()
+
+
where a.RecStatus == "A"
&& (searchEntity.JoinCount<=0 || hhh.JoinCount >= searchEntity.JoinCount)
- select a).ToList();
+ select new ExpertDTO
+ {
+ Id = a.Id,
+ Name = a.Name,
+ Sex = a.Sex,
+ InfoSource = a.InfoSource,
+ IdCard = a.IdCard,
+ Province = a.Province,
+ AreaId = a.AreaId,
+ City = a.City,
+
+ Address = a.Address,
+ Postal = a.Postal,
+ ExpertType = a.ExpertType,
+
+ Level = a.Level,
+ LevelName = ccc.Comments,
+ Phone1 = a.Phone1,
+ Phone2 = a.Phone2,
+ Qq = a.Qq,
+
+ Remark = a.Remark,
+
+ Creater = a.Creater,
+ Createtime = a.Createtime,
+
+ RecStatus = a.RecStatus,
+ Modifier = a.Modifier,
+ Modifytime = a.Modifytime,
+
+ Wechat = a.Wechat,
+ ReviewItem = a.ReviewItem,
+ CertiNumber = a.CertiNumber,
+ CertiFont = a.CertiFont,
+ CertiBack = a.CertiBack,
+ TitileCerti = a.TitileCerti,
+
+ Sort = a.Sort,
+ ShenheStatus = a.ShenheStatus,
+
+
+ }).ToList();
if (!string.IsNullOrEmpty(searchEntity.Name))
{
query = query.Where(m => m.Name.Contains(searchEntity.Name)).ToList();
+ }
+ if (!string.IsNullOrEmpty(searchEntity.ShenheStatus))
+ {
+ query = query.Where(m => m.ShenheStatus == searchEntity.ShenheStatus).ToList();
}
if (!string.IsNullOrEmpty(searchEntity.ExpertType))
{
@@ -157,9 +242,9 @@
if (searchEntity.totalrows == 0)
searchEntity.totalrows = query.Count();
var expertlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
- list = _mapper.Map<List<ExpertDTO>>(expertlist);
+ //list = _mapper.Map<List<ExpertDTO>>(expertlist);
- data.LoadData(searchEntity, list);
+ data.LoadData(searchEntity, expertlist);
return data;
}
--
Gitblit v1.9.1