From ed3015095f1b0e88bc579877c678a3fac191381f Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 28 六月 2021 14:32:26 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa
---
zhengcaioa/Services/IntentionCustomerService.cs | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 8 deletions(-)
diff --git a/zhengcaioa/Services/IntentionCustomerService.cs b/zhengcaioa/Services/IntentionCustomerService.cs
index c4d47ee..d935679 100644
--- a/zhengcaioa/Services/IntentionCustomerService.cs
+++ b/zhengcaioa/Services/IntentionCustomerService.cs
@@ -26,15 +26,24 @@
ResultEntity resultEntity = new ResultEntity();
try
{
- var checkUserSn = _context.IntentionCustomers.Where(x => x.Name == intentionCustomerDTO.Name && x.RecStatus == "A" && x.Id != intentionCustomerDTO.Id).FirstOrDefault();
- if (checkUserSn != null && (string.IsNullOrWhiteSpace(intentionCustomerDTO.Id) || (!string.IsNullOrWhiteSpace(intentionCustomerDTO.Id) && checkUserSn.Id != intentionCustomerDTO.Id)))
- {
- resultEntity.Result = false;
- resultEntity.Message = "瀹㈡埛鍗曚綅閲嶅";
- return resultEntity;
- }
+ var checkUserSn = _context.IntentionCustomers.Where(x => x.Name == intentionCustomerDTO.Name && x.RecStatus == "A" && x.Id != intentionCustomerDTO.Id).FirstOrDefault();
+ if (checkUserSn != null && (string.IsNullOrWhiteSpace(intentionCustomerDTO.Id) || (!string.IsNullOrWhiteSpace(intentionCustomerDTO.Id) && checkUserSn.Id != intentionCustomerDTO.Id)))
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "瀹㈡埛鍗曚綅閲嶅";
+ return resultEntity;
+ }
- var intentionCustomer = _mapper.Map<IntentionCustomer>(intentionCustomerDTO);
+ var checkcooper = _context.CooperatecustomCustomers.Where(x => x.Name == intentionCustomerDTO.Name && x.RecStatus == "A" ).FirstOrDefault();
+ if (checkcooper != null )
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "宸插瓨鍦ㄥ悎浣滃鎴�";
+ return resultEntity;
+ }
+
+
+ var intentionCustomer = _mapper.Map<IntentionCustomer>(intentionCustomerDTO);
if (String.IsNullOrEmpty(intentionCustomer.Id))
@@ -112,6 +121,23 @@
return intentionCustomerDTO;
}
+ public IntentionCustomerDTO GetByName(string name)
+ {
+
+ var entity = _context.IntentionCustomers.Where(x=>x.Name == name).FirstOrDefault();
+
+ if (entity==null || entity.RecStatus != "A")
+ {
+ entity = new IntentionCustomer();
+ }
+
+ var intentionCustomerDTO = _mapper.Map<IntentionCustomerDTO>(entity);
+
+
+ return intentionCustomerDTO;
+ }
+
+
public ResultDataEntity<IntentionCustomerDTO> SearchByPaging(IntentionCustomerDTOSearch searchEntity)
{
@@ -296,5 +322,15 @@
return result;
}
+
+ public List<IntentionCustomerDTO> GetListsalary(string userid, DateTime datemin, DateTime datemax)
+ {
+
+
+ var listPosition = _context.IntentionCustomers.Where(r => r.RecStatus == "A" && r.Creater == userid && r.Createtime >= datemin && r.Createtime < datemax).ToList();
+
+ var list = _mapper.Map<List<IntentionCustomerDTO>>(listPosition);
+ return list;
+ }
}
}
--
Gitblit v1.9.1