From ef80d35cdbabf2ac5fd83f84714b4254e6444fef Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 28 九月 2021 14:22:27 +0800
Subject: [PATCH] 通讯录，账号密码
---
zhengcaioa/Services/DailyManagementService.cs | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/zhengcaioa/Services/DailyManagementService.cs b/zhengcaioa/Services/DailyManagementService.cs
index a6340e3..06b38cd 100644
--- a/zhengcaioa/Services/DailyManagementService.cs
+++ b/zhengcaioa/Services/DailyManagementService.cs
@@ -236,6 +236,7 @@
Creater = c.UserName,
ToUserId = b.UserName,
Time = a.Time,
+ TimeName = a.Time.HasValue ? a.Time.Value.ToString("yyyy-MM-dd HH:mm") : "",
Context = a.Context,
Createtime = a.Createtime,
FeedBack = a.FeedBack,
@@ -251,7 +252,7 @@
HaveRead = a.HaveRead.HasValue? a.HaveRead.Value:0,
HaveReadName = hhh.Comments,
- }).OrderByDescending(x=>x.Time).ToList();
+ }).OrderByDescending(x=>x.Createtime).ToList();
//if (!string.IsNullOrEmpty(search.Createtime))
//{
@@ -322,6 +323,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