diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index aefffb1c..19f457de 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -69,6 +69,14 @@ ..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll + + ..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll + False + + + ..\packages\Microsoft.Office.Interop.Word.15.0.4797.1004\lib\net20\Microsoft.Office.Interop.Word.dll + False + False @@ -843,33 +851,6 @@ - - {2DF8D04C-5BFA-101B-BDE5-00AA0044DE52} - 2 - 4 - 0 - primary - False - True - - - {00020813-0000-0000-C000-000000000046} - 1 - 6 - 0 - primary - False - True - - - {00020905-0000-0000-C000-000000000046} - 8 - 4 - 0 - primary - False - False - {0002E157-0000-0000-C000-000000000046} 5 diff --git a/SGGL/FineUIPro.Web/File/Word/HSSE/安全隐患整改反馈单.doc b/SGGL/FineUIPro.Web/File/Word/HSSE/安全隐患整改反馈单.doc index 42c83958..3c2b1cf5 100644 Binary files a/SGGL/FineUIPro.Web/File/Word/HSSE/安全隐患整改反馈单.doc and b/SGGL/FineUIPro.Web/File/Word/HSSE/安全隐患整改反馈单.doc differ diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 351c8cac..1b0eb55c 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -107,6 +107,14 @@ ..\FineUIPro\Reference BLL\Interop.WIA.dll + + ..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll + False + + + ..\packages\Microsoft.Office.Interop.Word.15.0.4797.1004\lib\net20\Microsoft.Office.Interop.Word.dll + False + False @@ -14445,24 +14453,6 @@ - - {2DF8D04C-5BFA-101B-BDE5-00AA0044DE52} - 2 - 4 - 0 - primary - False - True - - - {00020905-0000-0000-C000-000000000046} - 8 - 4 - 0 - primary - False - True - {0002E157-0000-0000-C000-000000000046} 5 @@ -14483,7 +14473,7 @@ True 0 / - http://localhost:6233/ + http://localhost:3001/ False False diff --git a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx.cs index eaf27479..b699537e 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx.cs @@ -765,13 +765,15 @@ namespace FineUIPro.Web.HSSE.Check bookmarkProjectName.Text = BLL.ProjectService.GetProjectNameByProjectId(getRectify.ProjectId); } Bookmark IsRectify = doc.Range.Bookmarks["IsRectify"]; - if (IsRectify != null) + + var RectifyNoticesItem = Funs.DB.Check_RectifyNoticesItem.FirstOrDefault(x => x.RectifyNoticesId == getRectify.RectifyNoticesId && (x.IsRectify == false || x.IsRectify == null)); + if (RectifyNoticesItem == null) { - if (getRectify.IsRectify?.ToString() == "True") - IsRectify.Text = "合格"; - else - IsRectify.Text = "不合格"; + IsRectify.Text = "合格"; } + else + { IsRectify.Text = "不合格"; } + Bookmark bookmarkRectifyNoticesCode = doc.Range.Bookmarks["RectifyNoticesCode"]; if (bookmarkRectifyNoticesCode != null) {