20240408

2024-04-08 15:20:10 +08:00
parent 604d12d9f0
commit 3af4906673
4 changed files with 24 additions and 51 deletions
@@ -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)
            {