diff --git a/SGGL/BLL/OpenService/FileInsertService.cs b/SGGL/BLL/OpenService/FileInsertService.cs index 3f19aac2..5331491e 100644 --- a/SGGL/BLL/OpenService/FileInsertService.cs +++ b/SGGL/BLL/OpenService/FileInsertService.cs @@ -5,6 +5,7 @@ using System.Text; using System.Collections; using System.IO; using System.Web; +using System.Text.RegularExpressions; namespace BLL { @@ -44,6 +45,7 @@ namespace BLL } } + /// /// 获取多附件数据流类 /// @@ -61,18 +63,30 @@ namespace BLL { if (strs.Count() > i) { + //string physicalpath = Funs.AttachRootPath; string physicalpath = Funs.RootPath; - //HttpContext.Current.Request.PhysicalApplicationPath; - string fullPath = physicalpath + strs[i]; + string fpath = strs[i]; + string fullPath = physicalpath + fpath; if (!File.Exists(fullPath)) { byte[] fileContext = item; - int index = fullPath.LastIndexOf("\\"); - string filePath = fullPath.Substring(0, index); + string fileName = Regex.Match(fullPath, @"[^/\\?]+(\?.*)?$").Value; + string filePath = fullPath.Replace(fileName, ""); + //int index = fullPath.LastIndexOf("\\"); + //string filePath = fullPath.Substring(0, index) ; + //string filePath = index > 0 ? fullPath.Substring(0, index) : fullPath; - if (!Directory.Exists(filePath)) + try { - Directory.CreateDirectory(filePath); + if (!Directory.Exists(filePath)) + { + Directory.CreateDirectory(filePath); + } + } + catch (Exception ex) + { + ErrLogInfo.WriteLog($"附件【{filePath}】获取异常!"); + //continue; } //string savePath = fullPath + fileName; @@ -93,6 +107,7 @@ namespace BLL } } + /// /// 数据和附件插入到多附件表 /// diff --git a/SGGL/BLL/WebService/CNCECHSSEGetWebService.cs b/SGGL/BLL/WebService/CNCECHSSEGetWebService.cs index 0872c8cb..88587aca 100644 --- a/SGGL/BLL/WebService/CNCECHSSEGetWebService.cs +++ b/SGGL/BLL/WebService/CNCECHSSEGetWebService.cs @@ -13,6 +13,8 @@ namespace BLL #region 督查检查整改上报 + + /// /// 督查检查整改上报 /// @@ -23,12 +25,12 @@ namespace BLL { try { - // CNCECHSSEService.HSSEServiceClient hsseC = new CNCECHSSEService.HSSEServiceClient(); var upCheckReport = from x in db.View_DCGL_CheckRectifyListFromSUB where x.RealEndDate.HasValue && x.CheckRectifyId == checkRectifyId select new Model.DCGLCheckRectifyItem { CheckRectifyId = x.CheckRectifyId, + NoticeItemId = x.NoticeItemId, CheckRectifyCode = x.CheckRectifyCode, ProjectId = x.ProjectId, UnitId = x.UnitId, @@ -42,13 +44,15 @@ namespace BLL OrderEndDate = x.OrderEndDate, OrderEndPerson = x.OrderEndPerson, RealEndDate = x.RealEndDate, - Verification = x.Verification, + //Verification = x.Verification, + Situation = x.Situation, AttachFileId = x.AttachFileId2, ToKeyId = x.ToKeyId2, AttachSource = x.AttachSource2, AttachUrl = x.AttachUrl2, - ////附件转为字节传送 - FileContext = FileStructService.GetMoreFileStructByAttachUrl(x.AttachUrl2), + FilePath = Funs.SGGLUrl + //////附件转为字节传送 + //FileContext = FileStructService.GetMoreFileStructByAttachUrl(x.AttachUrl2), }; string baseurl = SysConstSetService.CNCECPath + "/api/HSSEData/UpDCGLCheckRectifyTable"; @@ -91,6 +95,8 @@ namespace BLL return code; } } + + #endregion diff --git a/SGGL/Model/APIItem/CNCEC/DCGLCheckRectifyItem.cs b/SGGL/Model/APIItem/CNCEC/DCGLCheckRectifyItem.cs index 55be12d1..7c7c5758 100644 --- a/SGGL/Model/APIItem/CNCEC/DCGLCheckRectifyItem.cs +++ b/SGGL/Model/APIItem/CNCEC/DCGLCheckRectifyItem.cs @@ -264,6 +264,15 @@ set; } + /// + /// 附件路径域名地址 + /// + public string FilePath + { + get; + set; + } + /// /// 附件路径 ///