diff --git a/SUBQHSE/FineUIPro.Web/common/mainProject.aspx b/SUBQHSE/FineUIPro.Web/common/mainProject.aspx index 18f51b8..ce076f8 100644 --- a/SUBQHSE/FineUIPro.Web/common/mainProject.aspx +++ b/SUBQHSE/FineUIPro.Web/common/mainProject.aspx @@ -431,7 +431,7 @@
安全技术交底
-
{{form.designBriefing.safetyTechnicalBriefing}} +
{{form.hsseEduTrain.safetyTechnicalBriefing}}
diff --git a/SUBQHSE/FineUIPro.Web/common/mainProject.aspx.cs b/SUBQHSE/FineUIPro.Web/common/mainProject.aspx.cs index 48041ff..5f3c3b6 100644 --- a/SUBQHSE/FineUIPro.Web/common/mainProject.aspx.cs +++ b/SUBQHSE/FineUIPro.Web/common/mainProject.aspx.cs @@ -62,6 +62,8 @@ namespace FineUIPro.Web.common //{ // video_Url = ""; //} + //安全技术交底 + var hseTechnicalList = (from x in db.License_HSETechnical where x.ProjectId == projectId select x).ToList(); //班前会 var classMeetingList = HSSEData_HSSEService.GetProjectClassMeeting(projectId); @@ -361,7 +363,7 @@ namespace FineUIPro.Web.common specialTrainNum = hsseData.SpecialTrainNum ?? 0,//专项培训 safeTrainNum = hsseData.SafeTrainNum ?? 0,//三级安全教育培训 specialOperationTrainNum = hsseData.SpecialOperationTrainNum ?? 0,//特种作业培训 - safetyTechnicalBriefing = 0//安全技术交底次数【待汇总】 + safetyTechnicalBriefing = hseTechnicalList?.Count() ?? 0//安全技术交底次数【待汇总】 }, cqmsTrainPersonNum = cqmsTrainPersonNum,//质量教育-培训人数 inspectionRecord = new