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

20230308人员工作经历更新条件调整

Browse Source
This commit is contained in:
杨红卫
2023-03-08 16:20:45 +08:00
parent b76821201b
commit 19f67541b7
5 changed files with 64 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/HSSE/SitePerson/SitePerson_PersonItemService.cs
-1
View File
@@ -151,7 +151,6 @@ namespace BLL
if (getOtherPersons.Count() > 0)
{
foreach (var item in getOtherPersons)
{
item.OutTime = DateTime.Now;
item.States = Const.ProjectPersonStates_2;
SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs
+14
View File
@@ -774,6 +774,20 @@ namespace BLL
{
setPersonItemInOut = true;
}
else
{
var getPersons = db.Person_Persons.FirstOrDefault(x => x.IdentityCard == newPerson.IdentityCard);
if (getPersons != null && (!getPersons.MultiProject.HasValue || getPersons.MultiProject == false))
{
var getdate = newPerson.InTime.HasValue ? newPerson.InTime.Value.AddDays(-1) : DateTime.Now;
var getPersonItems = db.SitePerson_PersonItem.Where(x => x.PersonId == newPerson.PersonId && x.ProjectId != newPerson.ProjectId && !x.OutTime.HasValue);
foreach(var item in getPersonItems)
{
item.OutTime = getdate;
db.SubmitChanges();
}
}
}
}
if (setPersonItemInOut)
{
SGGL/BLL/Person/Person_PersonsService.cs
+39 -15
View File
@@ -160,15 +160,27 @@ namespace BLL
/// <returns></returns>
public static string getCurrentProjectName(string PersonId)
{
var getItem = Funs.DB.SitePerson_PersonItem.FirstOrDefault(u => u.PersonId == PersonId && !u.OutTime.HasValue);
if (getItem != null)
string name = string.Empty;
var getItem = Funs.DB.SitePerson_PersonItem.Where(u => u.PersonId == PersonId && !u.OutTime.HasValue);
if (getItem.Count() > 0)
{
return ProjectService.GetShortNameByProjectId(getItem.ProjectId);
}
else
{
return null;
foreach (var item in getItem)
{
string pname= ProjectService.GetShortNameByProjectId(item.ProjectId);
if (string.IsNullOrEmpty(name))
{
name = pname;
}
else
{
if (!name.Contains(pname))
{
name += "," + pname;
}
}
}
}
return name;
}
/// <summary>
@@ -177,17 +189,29 @@ namespace BLL
/// <param name="WorkPostId"></param>
/// <param name="PersonId"></param>
/// <returns></returns>
public static string getCurrentProjectWorkPostName( string PersonId)
public static string getCurrentProjectWorkPostName(string PersonId)
{
var getItem = Funs.DB.SitePerson_PersonItem.FirstOrDefault(u => u.PersonId == PersonId && !u.OutTime.HasValue);
if (getItem != null)
string name = string.Empty;
var getItem = Funs.DB.SitePerson_PersonItem.Where(u => u.PersonId == PersonId && !u.OutTime.HasValue);
if (getItem.Count() > 0)
{
return WorkPostService.getWorkPostNamesWorkPostIds(getItem.WorkPostId);
}
else
{
return null;
foreach (var item in getItem)
{
string pname = WorkPostService.getWorkPostNamesWorkPostIds(item.WorkPostId);
if (string.IsNullOrEmpty(name))
{
name = pname;
}
else
{
if (!name.Contains(pname))
{
name += "," + pname;
}
}
}
}
return name;
}
#endregion