zhengcaioa.git - Gitblit

			@@ -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;
			}

			}
			}