From f67d7129ae63070836a7dac14965835e6f9784e9 Mon Sep 17 00:00:00 2001 From: fei550 <1420031550@qq.com> Date: Tue, 25 Jun 2024 15:36:52 +0800 Subject: [PATCH] =?UTF-8?q?20240624=20PU=E7=9C=8B=E6=9D=BF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=8E=A8=E9=80=81=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 123904 -> 120832 bytes SGGL/BLL/API/APICdPuService.cs | 75 +++++++++++++++--- SGGL/Model/APIItem/ProjectDataItem.cs | 2 +- SGGL/WebAPI/Controllers/HomeController.cs | 22 ----- SGGL/WebAPI/Controllers/ProjectController.cs | 25 +++++- ...erProfile1.pubxml => FolderProfile.pubxml} | 3 +- 6 files changed, 88 insertions(+), 39 deletions(-) rename SGGL/WebAPI/Properties/PublishProfiles/{FolderProfile1.pubxml => FolderProfile.pubxml} (85%) diff --git a/.vs/SGGL_CD/v17/.wsuo b/.vs/SGGL_CD/v17/.wsuo index ea051b27a40f097b61aed9de8ab667cff5e7ca7d..cc70af589bc82b59429fb5d8d6f0b07b661a41cf 100644 GIT binary patch delta 1355 zcmdVZNlX(_7zc3PbZQr-rKJO1k*#iMv1O?gjS*TAp-3wvxWvRFcp}E7Ra~Ogcp!!t z+V4POIQ8T~40dAT(EtY%4)kX9;K_?u(*qo&{vSpt5{({x$uIfldvD&n`R1GCJ56#< zGZkTuS5c>+yXbEeeDfcfixR>zg=82Wi#XV_^JKsfyOH1C+2WOCnOdIX7;N z+XuB3MF}-;FBPp?dMJ3XkEY}|T6fVj#VaC`fP}dyDe->h{lG`s82X1&xwNXZE%?Xd z^8f0uk6ZJb<8CciZBDXdSN^AN?3}O5Z7+DfK1Yj!m-6n2#NT*p>2~!OSAEZt#QzQJ zmQDBOB>qwOQ~2P0qgEp!)2e-G+aZ*^Lt>c*G3$TMSY;|YggE0D(vAiGAj&(|A4tg# zk;a`9*>=IE2)ox9J#Lp3`E-K0{jG;ahFjWVp60edlc%NG7w`mPt;3$CQSWF|^W}i| zQp~T+4h%e@uU%fn+nG~Q`OB8+D^HnAiF}%4l>2ax-d@m7Uwy_zW#aR=CDSElR)lF+ Mmd(7LVI%Lq1LRwT;s5{u delta 2036 zcmeIyYfPI}7zgk^Z{ONd-`1{_I|@R_h?A@>9f27`w2=>Pac#uxlbL8)3^C3n@C^eo zo0kn|+o$f}1>M+0r`%tsct^pxxj{SJ+?;c2Lj2-wF~qGpQxF zU6TsSE=#JNjbAgY06W;=QE-6FTe>c$8ox!GR@+vhvjSGZ){#&NnI1x`JsMhLc^C~R z@I19<1y2oLv9dCB$(a^cX6|2+g+MOIHOMttqoJZ44Gp;nSyb*vjzHlx|4`T_3%gRe zmzb>O?69i3+ghq>D#F*Mx)uxDgPJT@kP(dCr0Vnb^~8a^o4L~w;0eXc9tA! zco~gX;2^vTuR%Wyz#t64FpR(`=t!x{Jj&cc^)4!(l(@HKn`-@^CN z(5jpt(D)I40(lBtz;8}8wCVq6@!xnBdC^dPZ;cXj1#Bcwo2Acg@oaSAAY)qPv;^;Y?t!&|Cqo5IaiHC|t{Kiu5p zSz8^}2kyFaCntCK#e=)4SP#w)6aUiS(LJ{&jiRicTJ)Ch_GAnHAUcaL&QfoK+IyqI zzRe9B>8m*O0L4$U<8F_*?jZR^WQtS{^Bv+sJ=L(m&otdGBQznR zQ`AET#I_x@3wahkH{igbT*Ld0t`(6nDi!ert>c+(VbSlQN_6#bQ%gv+Pov8A8EU5) z;oVL{!c$6a(K$n^h}DsghX*%s=NY?5R+ANj#yB(^66fzHkN7o7h5O@v>N`p5?>iM` A0RR91 diff --git a/SGGL/BLL/API/APICdPuService.cs b/SGGL/BLL/API/APICdPuService.cs index 980d0c6f..d89f9f2d 100644 --- a/SGGL/BLL/API/APICdPuService.cs +++ b/SGGL/BLL/API/APICdPuService.cs @@ -23,7 +23,7 @@ namespace BLL { List projectDataItems = new List(); - var projectlist = ProjectService.GetProjectWorkList().Where(x=>x.ProjectCode== "E21028"); + var projectlist = ProjectService.GetProjectWorkList(); foreach (var item in projectlist) { var getSGName = (from x in db.Project_ProjectUnit @@ -31,21 +31,35 @@ namespace BLL where x.ProjectId == item.ProjectId && x.UnitType == Const.ProjectUnitType_2 select y.UnitName); ProjectDataItem projectDataItem = new ProjectDataItem(); - projectDataItem.projectnumber = item.ProjectCode; - projectDataItem.projectname = item.ProjectName; - projectDataItem.projcost = item.ProjectMoney.ToString(); - projectDataItem.buildco = item.WorkRange; - projectDataItem.constructionco= string .Join(",", getSGName); + projectDataItem.projectnumber = item.ProjectCode??""; + projectDataItem.projectname = item.ProjectName ?? ""; + projectDataItem.projcost = item.ProjectMoney.ToString() ?? ""; + projectDataItem.buildco = ""; + projectDataItem.constructionco= string .Join(",", getSGName) ?? ""; + projectDataItem.remains = ""; + projectDataItem.contractdurition = ""; + projectDataItem.contractenddate = ""; + projectDataItem.supervisoryco = ""; + projectDataItem.onsiteworkers = ""; + projectDataItem.risknum = ""; + projectDataItem.accidentsnum = ""; + projectDataItem.constructionnum = ""; string unit_JL = ProjectService.getProjectUnitNameByUnitType(item.ProjectId, Const.ProjectUnitType_3); + string unit_yz = ProjectService.getProjectUnitNameByUnitType(item.ProjectId, Const.ProjectUnitType_4); + if (!string.IsNullOrEmpty(unit_JL)) { - projectDataItem.supervisoryco = unit_JL; + projectDataItem.supervisoryco = unit_JL ?? ""; } + if (!string.IsNullOrEmpty(unit_yz)) + { + projectDataItem.buildco = unit_yz ?? ""; + } if (item.EndDate.HasValue) { - projectDataItem.contractenddate = string.Format("{0:yyyy-MM-dd}", item.EndDate); + projectDataItem.contractenddate = string.Format("{0:yyyy-MM-dd}", item.EndDate) ?? ""; if (item.StartDate.HasValue) { @@ -56,12 +70,47 @@ namespace BLL } } } - projectDataItem.location = item.ProjectAddress; - projectDataItem.safehours = Project_HSSEData_HSSEService.GetSafeWorkingHour(item.ProjectId).ToString(); - projectDataItem.losshours = Project_HSSEData_HSSEService.GetLostWorkingHour(item.ProjectId).ToString(); + projectDataItem.location = item.ProjectAddress ?? ""; + projectDataItem.safehours = Project_HSSEData_HSSEService.GetSafeWorkingHour(item.ProjectId).ToString() ?? ""; + projectDataItem.losshours = Project_HSSEData_HSSEService.GetLostWorkingHour(item.ProjectId).ToString() ?? ""; List NondestructiveTestList = (from x in db.Comprehensive_NCRManagement where x.ProjectId == item.ProjectId && (x.IssuedDate ==null || x.IssuedDate >DateTime.Now) select x).ToList(); - projectDataItem.ncr = NondestructiveTestList.Count.ToString(); + projectDataItem.ncr = NondestructiveTestList.Count.ToString() ?? ""; + + var ProjectTotal1 = (from x in Funs.DB.HSSE_MonthReportItem + join y in Funs.DB.HSSE_MonthReport on x.MonthReportId equals y.MonthReportId + // where ("成达公司HSE管理人数" == x.ReportItem || "分包商HSE管理人数" == x.ReportItem) && y.Years == DateTime.Now.Year && y.ProjectId==CurrUser.LoginProjectId + where ("成达公司现场人数" == x.ReportItem) && y.Years == DateTime.Now.Year && y.ProjectId == item.ProjectId + select x.YearTotal).Sum(); + var ProjectTotal2 = (from x in Funs.DB.HSSE_MonthReportItem + join y in Funs.DB.HSSE_MonthReport on x.MonthReportId equals y.MonthReportId + // where ("成达公司现场人数" == x.ReportItem || "分包商现场人数" == x.ReportItem) && y.Years == DateTime.Now.Year && y.ProjectId == CurrUser.LoginProjectId + where ("分包商现场人数" == x.ReportItem) && y.Years == DateTime.Now.Year && y.ProjectId == item.ProjectId + select x.YearTotal).Sum(); + + if (ProjectTotal2.HasValue && ProjectTotal1.HasValue) + { + projectDataItem.onsiteworkers = (ProjectTotal1.Value + ProjectTotal2.Value).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 + select new { x.HazardSelectedItemId, y.RiskLevel }; + projectDataItem.risknum = getHazards.Count(x => x.RiskLevel == 1).ToString();//一级风险预警数量 + + var accidentNum1 = (from x in Funs.DB.Accident_AccidentPersonRecord + join y in Funs.DB.Base_AccidentType on x.AccidentTypeId equals y.AccidentTypeId + where x.ProjectId == item.ProjectId + select x).Count(); + + var accidentNum2 = (from x in Funs.DB.Accident_AccidentReport + where x.ProjectId == item.ProjectId + select x).Count(); + projectDataItem.accidentsnum = (accidentNum1 + accidentNum2).ToString() ?? "";//安全事故数量 + + projectDataItem.constructionnum= ProjectService.GetProjectWorkList().Count().ToString();//施工项目数量 + projectDataItems.Add(projectDataItem); } var JsonBody = Newtonsoft.Json.JsonConvert.SerializeObject(projectDataItems); @@ -77,7 +126,7 @@ 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; diff --git a/SGGL/Model/APIItem/ProjectDataItem.cs b/SGGL/Model/APIItem/ProjectDataItem.cs index cca578ae..79d3ee3c 100644 --- a/SGGL/Model/APIItem/ProjectDataItem.cs +++ b/SGGL/Model/APIItem/ProjectDataItem.cs @@ -20,7 +20,7 @@ namespace Model /// public string projcost { get; set; } /// - /// 建设范围 + /// 建设单位 /// public string buildco { get; set; } /// diff --git a/SGGL/WebAPI/Controllers/HomeController.cs b/SGGL/WebAPI/Controllers/HomeController.cs index d74876ee..97f3cfb0 100644 --- a/SGGL/WebAPI/Controllers/HomeController.cs +++ b/SGGL/WebAPI/Controllers/HomeController.cs @@ -166,27 +166,5 @@ namespace WebAPI.Controllers { return View(); } - /// - /// 给pu推送数据 - /// - /// - /// - [HttpGet] - public Model.ResponeData PushPuData() - { - var responeData = new Model.ResponeData(); - try - { - - responeData.data = APICdPuService.PushData(); - } - catch (Exception ex) - { - responeData.code = 0; - responeData.message = ex.Message; - } - - return responeData; - } } } diff --git a/SGGL/WebAPI/Controllers/ProjectController.cs b/SGGL/WebAPI/Controllers/ProjectController.cs index 8b3f344b..17c5bd73 100644 --- a/SGGL/WebAPI/Controllers/ProjectController.cs +++ b/SGGL/WebAPI/Controllers/ProjectController.cs @@ -1,4 +1,5 @@ -using System; +using BLL; +using System; using System.Collections.Generic; using System.Linq; using System.Net; @@ -113,5 +114,27 @@ namespace WebAPI.Controllers return responeData; } #endregion + + /// + /// 给pu推送数据 + /// + /// + /// + public Model.ResponeData PushPuData() + { + var responeData = new Model.ResponeData(); + try + { + + responeData.data = APICdPuService.PushData(); + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.Message; + } + + return responeData; + } } } diff --git a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml similarity index 85% rename from SGGL/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml rename to SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml index dcce6e2e..59dc41bc 100644 --- a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml +++ b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml @@ -10,9 +10,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release Any CPU FileSystem - D:\发布\辰达 + bin\app.publish\ FileSystem <_TargetId>Folder - \ No newline at end of file