From c06eb4d284a80dbee4a2d040046c37bf73dcfcd5 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 29 八月 2022 09:50:58 +0800
Subject: [PATCH] 风险代理确认订单后计算业绩
---
zhengcaioa/Services/DailyManagementService.cs | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/zhengcaioa/Services/DailyManagementService.cs b/zhengcaioa/Services/DailyManagementService.cs
index b8ecd87..cbcea06 100644
--- a/zhengcaioa/Services/DailyManagementService.cs
+++ b/zhengcaioa/Services/DailyManagementService.cs
@@ -49,6 +49,11 @@
{
query = query.Where(e => e.Context.Contains(search.Context)).ToList();
}
+ if (!string.IsNullOrEmpty(search.Creater))
+ {
+ query = query.Where(e => e.Creater == search.Creater).ToList();
+ }
+
var dt = (from a in query
join b in _context.PltUsers.Where(e => e.RecStatus == "A")
on a.UserId equals b.Id
@@ -64,7 +69,7 @@
UserId = b.UserName,
Intention = a.Intention
- }).ToList();
+ }).OrderByDescending(x=>x.InTime).ToList();
ResultDataEntity<AdmHoldPhoneDTO> data = new ResultDataEntity<AdmHoldPhoneDTO>();
if (search.totalrows == 0)
search.totalrows = dt.Count();
@@ -323,6 +328,33 @@
// }).ToList();
return query.Count;
}
+
+ /// <summary>
+ /// 鏌愪竴涓汉鐨勫伐浣滄彁閱�
+ /// </summary>
+ /// <param name="userid">鐢ㄦ埛ID</param>
+ /// <returns></returns>
+ public List<AdmMemoBookDTO> GetRemindsalary(string userid, DateTime datemin, DateTime datemax, string KaoHe)
+ {
+ var query = _context.AdmMemoBooks
+ .Where(e => e.RecStatus == "A" && e.ToUserId == userid && e.KaoHe == KaoHe && e.Modifytime >= datemin && e.Modifytime < datemax)
+ .ToList();
+ //var dt = (from a in query
+ // join b in _context.PltUsers.Where(e => e.RecStatus == "A")
+ // on a.Creater equals b.Id
+ // select new AdmMemoBookDTO
+ // {
+ // Id = a.Id,
+ // Rtype = a.Rtype,
+ // Creater = b.UserName,
+ // Time = a.Time,
+ // Context = a.Context,
+ // Createtime = a.Createtime
+ // }).ToList();
+ var list = _mapper.Map<List<AdmMemoBookDTO>>(query);
+ return list;
+ }
+
public ResultEntity SaveMemoBook(AdmMemoBookDTO mbDTO)
{
ResultEntity resultEntity = new ResultEntity();
--
Gitblit v1.9.1