From 1aa53fde5eb18a39c53daf910d69cb857913b08d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 06 七月 2022 15:23:02 +0800
Subject: [PATCH] 提交
---
zhengcaioa/Services/ExpertService.cs | 179 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 169 insertions(+), 10 deletions(-)
diff --git a/zhengcaioa/Services/ExpertService.cs b/zhengcaioa/Services/ExpertService.cs
index b0f17df..9ac0256 100644
--- a/zhengcaioa/Services/ExpertService.cs
+++ b/zhengcaioa/Services/ExpertService.cs
@@ -25,13 +25,42 @@
ResultEntity resultEntity = new ResultEntity();
try
{
- var list = _context.Experts.Where(e => e.IdCard == expertDTO.IdCard && e.RecStatus == "A" && e.Id != expertDTO.Id).ToList();
- if (list.Count > 0 )
+ if (!string.IsNullOrEmpty(expertDTO.IdCard))
{
- resultEntity.Result = false;
- resultEntity.Message = "璇ヤ笓瀹朵俊鎭凡缁忓瓨鍦�";
- return resultEntity;
+ var list = _context.Experts.Where(e => e.IdCard == expertDTO.IdCard && e.RecStatus == "A" && e.Id != expertDTO.Id).ToList();
+ if (list.Count > 0)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "璇ヤ笓瀹惰韩浠借瘉淇℃伅宸茬粡瀛樺湪";
+ return resultEntity;
+ }
}
+
+ if (!string.IsNullOrEmpty(expertDTO.Phone1))
+ {
+ var list = _context.Experts.Where(e => e.Phone1 == expertDTO.Phone1 && e.RecStatus == "A" && e.Id != expertDTO.Id).ToList();
+ if (list.Count > 0)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "璇ヤ笓瀹惰仈绯荤數璇濅俊鎭凡缁忓瓨鍦�";
+ return resultEntity;
+ }
+ }
+
+ if (!string.IsNullOrEmpty(expertDTO.CertiNumber))
+ {
+ var list = _context.Experts.Where(e => e.CertiNumber == expertDTO.CertiNumber && e.RecStatus == "A" && e.Id != expertDTO.Id).ToList();
+ if (list.Count > 0)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "璇ヤ笓瀹朵笓瀹惰瘉鍙蜂俊鎭凡缁忓瓨鍦�";
+ return resultEntity;
+ }
+ }
+
+
+
+
Expert expert = _mapper.Map<Expert>(expertDTO);
if (string.IsNullOrEmpty(expert.Id))
{
@@ -41,6 +70,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 +107,9 @@
updateplExpert.TitileCerti9 = expert.TitileCerti9;
updateplExpert.TitileCerti10 = expert.TitileCerti10;
updateplExpert.ShenheStatus = expert.ShenheStatus;
+ updateplExpert.Modifier = expert.Modifier;
+ updateplExpert.Modifytime = expert.Modifytime;
+ updateplExpert.YearJiou = expert.YearJiou;
}
_context.SaveChanges();
@@ -159,6 +196,12 @@
from ooo in osssss.DefaultIfEmpty()
+ join p in listCode.Where(x => x.CodeTable == "experts" && x.CodeField == "year_jiou")
+ on a.YearJiou equals p.CodeSn
+ into psss
+ from ppp in psss.DefaultIfEmpty()
+
+
where a.RecStatus == "A"
&& (searchEntity.JoinCount<=0 || hhh.JoinCount >= searchEntity.JoinCount)
select new ExpertDTO
@@ -203,7 +246,8 @@
ShenheStatus = a.ShenheStatus,
AreaName = nnn.Name + "-" + ooo.Name,
-
+ YearJiou = a.YearJiou,
+ YearJiouName = ppp.Comments,
}).ToList();
@@ -249,19 +293,22 @@
}
if (!string.IsNullOrEmpty(searchEntity.CertiNumber))
{
- query = query.Where(m => m.CertiNumber.Contains(searchEntity.CertiNumber)).ToList();
+ query = query.Where(m => m.CertiNumber != null && m.CertiNumber.Contains(searchEntity.CertiNumber)).ToList();
}
if (!string.IsNullOrEmpty(searchEntity.Phone1))
{
- query = query.Where(m => m.Phone1.Contains(searchEntity.Phone1)).ToList();
+ query = query.Where(m => m.Phone1 != null && m.Phone1.Contains(searchEntity.Phone1)).ToList();
}
if (!string.IsNullOrEmpty(searchEntity.Creater))
{
query = query.Where(m => m.Creater == searchEntity.Creater).ToList();
}
-
+ if (!string.IsNullOrEmpty(searchEntity.YearJiou))
+ {
+ query = query.Where(m => m.YearJiou == searchEntity.YearJiou).ToList();
+ }
- query = query.OrderByDescending(x => x.Modifytime).ToList();
+ query = query.OrderByDescending(x => x.Modifytime).ToList();
//if (searchEntity.totalrows == 0)
searchEntity.totalrows = query.Count();
var expertlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
@@ -670,5 +717,117 @@
var exDTO = _mapper.Map<ExpertOrderDipatchDTO>(entity);
return exDTO;
}
+
+
+ public ResultEntity IdCardChongfu(string IdCard = "", string Id = "")
+ {
+ ResultEntity resultEntity = new ResultEntity();
+ resultEntity.Result = true;
+ try
+ {
+ if (!string.IsNullOrEmpty(IdCard))
+ {
+ var list = _context.Experts.Where(e => e.IdCard == IdCard && e.RecStatus == "A" && e.Id != Id).ToList();
+ if (list.Count > 0)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "璇ヤ笓瀹惰韩浠借瘉淇℃伅宸茬粡瀛樺湪";
+ return resultEntity;
+ }
+ }
+
+
+
+
+
+ }
+ catch (Exception ex)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "鏌ヨ澶辫触锛岃鑱旂郴绠＄悊鍛�";
+ ex.Message.ToString();
+ }
+ return resultEntity;
+ }
+
+ public ResultEntity CertiNumberChongfu(string CertiNumber = "", string Id = "")
+ {
+ ResultEntity resultEntity = new ResultEntity();
+ resultEntity.Result = true;
+ try
+ {
+
+
+
+
+ if (!string.IsNullOrEmpty(CertiNumber))
+ {
+ var list = _context.Experts.Where(e => e.CertiNumber == CertiNumber && e.RecStatus == "A" && e.Id != Id).ToList();
+ if (list.Count > 0)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "璇ヤ笓瀹朵笓瀹惰瘉鍙蜂俊鎭凡缁忓瓨鍦�";
+ return resultEntity;
+ }
+ }
+
+
+
+
+ }
+ catch (Exception ex)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "鏌ヨ澶辫触锛岃鑱旂郴绠＄悊鍛�";
+ ex.Message.ToString();
+ }
+ return resultEntity;
+ }
+
+
+ public ResultEntity Phone1Chongfu(string Phone1 = "", string Id = "")
+ {
+ ResultEntity resultEntity = new ResultEntity();
+ resultEntity.Result = true;
+ try
+ {
+
+
+ if (!string.IsNullOrEmpty(Phone1))
+ {
+ var list = _context.Experts.Where(e => e.Phone1 == Phone1 && e.RecStatus == "A" && e.Id != Id).ToList();
+ if (list.Count > 0)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "璇ヤ笓瀹惰仈绯荤數璇濅俊鎭凡缁忓瓨鍦�";
+ return resultEntity;
+ }
+ }
+
+
+
+
+
+
+ }
+ catch (Exception ex)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "鏌ヨ澶辫触锛岃鑱旂郴绠＄悊鍛�";
+ ex.Message.ToString();
+ }
+ return resultEntity;
+ }
+
+
+ public List<ExpertDTO> GetListsalary(string userid, DateTime datemin, DateTime datemax)
+ {
+
+
+ var listPosition = _context.Experts.Where(r => r.RecStatus == "A"&& r.ShenheStatus=="A"&& r.Creater == userid && r.Createtime >= datemin && r.Createtime < datemax).ToList();
+
+ var list = _mapper.Map<List<ExpertDTO>>(listPosition);
+ return list;
+ }
}
}
--
Gitblit v1.9.1