lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

Browse Source
This commit is contained in:
李鹏飞
2022-10-19 15:50:09 +08:00
parent b7a43a4130 7b44a17117
commit 00616b7fa0
15 changed files with 531 additions and 6436 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/Person/Person_PersonsService.cs
+2 -2
View File
@@ -71,6 +71,7 @@ namespace BLL
{
getDataList = getDataList.Where(e => e.IdentityCard.Contains(idCard));
}
if (!string.IsNullOrEmpty(isPost) && isPost != "-1" && isPost != Const._Null)
{
if (isPost == Const._True)
@@ -680,7 +681,7 @@ namespace BLL
WorkDate = person.WorkDate,
RetirementDate = person.RetirementDate,
RelativeName = person.RelativeName,
RelativeTel = person.RelativeTel,
RelativeTel = person.RelativeTel,
};
if (string.IsNullOrEmpty(person.QRCodeAttachUrl))
@@ -929,7 +930,6 @@ namespace BLL
newPerson.RetirementDate = person.RetirementDate;
newPerson.RelativeName = person.RelativeName;
newPerson.RelativeTel = person.RelativeTel;
// newPerson.IsCardNoOK = IDCardValid.CheckIDCard(person.IdentityCard);
if (string.IsNullOrEmpty(person.QRCodeAttachUrl))
{
SGGL/BLL/Person/Person_ShuntService.cs
+3 -1
View File
@@ -24,7 +24,8 @@ namespace BLL
/// </summary>
private static IQueryable<Model.Person_Persons> getDataLists = from x in db.Person_Persons
where x.PersonId != Const.sysglyId && x.PersonId != Const.hfnbdId && x.UnitId == Const.UnitId_SEDIN
&& x.DepartId == Const.Depart_constructionId && (!x.IsPost.HasValue || x.IsPost == true)
&& x.DepartId == Const.Depart_constructionId
&& x.CurrentProjectId == null && (!x.IsOffice.HasValue || x.IsOffice == false)
select x;
/// <summary>
@@ -89,6 +90,7 @@ namespace BLL
x.CurrentProjectWorkPostId,
CurrentProjectWorkPostName = WorkPostService.getWorkPostNamesWorkPostIds(x.CurrentProjectWorkPostId),
IsPost = x.IsPost ?? true,
IsPostName = x.IsPost == false ? "否" : "是",
x.SignatureUrl,
x.CertificateId,
};
SGGL/BLL/SysManage/UnitService.cs
+8 -11
View File
@@ -236,20 +236,17 @@ namespace BLL
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var units = (from x in db.Base_Unit
orderby x.UnitCode
select x).ToList();
if (!string.IsNullOrEmpty(projectId))
var units = from x in db.Base_Unit
select x;
if (!string.IsNullOrEmpty(projectId) && projectId != Const._Null)
{
units = (from x in units
join y in db.Project_ProjectUnit on x.UnitId equals y.UnitId
where y.ProjectId == projectId
select x).ToList();
units = from x in units
join y in db.Project_ProjectUnit on x.UnitId equals y.UnitId
where y.ProjectId == projectId
select x;
}
units = units.OrderBy(x => x.UnitCode).ToList();
return units;
return units.OrderBy(x => x.UnitCode).ToList(); ;
}
}