zhengcaioa.git - Gitblit

			@@ -189,6 +189,7 @@
			updatepltUser.jibensalary = pltUser.jibensalary;
			updatepltUser.jintiesalary = pltUser.jintiesalary;
			updatepltUser.geshuiqizheng = pltUser.geshuiqizheng;
			updatepltUser.Yaoqingma = pltUser.Yaoqingma;
			}

			_context.SaveChanges();
			@@ -335,7 +336,7 @@
			jintiesalaryName = a.jintiesalary.HasValue ? a.jintiesalary.Value.ToString("F2") : "",
			geshuiqizheng = a.geshuiqizheng,
			geshuiqizhengName = a.geshuiqizheng.HasValue ? a.geshuiqizheng.Value.ToString("F2") : "",

			Yaoqingma = a.Yaoqingma,
			}
			).OrderBy(x => x.Usernumber).ToList();

			@@ -347,7 +348,7 @@


			// query = query.OrderByDescending(x => x.Modifytime).ToList();
			if (searchEntity.totalrows == 0)
			//if (searchEntity.totalrows == 0)
			searchEntity.totalrows = query.Count();
			var userlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
			// list = _mapper.Map<List<PltUserDTO>>(userlist);
			@@ -393,6 +394,20 @@
			var list = _mapper.Map<List<PltUserDTO>>(listUser.ToList());
			return list;
			}

			/// <summary>
			/// 获取所有活动状态的人员
			/// </summary>
			/// <returns></returns>
			public List<PltUserDTO> GetListjisuankaoqin(DateTime dateminkaoqin, DateTime datemaxkaoqin)
			{


			var listUser = _context.PltUsers.Where(u => u.RecStatus == "A" && ( u.Zhiwustatus == "A" \|\| ( u.Zhiwustatus =="D" && u.Outdate>= dateminkaoqin && u.Outdate < datemaxkaoqin )));

			var list = _mapper.Map<List<PltUserDTO>>(listUser.ToList());
			return list;
			}
			}
			}