zhengcaioa.git - Gitblit

			@@ -184,6 +184,12 @@
			updatepltUser.miniyearsalary = pltUser.miniyearsalary;
			updatepltUser.senioritywages = pltUser.senioritywages;
			updatepltUser.Istravelsubsidy = pltUser.Istravelsubsidy;
			updatepltUser.Beizhu = pltUser.Beizhu;
			updatepltUser.baomisalary = pltUser.baomisalary;
			updatepltUser.jibensalary = pltUser.jibensalary;
			updatepltUser.jintiesalary = pltUser.jintiesalary;
			updatepltUser.geshuiqizheng = pltUser.geshuiqizheng;
			updatepltUser.Yaoqingma = pltUser.Yaoqingma;
			}

			_context.SaveChanges();
			@@ -261,7 +267,10 @@
			into fsssss
			from fff in fsssss.DefaultIfEmpty()


			join h in listCode.Where(x => x.CodeTable == "system" && x.CodeField == "shifou")
			on a.Istravelsubsidy equals h.CodeSn
			into hsssss
			from hhh in hsssss.DefaultIfEmpty()


			where a.RecStatus == "A"
			@@ -276,6 +285,7 @@

			&& (string.IsNullOrWhiteSpace(searchEntity.Phone) \|\| a.Phone.Contains(searchEntity.Phone.Trim()))
			&& (string.IsNullOrWhiteSpace(searchEntity.Zhiwustatus) \|\| a.Zhiwustatus == searchEntity.Zhiwustatus.Trim())
			&& (string.IsNullOrWhiteSpace(searchEntity.Usernumber) \|\| a.Usernumber == searchEntity.Usernumber.Trim())
			//select a
			select new PltUserDTO
			{
			@@ -304,9 +314,31 @@
			Modifier = a.Modifier,
			Modifytime = a.Modifytime,
			UserSn = a.UserSn,
			Coler = (a.IsQdht!="A"?"red":((!a.Shebaodate.HasValue) && (a.IsGmsb != "D")? "Darkorange" : ""))
			Coler = (a.IsQdht!="A"?"red":((!a.Shebaodate.HasValue) && (a.IsGmsb != "D")? "Darkorange" : "")),
			IpMac = a.IpMac,
			Iswdenter = a.Iswdenter,
			Isxmenter = a.Isxmenter,
			Usernumber = a.Usernumber,
			advancewages = a.advancewages,
			miniyearsalary = a.miniyearsalary,
			senioritywages = a.senioritywages,
			Istravelsubsidy = a.Istravelsubsidy,
			Beizhu = a.Beizhu,
			IstravelsubsidyName = hhh.Comments,
			advancewagesName = a.advancewages.HasValue ? a.advancewages.Value.ToString("F2") : "",
			miniyearsalaryName = a.miniyearsalary.HasValue ? a.miniyearsalary.Value.ToString("F2") : "",
			senioritywagesName = a.senioritywages.HasValue ? a.senioritywages.Value.ToString("F2") : "",
			jibensalary = a.jibensalary,
			baomisalary = a.baomisalary,
			jintiesalary = a.jintiesalary,
			jibensalaryName = a.jibensalary.HasValue ? a.jibensalary.Value.ToString("F2") : "",
			baomisalaryName = a.baomisalary.HasValue ? a.baomisalary.Value.ToString("F2") : "",
			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.UserSn).ToList();
			).OrderBy(x => x.Usernumber).ToList();



			@@ -316,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);
			@@ -362,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;
			}
			}
			}