From d1a4134e7bc90e1a8345de7121d4b4dff0ffd59b Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Wed, 25 Oct 2023 15:24:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectConstructionLog.aspx.cs | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.cs index beee0f15..b88371eb 100644 --- a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.cs +++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.cs @@ -304,7 +304,33 @@ namespace FineUIPro.Web.PZHGL.InformationProject foreach (var personLog in personLogs) { var projectUser = SitePerson_PersonService.GetSitePersonByProjectIdPersonId(this.CurrUser.LoginProjectId, personLog.CompileMan); - if (projectUser != null && projectUser.WorkPostId != BLL.Const.WorkPost_ConstructionManager) + if (projectUser != null) + { + if (projectUser.WorkPostId != BLL.Const.WorkPost_ConstructionManager) + { + if (!string.IsNullOrEmpty(personLog.HSETodaySummary) || !string.IsNullOrEmpty(personLog.HSETodaySummaryRemark) || !string.IsNullOrEmpty(personLog.HSETomorrowPlan) || !string.IsNullOrEmpty(personLog.HSETomorrowPlanRemark)) + { + Model.ConstructionLogHSE hse = new Model.ConstructionLogHSE(); + hse.ConstructionLogId = personLog.ConstructionLogId; + hse.HSETodaySummary = personLog.HSETodaySummary; + hse.HSETodaySummaryRemark = personLog.HSETodaySummaryRemark; + hse.HSETomorrowPlan = personLog.HSETomorrowPlan; + hse.HSETomorrowPlanRemark = personLog.HSETomorrowPlanRemark; + hses.Add(hse); + } + if (!string.IsNullOrEmpty(personLog.CQMSTodaySummary) || !string.IsNullOrEmpty(personLog.CQMSTodaySummaryRemark) || !string.IsNullOrEmpty(personLog.CQMSTomorrowPlan) || !string.IsNullOrEmpty(personLog.CQMSTomorrowPlanRemark)) + { + Model.ConstructionLogCQMS cqms = new Model.ConstructionLogCQMS(); + cqms.ConstructionLogId = personLog.ConstructionLogId; + cqms.CQMSTodaySummary = personLog.CQMSTodaySummary; + cqms.CQMSTodaySummaryRemark = personLog.CQMSTodaySummaryRemark; + cqms.CQMSTomorrowPlan = personLog.CQMSTomorrowPlan; + cqms.CQMSTomorrowPlanRemark = personLog.CQMSTomorrowPlanRemark; + cqmss.Add(cqms); + } + } + } + else { if (!string.IsNullOrEmpty(personLog.HSETodaySummary) || !string.IsNullOrEmpty(personLog.HSETodaySummaryRemark) || !string.IsNullOrEmpty(personLog.HSETomorrowPlan) || !string.IsNullOrEmpty(personLog.HSETomorrowPlanRemark)) {