修改质量人员接口

This commit is contained in:
2022-09-08 09:05:35 +08:00
parent f5ab6ad44f
commit 5ba3955b4a
5 changed files with 92 additions and 12 deletions
+7 -7
View File
@@ -43,7 +43,7 @@ namespace BLL
/// <param name="personType">人员类型</param>
/// <param name="Grid1"></param>
/// <returns></returns>
public static IEnumerable getListData(string unitId, string departId, string projetcId, string name, string idCard, string isPost,string personType, Grid Grid1)
public static IEnumerable getListData(string unitId, string departId, string projetcId, string name, string idCard, string isPost, string personType, Grid Grid1)
{
IQueryable<Model.Person_Persons> getDataList = getDataLists.OrderBy(x => x.UnitId).ThenBy(x => x.DepartId);
if (!string.IsNullOrEmpty(unitId) && unitId != Const._Null)
@@ -96,9 +96,9 @@ namespace BLL
x.JobNum,
x.Account,
x.IdentityCard,
Sex = x.Sex ?? "1",
x.Birthday,
x.UnitId,
Sex = x.Sex ?? "1",
x.Birthday,
x.UnitId,
db.Base_Unit.First(u => u.UnitId == x.UnitId).UnitName,
x.DepartId,
db.Base_Depart.First(u => u.DepartId == x.DepartId).DepartName,
@@ -118,10 +118,10 @@ namespace BLL
x.Address,
x.Telephone,
x.EduLevel,
EduLevelName= BasicDataService.GetDictNameByDictCode(x.EduLevel),
EduLevelName = BasicDataService.GetDictNameByDictCode(x.EduLevel),
x.Major,
x.PersonType,
PersonTypeName=DropListService.getPersonTypeNameByValue(x.PersonType),
PersonTypeName = DropListService.getPersonTypeNameByValue(x.PersonType),
x.ValidityDate,
};
}
@@ -1087,7 +1087,7 @@ namespace BLL
where y.ProjectId == projectId && z.ProjectId == projectId
where unitType == "" || unitTypes.Contains(z.UnitType)
where unitId == "" || unitIds.Contains(z.UnitId)
where y.States == Const.State_1
where y.States == Const.State_1 && y.RoleIds != null
orderby z.UnitType descending, x.PersonName
select x).ToList();
}