From a15b0e887191f3d644757fdfbcef0e2355640807 Mon Sep 17 00:00:00 2001 From: fei550 <1420031550@qq.com> Date: Tue, 2 Jul 2024 11:31:42 +0800 Subject: [PATCH] =?UTF-8?q?pu=E7=9C=8B=E6=9D=BF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/SGGL_CD/v17/.wsuo | Bin 120832 -> 118272 bytes .vs/SGGL_CD/v17/DocumentLayout.json | 59 ++++++++++++++++++++++++++ SGGL/BLL/API/APICdPuService.cs | 41 +++++++++++++++++- SGGL/Model/APIItem/ProjectDataItem.cs | 8 ++++ 4 files changed, 106 insertions(+), 2 deletions(-) create mode 100644 .vs/SGGL_CD/v17/DocumentLayout.json diff --git a/.vs/SGGL_CD/v17/.wsuo b/.vs/SGGL_CD/v17/.wsuo index cc70af589bc82b59429fb5d8d6f0b07b661a41cf..83a7528fec79f63904c850d555865e2812be380a 100644 GIT binary patch delta 2705 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 NondestructiveTestList = (from x in db.Comprehensive_NCRManagement where x.ProjectId == item.ProjectId && (x.IssuedDate ==null || x.IssuedDate >DateTime.Now) select x).ToList(); @@ -93,6 +99,36 @@ namespace BLL projectDataItem.onsiteworkers = (ProjectTotal1.Value + ProjectTotal2.Value).ToString();//项目现场总人数 } + // 获取当前月份 + int currentMonth = DateTime.Now.Month; + int currentYear = DateTime.Now.Year; + int ProjectTotal3Value = 0; + int ProjectTotal4Value = 0; + projectDataItem.onsiteperson = ""; + projectDataItem.maxperson = ""; + var ProjectTotal3 = (from x in Funs.DB.HSSE_MonthReportItem + join y in Funs.DB.HSSE_MonthReport on x.MonthReportId equals y.MonthReportId + where ("成达公司现场人数" == x.ReportItem)&& y.Years == currentYear && y.ProjectId == item.ProjectId + select x).FirstOrDefault(); + if (ProjectTotal3 !=null) + { + ProjectTotal3Value = int.Parse((ProjectTotal3.GetType().GetProperty("Month" + currentMonth)?.GetValue(ProjectTotal3, null).ToString() ?? "0") ); + projectDataItem.onsiteperson = ProjectTotal3Value.ToString() ?? ""; // 本月现场人数 + } + + var ProjectTotal4 = (from x in Funs.DB.HSSE_MonthReportItem + join y in Funs.DB.HSSE_MonthReport on x.MonthReportId equals y.MonthReportId + where ("成达公司HSE管理人数" == x.ReportItem) && y.Years == currentYear && y.ProjectId == item.ProjectId + select x).FirstOrDefault(); + if (ProjectTotal4 != null) + { + ProjectTotal4Value = int.Parse((ProjectTotal4.GetType().GetProperty("Month" + currentMonth)?.GetValue(ProjectTotal4, null).ToString() ?? "0")); + projectDataItem.maxperson = (ProjectTotal4Value + ProjectTotal3Value).ToString() ?? ""; //现场高峰人数 + + } + + + var getHazards = from x in Funs.DB.Hazard_HazardSelectedItem join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId where x.ProjectId == item.ProjectId && x.IsStart == true @@ -126,10 +162,11 @@ namespace BLL { request.AddJsonBody(JsonBody); } - APICommonService.SaveSysHttpLog("CDPU", Baseurl," Body :" + JsonBody, "Request|" + request.Method.ToString()); + APICommonService.SaveSysHttpLog("CDPU", Baseurl, " Body :" + JsonBody, "Request|" + request.Method.ToString()); IRestResponse response = client.Execute(request); APICommonService.SaveSysHttpLog("CDPU", Baseurl, "Header :" + response.Headers + "| Body :" + response.Content, "Response|" + request.Method.ToString()); return response.Content; + //return null; } } diff --git a/SGGL/Model/APIItem/ProjectDataItem.cs b/SGGL/Model/APIItem/ProjectDataItem.cs index 79d3ee3c..7b82e19b 100644 --- a/SGGL/Model/APIItem/ProjectDataItem.cs +++ b/SGGL/Model/APIItem/ProjectDataItem.cs @@ -75,5 +75,13 @@ namespace Model /// 施工项目数量 /// public string constructionnum { get; set; } + /// + /// 本月现场人数 + /// + public string onsiteperson { get; set; } + /// + /// 现场高峰人数 + /// + public string maxperson { get; set; } } }