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

202306281、优化人员档案列表未培训判断。2、删除项目人员方法加判断存在重复身份证号码人员直接删除。3、项目劳务人员加部门查询下拉框。

Browse Source
This commit is contained in:
杨红卫
2023-06-28 16:17:27 +08:00
parent 124a6ec046
commit 4849aa0e2b
9 changed files with 207 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs
+53 -33
View File
@@ -44,7 +44,7 @@ namespace BLL
/// <param name="states"></param>
/// <param name="Grid1"></param>
/// <returns></returns>
public static IEnumerable getListData(string projetcId, string unitId, string workPostId, string name, string idCard, string states, string personType, Grid Grid1)
public static IEnumerable getListData(string projetcId, string unitId, string departId, string workPostId, string name, string idCard, string states, string personType, Grid Grid1)
{
IQueryable<Model.View_SitePerson_Person> getDataList = getDataLists;
if (!string.IsNullOrEmpty(projetcId) && projetcId != Const._Null)
@@ -55,6 +55,10 @@ namespace BLL
{
getDataList = getDataList.Where(e => e.UnitId == unitId);
}
if (!string.IsNullOrEmpty(departId) && departId != Const._Null)
{
getDataList = getDataList.Where(e => e.DepartId == departId);
}
if (!string.IsNullOrEmpty(workPostId) && workPostId != Const._Null)
{
getDataList = getDataList.Where(e => e.WorkPostId == workPostId);
@@ -696,33 +700,42 @@ namespace BLL
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
Model.SitePerson_Person newPerson = new Model.SitePerson_Person
var getPerson = db.SitePerson_Person.FirstOrDefault(x => x.IdentityCard == person.IdentityCard && x.ProjectId == person.ProjectId);
if (getPerson == null)
{
SitePersonId = person.SitePersonId,
PersonId = person.PersonId,
CardNo = person.CardNo,
PersonName = person.PersonName,
UnitId = person.UnitId,
IdentityCard = person.IdentityCard,
ProjectId = person.ProjectId,
TeamGroupId = person.TeamGroupId,
WorkAreaId = person.WorkAreaId,
WorkPostId = person.WorkPostId,
RoleIds = person.RoleIds,
OutTime = person.OutTime,
OutResult = person.OutResult,
AuditorId = person.AuditorId,
AuditorDate = person.AuditorDate,
InTime = person.InTime.HasValue ? person.InTime : DateTime.Now,
Isprint = "0",
States = person.States,
IsSafetyMonitoring=person.IsSafetyMonitoring,
};
Model.SitePerson_Person newPerson = new Model.SitePerson_Person
{
SitePersonId = person.SitePersonId,
PersonId = person.PersonId,
CardNo = person.CardNo,
PersonName = person.PersonName,
UnitId = person.UnitId,
IdentityCard = person.IdentityCard,
ProjectId = person.ProjectId,
TeamGroupId = person.TeamGroupId,
WorkAreaId = person.WorkAreaId,
WorkPostId = person.WorkPostId,
RoleIds = person.RoleIds,
OutTime = person.OutTime,
OutResult = person.OutResult,
AuditorId = person.AuditorId,
AuditorDate = person.AuditorDate,
InTime = person.InTime.HasValue ? person.InTime : DateTime.Now,
Isprint = "0",
States = person.States,
IsSafetyMonitoring = person.IsSafetyMonitoring,
};
////现场人员项目出入场记录
SitePerson_PersonItemService.SetPersonItemInOut(newPerson, null);
db.SitePerson_Person.InsertOnSubmit(newPerson);
db.SubmitChanges();
////现场人员项目出入场记录
SitePerson_PersonItemService.SetPersonItemInOut(newPerson, null);
db.SitePerson_Person.InsertOnSubmit(newPerson);
db.SubmitChanges();
}
else
{
person.SitePersonId = getPerson.SitePersonId;
UpdateSitePerson(person, null);
}
}
}
@@ -875,15 +888,22 @@ namespace BLL
/// <param name="sitePersonId">人员Id</param>
public static void DeleteSitePersonById(string sitePersonId)
{
var person = Funs.DB.SitePerson_Person.FirstOrDefault(e => e.SitePersonId == sitePersonId);
if (person != null)
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
////现场人员项目出入场记录
person.States = Const.ProjectPersonStates_2;
SitePerson_PersonItemService.SetPersonItemInOut(person, null);
var person = db.SitePerson_Person.FirstOrDefault(e => e.SitePersonId == sitePersonId);
if (person != null)
{
var getSitePersons = db.SitePerson_Person.Where(x => x.IdentityCard == person.IdentityCard && x.ProjectId == person.ProjectId);
if (getSitePersons.Count() == 1)
{
////现场人员项目出入场记录
person.States = Const.ProjectPersonStates_2;
SitePerson_PersonItemService.SetPersonItemInOut(person, null);
}
Funs.DB.SitePerson_Person.DeleteOnSubmit(person);
Funs.DB.SubmitChanges();
db.SitePerson_Person.DeleteOnSubmit(person);
db.SubmitChanges();
}
}
}