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

20240108专项检查接口优化

Browse Source
This commit is contained in:
杨红卫
2024-01-08 09:56:39 +08:00
parent b7053ec8c2
commit 62fd72edf7
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/API/HSSE/APICheckSpecialService.cs
+21 -6
View File
@@ -106,7 +106,7 @@ namespace BLL
{ {
CheckSpecialId = newItem.CheckSpecialId, CheckSpecialId = newItem.CheckSpecialId,
CheckSpecialCode = newItem.CheckSpecialCode, CheckSpecialCode = newItem.CheckSpecialCode,
CheckItemSetId = newItem.CheckItemSetId, // CheckItemSetId = newItem.CheckItemSetId,
CheckType = newItem.CheckType, CheckType = newItem.CheckType,
ProjectId = newItem.ProjectId, ProjectId = newItem.ProjectId,
CheckPerson = newItem.CheckPersonId, CheckPerson = newItem.CheckPersonId,
@@ -119,10 +119,15 @@ namespace BLL
CompileMan = newItem.CompileManId, CompileMan = newItem.CompileManId,
States = Const.State_0, States = Const.State_0,
}; };
//if (newItem.States != Const.State_1) var getCheckSet=db.Technique_CheckItemSet.FirstOrDefault(x=>x.CheckItemSetId == newItem.CheckItemSetId);
//{ if (getCheckSet != null)
// newCheckSpecial.States = Const.State_0; {
//} newCheckSpecial.CheckItemSetId = newItem.CheckItemSetId;
}
else
{
newCheckSpecial.CheckItemSetId = null;
}
if (newItem.CheckSpecialDetailItems == null || newItem.CheckSpecialDetailItems.Count() == 0) if (newItem.CheckSpecialDetailItems == null || newItem.CheckSpecialDetailItems.Count() == 0)
{ {
@@ -313,10 +318,20 @@ namespace BLL
LimitedDate = Funs.GetNewDateTime(newDetail.LimitedDate), LimitedDate = Funs.GetNewDateTime(newDetail.LimitedDate),
CompletedDate = Funs.GetNewDateTime(newDetail.CompletedDate), CompletedDate = Funs.GetNewDateTime(newDetail.CompletedDate),
Suggestions = newDetail.Suggestions, Suggestions = newDetail.Suggestions,
WorkArea = newDetail.WorkArea, // WorkArea = newDetail.WorkArea,
CheckArea = newDetail.WorkAreaId, CheckArea = newDetail.WorkAreaId,
CheckContent = newDetail.CheckContent, CheckContent = newDetail.CheckContent,
}; };
var getCheckSet = db.WBS_UnitWork.FirstOrDefault(x => x.UnitWorkId == newDetail.WorkAreaId);
if (getCheckSet != null)
{
newCheckSpecialDetail.WorkArea = newDetail.CheckItemSetId;
}
else
{
newCheckSpecialDetail.WorkArea = null;
}
if (newCheckSpecialDetail.CompleteStatus == false && newCheckSpecialDetail.HandleStep.Contains("1") && string.IsNullOrEmpty(newCheckSpecialDetail.HiddenHazardType)) if (newCheckSpecialDetail.CompleteStatus == false && newCheckSpecialDetail.HandleStep.Contains("1") && string.IsNullOrEmpty(newCheckSpecialDetail.HiddenHazardType))
{ {
newCheckSpecialDetail.HiddenHazardType = "1"; newCheckSpecialDetail.HiddenHazardType = "1";