Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa

LR-20210131IOQH\Administrator

2021-06-27 3262eb334953a1b208aa4a50584442a3804912d9

 zhengcaioa/Services/DailyManagementService.cs

@@ -323,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();