From 3af49066730fa35d23ac71ae6a02d1f1bce19cbe Mon Sep 17 00:00:00 2001
From: yhw0507 <yhw0508@163.com>
Date: Mon, 8 Apr 2024 15:20:10 +0800
Subject: [PATCH] 20240408

---
 SGGL/BLL/BLL.csproj                           |  35 ++++--------------
 .../File/Word/HSSE/安全隐患整改反馈单.doc     | Bin 38912 -> 38912 bytes
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj       |  28 +++++---------
 .../HSSE/Check/RectifyNotices.aspx.cs         |  12 +++---
 4 files changed, 24 insertions(+), 51 deletions(-)

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 @@
     <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="Microsoft.Office.Interop.Word, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Office.Interop.Word.15.0.4797.1004\lib\net20\Microsoft.Office.Interop.Word.dll</HintPath>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </Reference>
     <Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
@@ -843,33 +851,6 @@
     <WCFMetadataStorage Include="Service References\OAWebService\" />
   </ItemGroup>
   <ItemGroup>
-    <COMReference Include="Microsoft.Office.Core">
-      <Guid>{2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}</Guid>
-      <VersionMajor>2</VersionMajor>
-      <VersionMinor>4</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="Microsoft.Office.Interop.Excel">
-      <Guid>{00020813-0000-0000-C000-000000000046}</Guid>
-      <VersionMajor>1</VersionMajor>
-      <VersionMinor>6</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="Microsoft.Office.Interop.Word">
-      <Guid>{00020905-0000-0000-C000-000000000046}</Guid>
-      <VersionMajor>8</VersionMajor>
-      <VersionMinor>4</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </COMReference>
     <COMReference Include="VBIDE">
       <Guid>{0002E157-0000-0000-C000-000000000046}</Guid>
       <VersionMajor>5</VersionMajor>
diff --git a/SGGL/FineUIPro.Web/File/Word/HSSE/安全隐患整改反馈单.doc b/SGGL/FineUIPro.Web/File/Word/HSSE/安全隐患整改反馈单.doc
index 42c839581c78e8a0ad715cea0b061536f68b05df..3c2b1cf594d5e4a676604023a7586cbf4ef4c175 100644
GIT binary patch
delta 2602
zcmcK6e@vBC7{Kv!?&Zf7xxfWPL10%vQg$=18X#IQ(^;80n~AyjA)p{4)1)L)p=^={
z2%fFf8PjHJwi)_5a_VdvQlo69%*=FaOaE{>O>J%dSoVD`yp8Oi{^_vKJ?H&#-uHQ)
z_i*pq(BWw4aC9U(bht@!JfUmNOvlL(f0|P14&!yEm>j2f=FU{597?HO^wR!I&lOaD
zx>B7?bdOeQD%(BGA7R>pV$5M@p6)UComnHVu`iBeJ})1%NBgEkr7}!@P-?V9F|hf(
z=6G;shMXYn--rA5+n=1i!1ZFief{jAeFq-WWYjP*_|JFNU(ojH_WsT!rJ~qr&$ExW
z5=|@{nncIaOUb0!=glT(Y2C~}N8i@B?c@ZB!!O4r@}=}LwM>dYllf&%rR=oq-e)F-
z%nFkVO6y6bjOoGKl9g&T{xPX0!!=C%&Ha!sb(?i0bhkshtp#Bp=}qBj<z+6VDo}|k
z)S?cn@GjoN1~j1sA7C@Kp&i??2YYe#>bY}WyS8j;YuvJ`e9oM5NG~4*lw=Nt*M&#M
zRotD~uBK$@Wff+O`-ha_ikY#9gG3`y*bxNoY?2}}OisitGdc3B2$vm*1krA}qwZ+8
z9f!nlz;Z{kONJe?iG#)y8&lB5s0Y0`kGMff4MPGFk&Fq*L>{K#Sv-%IFc+_)5XGoO
z6{=BVt&Ux*-GQ5N>0>xyx#NiA1Vg!V;4YSX*c}~j-%M^G7ncjXflVeaA>QOBB*1N!
zx^{m&T-Vq1AFQR{fF`tHGj?JZ_Fx}6Z~&b+gv01Y4^HD3+`|K?FnIaLMF?DoKop`8
zi#V@JR$c~aNXL8>qXcDGWOgLRq}4E5gBIMqef`SC-riHEPIcej-@bl-d!RM8TfK=s
z9WPl*B6boIxCFh)wEE)BHlN$dO+KzYb{>+0i;G5C9`7A(IZ_^I&%pQ=aje?%q}|k>
zYKF`38ot44%aeXnPm_@Lp#z;bieor|E_6dq@4@#tjWg)Qd0fCn^W3QEeE&6%YVnMB
zRw)(ftW>nP3bu@IbgyUNtc%RJZh10pYX5bHH}D&N#~-+d2T&s@Jwo6@7{V>TFDpZ@
zGmGcW2&`Xu_L4!kIX-vj<Ff8$q01tZRVB+v3M$o#;;d>&By!tuD>%P2sPIXp)Ki#-
z7w|HQumsKhw$ktH_c?tx&frH}MyOUQ2AP<Ga;!w7Huu&S)(_<r5B}d<aRZwC$P9*j
z;f})urRr5CgUOhV8JLeklwcuvVCsErgygydlJ6(@6kp&lj^ZS~gXG@}sliY98JF-Y
zg2-KJG8j?Xuhe)3Qk)#*q6`aBi7Hg%b=0C!D>JL$6;oW`s+Vm3-m5|b+4beeMFaUs
z3OgX-4h-{awg-mi<jQtfVT{MYj%p&~Qb<(t=p-t6e6=Zj)Zs0x#u_x>ZLEcaI=djt
z)D(`Ymtsp@g#`6zE$w<rO=S()!Af0^^pn~OSzkhuuoJP9k$Ru+Cv_LpygpF)D{KhK
zRvv&0gAff_pnk}6$U-*qF%Ly3!N4j=B`P4*kmqARBY94Ji<|qXpnhg+QQeTU+&T#S
z=LN!`Q)jHv#h+=Xd=H#m(Cp-Q%_=GxqNmEEmfA{_?qQy$v{FSOP4j1u?cUM<suGy9
z&N@{3p<`s%GhL6#`IprSKC_X>1s%+mXq>IGh_bDkMN4(C#J!SV`&=`!;$Tow`?sa$
zQpG&oXfhY?Jy4mWb+(zb<muS4%WuewjFX8nS^8|Nc}Z%dUTN*GJK_o6-pH$twY(`*
f^Rn<}^EK^W7Tx#q6L<+S%Qvq0=N{|U#z@y+d1}TH

delta 2608
zcmcK6e@vBC7{Kv!?!CbE>IJUe5C|E95;7_w^_n`xrS`+wkIm2;UIm#VV2V0SW?phi
zYS$o-vysf1Id$Y1`Z`wV3JsmhaAri#xwcBTG)t5IFrC`>;qq=||MX9Xecp54ALl*K
zdEWD0-kKIiO^c%?#i2cBnBz&k+RSpCjP{LCD$`-ooattQGi}y}45b`Osak3&|E1;*
zDv+sED;<B!QfeCeP4pjb-ggZ#ZO(k%WbQfxBhPRwfph*eHk60!aEel?W{xXkutd?n
z_|wessBzhHfs}urjvTkQTwdgUF=XF={LsjW2NY?YYyEELy3H50eYt(SX_!*+9JKq{
z=a&<WpPe76M^j76q}bQxj*9HJ(f=!&m63fX7f2kra$X{zMJ-)RBncGhU+7fIo|awv
z&BW-JJd!~vO&O#yGipPsQuQYHi42qNPSiegH~I@*X&sH(@32ZdjoREFm|48YtyC$>
zP=z;9jrFL-CTu|%+pz;5q7l2W4+n7dYIk?XzJ`Xnh7HRK3ztD^+3*<h%z;7GCePcM
znyk3ij|9k=_ISPHnBlS6W^U|dv)kn}lj6RNjj@N8VH+)Pe2@0pBg?2QmUnQE4oS0F
zc5xVOIEK&BjuSYI^XP_u00AHo$w)yS#$Yn?F$2%xWz5FwC`1sYC_@ES3{Y0c|F({`
z2bY1{-6l3M#mY|T)?Pb+-oY$yVvkO;$CPno47txLY%}@ENoGoNGQ4J~d;gwCb%+6a
zPgYTH!WM+F1ADL+`*0A=Xu%P*;!||sG|u7&+{PW;hw>mzDHozK2(gIAV6fa?RjD-6
zF#>ZD!~ztf1ZAke8(5ANSc@?Jx^?}^rLL~d&dyV}4(-}}Xji1XV|AtE=p>o5Ov|2<
zOhcxy&D7^4nZ_KiH6``9_Sv(N8A+6}mM^VGo09Z+D<S=w9`etaC8P?=H{yo&^^fWl
zhtFER%p3Z73G5)6aRhBRhIX7l2jue8_!?(%4(HL03%H11%=D~hO?}q8zI%aorQ)1r
zijq*up2->2<?G*1uD@pavTx|zYc#Lpcih6CxQ#ow4>g<zf@rwmv2t?)*?OZ{QZUmi
zOI=ok%)w)h7Yuz|UJ-dGWc|rnlf@;8m8`{bRRtsx8P;P(%~|LQj!{ZYg8b^v#B2m1
z@rU~~P=DN~nffHYK{tLzv}TE5ET&=+s!*%Voz20J{C@iI{|?0f6#3^f5b{Gj788{U
zsTnk0z-yR?B9x#UTksxaj=LfA+=~Nf#b-E*4xE9^`&-D|FW@3B;U_qmv*f~qIOJih
zeoU#SX-vjKlwb+Uu@tMY8nxz?dGkXOf8RdGVtVHjnNbnPcS8c~AJ{4O`v>HppB=~m
z+PR1XqSScW#gI7UAxRwapk(|ts7_|H7H=Vh8mvdHR;Fm)QzjhD3gt4OWKtC2;q2KN
zlq||>v4fRNw)K&03Ry`)CSgy+o{VJp`#zFsL6$?kslLpPkl9MgW8j7lvJ^){mg6`C
zP=GlIq6q!7AemSU$%Z@;`>Dv2i7aC>s$6|c+x(zupYJw_3;d7BYH)#fO<jSMbJo-a
zpJ;QlC~Vaf`}H(CxpIy>st5UA(kkzlkfQms+ji~f`&jAiv(dV+@B_!lkDlpZG08i(
zl5GI_+|WU9iNaYgizi@hU$j(5N!(TZzn@~JmmYDIEWVm(?v>8fwWeT66aP}v4wp^P
zI$$Q2PxiN-X^_tuC!OU6QU|Q9<r#6h$~shi)E9Nr)xC3_RT+-ad@`)r`m6S~ltw;*
WdOw9sW!*||dtJXH)*p3o?!N&XU(sm*

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 @@
       <HintPath>..\FineUIPro\Reference BLL\Interop.WIA.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="Microsoft.Office.Interop.Word, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Office.Interop.Word.15.0.4797.1004\lib\net20\Microsoft.Office.Interop.Word.dll</HintPath>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+    </Reference>
     <Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
@@ -14445,24 +14453,6 @@
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
   <ItemGroup>
-    <COMReference Include="Microsoft.Office.Core">
-      <Guid>{2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}</Guid>
-      <VersionMajor>2</VersionMajor>
-      <VersionMinor>4</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="Microsoft.Office.Interop.Word">
-      <Guid>{00020905-0000-0000-C000-000000000046}</Guid>
-      <VersionMajor>8</VersionMajor>
-      <VersionMinor>4</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </COMReference>
     <COMReference Include="VBIDE">
       <Guid>{0002E157-0000-0000-C000-000000000046}</Guid>
       <VersionMajor>5</VersionMajor>
@@ -14483,7 +14473,7 @@
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>0</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:6233/</IISUrl>
+          <IISUrl>http://localhost:3001/</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>
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)
             {