username@email.com
2021-06-21 83280d90d12545d36a301c437c7d9095f190aac3
zhengcaioa/Services/UserService.cs
@@ -184,6 +184,11 @@
                    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;
                }
                _context.SaveChanges();
@@ -261,7 +266,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 +284,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 +313,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") : "",
                         }
              ).OrderBy(x => x.UserSn).ToList();
              ).OrderBy(x => x.Usernumber).ToList();