Commit 9dbacb68 by 纪旭 韦

人员字典显示排序倒序,粘贴少数据问题

parent 690d5548
...@@ -24,7 +24,7 @@ public partial class PerforPeremployeeRepository : PerforRepository<per_employee ...@@ -24,7 +24,7 @@ public partial class PerforPeremployeeRepository : PerforRepository<per_employee
public new PageList<per_employee> GetEntitiesForPaging(int pageNumber, int pageSize, Expression<Func<per_employee, bool>> exp) public new PageList<per_employee> GetEntitiesForPaging(int pageNumber, int pageSize, Expression<Func<per_employee, bool>> exp)
{ {
IQueryable<per_employee> queryableAuthors = context.Set<per_employee>().Where(exp).OrderBy(w => w.IsVerify).ThenBy(t => t.Id); IQueryable<per_employee> queryableAuthors = context.Set<per_employee>().Where(exp).OrderByDescending(w => w.Id).ThenBy(t => t.IsVerify);
return PageList<per_employee>.Create(queryableAuthors, pageNumber, pageSize); return PageList<per_employee>.Create(queryableAuthors, pageNumber, pageSize);
} }
......
...@@ -952,7 +952,7 @@ public ApiResponse BathSavePerson(int allotId, int HospitalId, SaveCollectData r ...@@ -952,7 +952,7 @@ public ApiResponse BathSavePerson(int allotId, int HospitalId, SaveCollectData r
var delPersonsNum = new List<string>(); var delPersonsNum = new List<string>();
foreach (var data in newEmployees) foreach (var data in newEmployees)
{ {
var any = employees.Any(w => w.Department?.Trim() == data.Department?.Trim() && w.DoctorName?.Trim() == data.DoctorName?.Trim()); var any = employees.Any(w => w.UnitType?.Trim() == data.UnitType?.Trim() && w.Department?.Trim() == data.Department?.Trim() && w.DoctorName?.Trim() == data.DoctorName?.Trim() && w.PersonnelNumber == data.PersonnelNumber);
if (!string.IsNullOrEmpty(data.Department?.Trim()) && !string.IsNullOrEmpty(data.AccountingUnit?.Trim()) && !string.IsNullOrEmpty(data.DoctorName?.Trim()) && !any) if (!string.IsNullOrEmpty(data.Department?.Trim()) && !string.IsNullOrEmpty(data.AccountingUnit?.Trim()) && !string.IsNullOrEmpty(data.DoctorName?.Trim()) && !any)
{ {
......
...@@ -559,7 +559,7 @@ private T GetCellValue<T>(IRow row, List<string> columns, string key) ...@@ -559,7 +559,7 @@ private T GetCellValue<T>(IRow row, List<string> columns, string key)
var data = (from t1 in pdata var data = (from t1 in pdata
join t2 in tdata join t2 in tdata
on t1.PersonnelNumber equals t2.PersonnelNumber into temp on t1.PersonnelNumber equals t2.PersonnelNumber into temp
from t in temp.DefaultIfEmpty() from t in temp.DefaultIfEmpty() orderby t1.Id descending
select new select new
{ {
PersonnelNumber = t1.PersonnelNumber, PersonnelNumber = t1.PersonnelNumber,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment