From 13ca8b4cab099521fc95d551c4b21c1a7ae5984d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 30 十二月 2022 09:44:04 +0800
Subject: [PATCH] 合作业务-》 采购公告权限，顾问套餐（种类）
---
zhengcaioa/Services/DailyManagementService.cs | 96 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 94 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/Services/DailyManagementService.cs b/zhengcaioa/Services/DailyManagementService.cs
index a6340e3..e32da81 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();
@@ -236,6 +241,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 +257,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 +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();
@@ -469,5 +502,64 @@
}
#endregion
+
+
+
+ /// <summary>
+ /// 淇濆瓨楠岃瘉鐮�
+ /// </summary>
+ /// <param name="holdPhone"></param>
+ /// <returns></returns>
+ public ResultEntity SavePhoneMessage(AdmPhoneMessageDTO admPhoneMessageDTO)
+ {
+ ResultEntity resultEntity = new ResultEntity();
+ try
+ {
+ AdmPhoneMessage hold = _mapper.Map<AdmPhoneMessage>(admPhoneMessageDTO);
+ if (string.IsNullOrEmpty(hold.Id))
+ {
+ hold.Id = Guid.NewGuid().ToString();
+ admPhoneMessageDTO.Id = hold.Id;
+
+ _context.AdmPhoneMessages.Add(hold);
+ }
+ else
+ {
+ var entity = _context.AdmPhoneMessages.Find(hold.Id);
+
+ entity.Phone = hold.Phone;
+ entity.Message = hold.Message;
+ entity.Createtime = hold.Createtime;
+ }
+ _context.SaveChanges();
+ resultEntity.ReturnID = hold.Id;
+ resultEntity.Result = true;
+ }
+ catch (Exception ex)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "淇濆瓨澶辫触锛岃鑱旂郴绠＄悊鍛�";
+ ex.Message.ToString();
+ }
+ return resultEntity;
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇鏈�杩戠殑楠岃瘉鐮�
+ /// </summary>
+ /// <param name="id"></param>
+ /// <returns></returns>
+ public AdmPhoneMessageDTO GetPhoneMessageZuijin(string phone)
+ {
+ AdmPhoneMessage entity = _context.AdmPhoneMessages.Where(e => e.Phone == phone ).OrderByDescending(x=>x.Createtime).FirstOrDefault();
+ if (entity == null)
+ {
+ entity = new AdmPhoneMessage();
+ }
+ AdmPhoneMessageDTO admPhoneMessageDTO = _mapper.Map<AdmPhoneMessageDTO>(entity);
+ return admPhoneMessageDTO;
+ }
+
}
}
--
Gitblit v1.9.1