提交

username@email.com

2021-12-07 e5d50b0415bef5e93c10b2bfbca98d377d3cad04

 zhengcaioa/Services/DailyManagementService.cs

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