lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
李鹏飞
2024-09-03 16:24:17 +08:00
parent 9f70d34ed2 092da5bf50
commit 18e0e3f05b
416 changed files with 39470 additions and 4178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/API/APIBaseInfoService.cs
+2 -2
View File
@@ -82,7 +82,7 @@ namespace BLL
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var getDataLists = (from x in db.WBS_UnitWork
where x.ProjectId == projectId && x.SuperUnitWork == null
where x.ProjectId == projectId && x.SuperUnitWork == "0"
orderby x.UnitWorkCode
select new Model.BaseInfoItem
{
@@ -106,7 +106,7 @@ namespace BLL
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var getDataLists = (from x in db.WBS_UnitWork
where x.ProjectId == projectId && x.UnitId == unitId && x.SuperUnitWork == null
where x.ProjectId == projectId && x.UnitId == unitId && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
orderby x.UnitWorkCode
select new Model.BaseInfoItem
{
SGGL/BLL/API/HSSE/APICheckSpecialService.cs
+6 -1
View File
@@ -337,6 +337,8 @@ namespace BLL
CheckItemDetailContent = x.CheckItemSetContent,
Rectification_Date = string.Format("{0:yyyy-MM-dd}", x.Rectification_Date),
CheckOpinions = x.CheckOpinions,
HiddenType=x.HiddenType
};
return getInfo.ToList();
}
@@ -427,7 +429,8 @@ namespace BLL
CheckItemDetailSetId=x.CheckItemSetId,
CheckItemDetailContent=x.CheckItemSetContent,
Rectification_Date= string.Format("{0:yyyy-MM-dd}", x.Rectification_Date),
CheckOpinions=x.CheckOpinions
CheckOpinions=x.CheckOpinions,
HiddenType=x.HiddenType
};
return getInfo.First();
}
@@ -468,6 +471,7 @@ namespace BLL
CheckItemSetContent= newDetail.CheckItemDetailContent,
Rectification_Date = Funs.GetNewDateTime(newDetail.Rectification_Date),
CheckOpinions=newDetail.CheckOpinions,
HiddenType=newDetail.HiddenType,
};
if (newCheckSpecialDetail.CompleteStatus == false && newCheckSpecialDetail.HandleStep.Contains("1") && string.IsNullOrEmpty(newCheckSpecialDetail.HiddenHazardType))
{
@@ -515,6 +519,7 @@ namespace BLL
updateDetail.CheckItemSetContent = newDetail.CheckItemDetailContent;
updateDetail.Rectification_Date = Funs.GetNewDateTime(newDetail.Rectification_Date);
updateDetail.CheckOpinions = newDetail.CheckOpinions;
updateDetail.HiddenType = newDetail.HiddenType;
db.SubmitChanges();
}
////保存附件
SGGL/BLL/API/HSSE/APIHazardRegisterService.cs
+5
View File
@@ -80,6 +80,10 @@ namespace BLL
IsWx = "Y",
CCManIds = hazardRegister.CCManIds,
Requirements = hazardRegister.Requirements,
Risk_Level = hazardRegister.Risk_Level,
HiddenType= hazardRegister.HiddenType
};
var RegisterTypesDt = db.HSSE_Hazard_HazardRegisterTypes.FirstOrDefault(x => x.RegisterTypesId == newHazardRegister.RegisterTypesId);
if (RegisterTypesDt != null && RegisterTypesDt.HazardRegisterType == "4")
@@ -173,6 +177,7 @@ namespace BLL
ResponsibilityManName = db.Sys_User.First(User => x.ResponsibleMan == User.UserId).UserName,
RectificationTime = x.RectificationTime,
Risk_Level = x.Risk_Level,
HiddenType=x.HiddenType
}).OrderBy(x => x.CheckTime).Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList();
return hazardRegisters;
SGGL/BLL/API/HSSE/APIRectifyNoticesService.cs
+6
View File
@@ -107,6 +107,9 @@ namespace BLL
IsRectify = x.IsRectify,
PhotoBeforeUrl = APIUpLoadFileService.getFileUrl(x.RectifyNoticesItemId + "#1", null),
PhotoAfterUrl = APIUpLoadFileService.getFileUrl(x.RectifyNoticesItemId + "#2", null),
HiddenType=x.HiddenType,
HiddenHazardType=x.HiddenHazardType
};
return getInfo.ToList();
}
@@ -473,6 +476,9 @@ namespace BLL
LimitTime = Funs.GetNewDateTime(rItem.LimitTime),
RectifyResults = null,
IsRectify = null,
HiddenType=rItem.HiddenType,
HiddenHazardType=rItem.HiddenHazardType
};
db.Check_RectifyNoticesItem.InsertOnSubmit(newItem);
db.SubmitChanges();