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

2023-03-08 实业增加

Browse Source
This commit is contained in:
李鹏飞
2023-03-08 11:46:24 +08:00
parent 278225fac4 6462172f43
commit b76821201b
9 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/CQMS/Check/CheckControlService.cs
+10 -10
View File
@@ -142,9 +142,9 @@ namespace BLL
{
if (state == Const.CheckControl_Compile || state == Const.CheckControl_ReCompile) //无是否同意
{
ListItem[] lis = new ListItem[2];
lis[0] = new ListItem("总包负责人审核", Const.CheckControl_Audit1);
lis[1] = new ListItem("分包专业工程师回复", Const.CheckControl_Audit2);
ListItem[] lis = new ListItem[1];
//lis[0] = new ListItem("总包负责人审核", Const.CheckControl_Audit1);
lis[0] = new ListItem("分包专业工程师回复", Const.CheckControl_Audit2);
return lis;
}
else if (state == Const.CheckControl_Audit1)//有是否同意
@@ -156,9 +156,9 @@ namespace BLL
}
else if (state == Const.CheckControl_Audit2 || state == Const.CheckControl_ReCompile2)//无是否同意
{
ListItem[] lis = new ListItem[2];
lis[0] = new ListItem("分包负责人审批", Const.CheckControl_Audit3);
lis[1] = new ListItem("总包专业工程师确认", Const.CheckControl_Audit4);
ListItem[] lis = new ListItem[1];
//lis[0] = new ListItem("分包负责人审批", Const.CheckControl_Audit3);
lis[0] = new ListItem("总包专业工程师确认", Const.CheckControl_Audit4);
return lis;
}
else if (state == Const.CheckControl_Audit3)//有是否同意
@@ -170,10 +170,10 @@ namespace BLL
}
else if (state == Const.CheckControl_Audit4)//有是否同意
{
ListItem[] lis = new ListItem[3];
lis[0] = new ListItem("总包负责人确认", Const.CheckControl_Audit5);//是 加载
lis[1] = new ListItem("审批完成", Const.CheckControl_Complete);//是 加载
lis[2] = new ListItem("分包专业工程师重新回复", Const.CheckControl_ReCompile2);//否加载
ListItem[] lis = new ListItem[2];
//lis[0] = new ListItem("总包负责人确认", Const.CheckControl_Audit5);//是 加载
lis[0] = new ListItem("审批完成", Const.CheckControl_Complete);//是 加载
lis[1] = new ListItem("分包专业工程师重新回复", Const.CheckControl_ReCompile2);//否加载
return lis;
}
else if (state == Const.CheckControl_Audit5)//有是否同意
SGGL/BLL/HSSE/SitePerson/SitePerson_PersonItemService.cs
+3 -2
View File
@@ -194,11 +194,12 @@ namespace BLL
newitem.IdentityCard = getPerson.IdentityCard;
if (!getPerson.MultiProject.HasValue || getPerson.MultiProject == false)
{
var getdate = newitem.InTime.HasValue ? newitem.InTime.Value.AddDays(-1) : DateTime.Now;
///未离场项目 先离场
OutPersonItem(newitem.PersonId, null, DateTime.Now);
OutPersonItem(newitem.PersonId, null, getdate);
}
var getPersonItem = db.SitePerson_PersonItem.FirstOrDefault(x => x.PersonId == getPerson.PersonId
var getPersonItem = db.SitePerson_PersonItem.FirstOrDefault(x => x.PersonId == getPerson.PersonId && x.ProjectId == newitem.ProjectId
&& x.InTime <= newitem.InTime && (x.OutTime > newitem.InTime || !x.OutTime.HasValue));
if (getPersonItem != null)
{