From df56be793c11db7f1c00427cb068624d63d5e572 Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Mon, 26 May 2025 16:34:27 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=B4=A8?=
 =?UTF-8?q?=E9=87=8F=E5=B7=A1=E6=A3=80=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../版本日志/SGGLDB_WH_2025-05-23-xiaj.sql    |  7 ++++
 .../版本日志/SGGLDB_WH_2025-05-26-xiaj.sql    | 37 +++++++++++++++++++
 SGGL/BLL/CQMS/Check/CheckControlService.cs    |  3 ++
 .../FineUIPro.Web/common/mainProject2.aspx.cs |  8 +++-
 SGGL/FineUIPro.Web/common/main_new.aspx.cs    |  9 ++++-
 SGGL/Model/Model.cs                           | 24 ++++++++++++
 SGGL/WebAPI/Filter/TestPermissionAttribute.cs | 17 +++++----
 .../PublishProfiles/FolderProfile.pubxml      |  2 +-
 .../PublishProfiles/FolderProfile.pubxml.user | 22 +++++------
 SGGL/WebAPI/WebAPI.csproj.user                |  2 +-
 10 files changed, 106 insertions(+), 25 deletions(-)
 create mode 100644 DataBase/版本日志/SGGLDB_WH_2025-05-26-xiaj.sql

diff --git a/DataBase/版本日志/SGGLDB_WH_2025-05-23-xiaj.sql b/DataBase/版本日志/SGGLDB_WH_2025-05-23-xiaj.sql
index 4c244a9a..3579d9da 100644
--- a/DataBase/版本日志/SGGLDB_WH_2025-05-23-xiaj.sql
+++ b/DataBase/版本日志/SGGLDB_WH_2025-05-23-xiaj.sql
@@ -28,3 +28,10 @@ BEGIN
 	VALUES('182BC982-F98F-41B3-A2D2-9DD834BF5833','ָ�ӵ�������','Menu_CommandDispatchCenter',11,'MenuType_P')
 END
 GO
+
+--����Ѳ�첹�䳭����Ա
+IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Check_CheckControl' AND COLUMN_NAME = 'CCManIds')
+BEGIN
+	ALTER TABLE Check_CheckControl ADD CCManIds nvarchar(2000);
+END
+GO
\ No newline at end of file
diff --git a/DataBase/版本日志/SGGLDB_WH_2025-05-26-xiaj.sql b/DataBase/版本日志/SGGLDB_WH_2025-05-26-xiaj.sql
new file mode 100644
index 00000000..3579d9da
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2025-05-26-xiaj.sql
@@ -0,0 +1,37 @@
+
+
+--�½��Ȳ������״̬
+IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'JDGL_MonthPlan' AND COLUMN_NAME = 'IsOK')
+BEGIN
+	ALTER TABLE JDGL_MonthPlan ADD IsOK bit;
+END
+GO
+
+update JDGL_MonthPlan set IsOK =1 where RealDate is not null
+update JDGL_MonthPlan set IsOK =0 where RealDate is null
+GO
+
+--1��ָ�ӵ�������
+IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = '09E6A03F-65C8-4FAC-9659-7A0B56D8CC19')
+BEGIN
+	--ָ�ӵ�������
+	INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+	VALUES('09E6A03F-65C8-4FAC-9659-7A0B56D8CC19','ָ�ӵ�������','ZHDD/ZHDD.aspx',10,'0','Menu_CommandDispatchCenter',0,1,1)
+END
+GO
+
+ --1��ָ�ӵ�������
+IF NOT EXISTS (SELECT * FROM Sys_Const WHERE ID = '182BC982-F98F-41B3-A2D2-9DD834BF5833')
+BEGIN
+	--ָ�ӵ�������
+	INSERT INTO dbo.Sys_Const(ID,ConstText,ConstValue,SortIndex,GroupId)
+	VALUES('182BC982-F98F-41B3-A2D2-9DD834BF5833','ָ�ӵ�������','Menu_CommandDispatchCenter',11,'MenuType_P')
+END
+GO
+
+--����Ѳ�첹�䳭����Ա
+IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Check_CheckControl' AND COLUMN_NAME = 'CCManIds')
+BEGIN
+	ALTER TABLE Check_CheckControl ADD CCManIds nvarchar(2000);
+END
+GO
\ No newline at end of file
diff --git a/SGGL/BLL/CQMS/Check/CheckControlService.cs b/SGGL/BLL/CQMS/Check/CheckControlService.cs
index 23726264..8d513793 100644
--- a/SGGL/BLL/CQMS/Check/CheckControlService.cs
+++ b/SGGL/BLL/CQMS/Check/CheckControlService.cs
@@ -96,6 +96,7 @@ namespace BLL
                 newCheckControl.ReAttachUrl = CheckControl.ReAttachUrl;
                 newCheckControl.State = CheckControl.State;
                 newCheckControl.SaveHandleMan = CheckControl.SaveHandleMan;
+                newCheckControl.CCManIds = CheckControl.CCManIds;
 
                 db.Check_CheckControl.InsertOnSubmit(newCheckControl);
                 db.SubmitChanges();
@@ -616,6 +617,8 @@ namespace BLL
                     newCheckControl.State = CheckControl.State;
                 if (!string.IsNullOrEmpty(CheckControl.ProposeUnitId))
                     newCheckControl.ProposeUnitId = CheckControl.ProposeUnitId;
+                if (!string.IsNullOrEmpty(CheckControl.CCManIds))
+                    newCheckControl.CCManIds = CheckControl.CCManIds;
                 db.SubmitChanges();
             }
         }
diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
index 7b248741..0f2d656c 100644
--- a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
@@ -1789,9 +1789,13 @@ left join (select PlanNum,RealNum,QuantityListId from JDGL_QuantityCompletion wh
                     sbclHtml += "<div class=\"tr\" >" + Sbdhs + "</div>";
                     //百分比
                     var dhbfb = "0%";
-                    if (SbcllCgl + Sbdhs != 0)
+                    //if (SbcllCgl + Sbdhs != 0)
+                    //{
+                    //    dhbfb = String.Format("{0:N2}", 100.0 * Sbdhs / (Sbdhs + SbcllCgl), 2) + "%";
+                    //}
+                    if (SbcllCgl != 0)
                     {
-                        dhbfb = String.Format("{0:N2}", 100.0 * Sbdhs / (Sbdhs + SbcllCgl), 2) + "%";
+                        dhbfb = String.Format("{0:N2}", 100.0 * Sbdhs / SbcllCgl, 2) + "%";
                     }
                     sbclHtml += "<div class=\"tr\" >" + dhbfb + "</div>";
                     sbclHtml += "</div>";
diff --git a/SGGL/FineUIPro.Web/common/main_new.aspx.cs b/SGGL/FineUIPro.Web/common/main_new.aspx.cs
index a4297f62..f2f7b278 100644
--- a/SGGL/FineUIPro.Web/common/main_new.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/main_new.aspx.cs
@@ -1219,9 +1219,14 @@ namespace FineUIPro.Web.common
                 sbclHtml += "<div class=\"th-p\">" + SbcllCgl + "</div>";
                 sbclHtml += "<div class=\"th-p\">" + Sbdhs + "</div>";
                 //百分比
-                if (SbcllCgl + Sbdhs != 0)
+                //if (SbcllCgl + Sbdhs != 0)
+                //{
+                //    var dhbfb = String.Format("{0:N2}", 100.0 * Sbdhs / (Sbdhs + SbcllCgl), 2) + "%";
+                //    sbclHtml += "<div class=\"th-p\">" + dhbfb + "</div>";
+                //}
+                if (SbcllCgl != 0)
                 {
-                    var dhbfb = String.Format("{0:N2}", 100.0 * Sbdhs / (Sbdhs + SbcllCgl), 2) + "%";
+                    var dhbfb = String.Format("{0:N2}", 100.0 * Sbdhs / SbcllCgl, 2) + "%";
                     sbclHtml += "<div class=\"th-p\">" + dhbfb + "</div>";
                 }
                 else
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index b120ec6c..104b8601 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -56366,6 +56366,8 @@ namespace Model
 		
 		private string _SaveHandleMan;
 		
+		private string _CCManIds;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
 		private EntityRef<Sys_User> _Sys_User;
@@ -56422,6 +56424,8 @@ namespace Model
     partial void OnProposeUnitIdChanged();
     partial void OnSaveHandleManChanging(string value);
     partial void OnSaveHandleManChanged();
+    partial void OnCCManIdsChanging(string value);
+    partial void OnCCManIdsChanged();
     #endregion
 		
 		public Check_CheckControl()
@@ -56900,6 +56904,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CCManIds", DbType="NVarChar(2000)")]
+		public string CCManIds
+		{
+			get
+			{
+				return this._CCManIds;
+			}
+			set
+			{
+				if ((this._CCManIds != value))
+				{
+					this.OnCCManIdsChanging(value);
+					this.SendPropertyChanging();
+					this._CCManIds = value;
+					this.SendPropertyChanged("CCManIds");
+					this.OnCCManIdsChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckControl_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{
diff --git a/SGGL/WebAPI/Filter/TestPermissionAttribute.cs b/SGGL/WebAPI/Filter/TestPermissionAttribute.cs
index 0212be86..dcfe827d 100644
--- a/SGGL/WebAPI/Filter/TestPermissionAttribute.cs
+++ b/SGGL/WebAPI/Filter/TestPermissionAttribute.cs
@@ -86,16 +86,17 @@ namespace WebAPI.Filter
         /// <summary>
         /// 
         /// </summary>
-        public static List<string> lists = new List<string> { "PMP*SynPMPProjectData", "GJSX*OverdueWarningSendEmail", "User*postLoginOn", "get*token", "HazardRegister*getHazardRegisterTotalCount", 
-            "HazardRegister*getHazardRegisterByProjectIdStates", 
-            "JGZL*getUserList", 
-            "JGZL*getProjedtList", 
-            "JGZL*getUnitWorkListByProjectId", 
-            "JGZL*getInstallationListByProjectId", 
-            "JGZL*getUnitList", 
+        public static List<string> lists = new List<string> { "PMP*SynPMPProjectData", "GJSX*OverdueWarningSendEmail", "User*postLoginOn", "get*token", "HazardRegister*getHazardRegisterTotalCount",
+            "HazardRegister*getHazardRegisterByProjectIdStates",
+            "JGZL*getUserList",
+            "JGZL*getProjedtList",
+            "JGZL*getUnitWorkListByProjectId",
+            "JGZL*getInstallationListByProjectId",
+            "JGZL*getUnitList",
             "upload*attendance" ,
             "CNCECServer*PostGetHSSEData",
-            "CNCECServer*PostGetCQMSData"
+            "CNCECServer*PostGetCQMSData",
+            "CNCECServer*PostGetHJGLData"
         };
 
         /// <summary>
diff --git a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml
index 96351351..43d3a5d6 100644
--- a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml
@@ -12,7 +12,7 @@
     <SiteUrlToLaunchAfterPublish />
     <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
     <ExcludeApp_Data>false</ExcludeApp_Data>
-    <publishUrl>E:\诺必达合肥\发布\五环WebApi</publishUrl>
+    <publishUrl>G:\发布\五环WebApi</publishUrl>
     <DeleteExistingFiles>true</DeleteExistingFiles>
     <PrecompileBeforePublish>true</PrecompileBeforePublish>
     <EnableUpdateable>true</EnableUpdateable>
diff --git a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 56ae91ec..49efbc07 100644
--- a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <_PublishTargetUrl>E:\诺必达合肥\发布\五环WebApi</_PublishTargetUrl>
+    <_PublishTargetUrl>G:\发布\五环WebApi</_PublishTargetUrl>
     <History>True|2025-04-07T08:11:44.5172315Z||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||;</History>
     <LastFailureDetails />
   </PropertyGroup>
@@ -86,22 +86,22 @@
       <publishTime>10/28/2024 14:02:50</publishTime>
     </File>
     <File Include="bin/App_global.asax.compiled">
-      <publishTime>05/26/2025 11:30:24</publishTime>
+      <publishTime>05/26/2025 16:30:19</publishTime>
     </File>
     <File Include="bin/App_global.asax.dll">
-      <publishTime>05/26/2025 11:30:24</publishTime>
+      <publishTime>05/26/2025 16:30:19</publishTime>
     </File>
     <File Include="bin/Aspose.Words.dll">
       <publishTime>12/06/2024 20:13:58</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>05/26/2025 11:30:05</publishTime>
+      <publishTime>05/26/2025 16:27:28</publishTime>
     </File>
     <File Include="bin/BLL.dll.config">
       <publishTime>12/26/2024 09:46:52</publishTime>
     </File>
     <File Include="bin/BLL.pdb">
-      <publishTime>05/26/2025 11:30:05</publishTime>
+      <publishTime>05/26/2025 16:27:28</publishTime>
     </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
       <publishTime>12/18/2020 05:32:28</publishTime>
@@ -128,10 +128,10 @@
       <publishTime>07/25/2012 19:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>05/26/2025 11:29:58</publishTime>
+      <publishTime>05/26/2025 16:27:23</publishTime>
     </File>
     <File Include="bin/Model.pdb">
-      <publishTime>05/26/2025 11:29:58</publishTime>
+      <publishTime>05/26/2025 16:27:23</publishTime>
     </File>
     <File Include="bin/netstandard.dll">
       <publishTime>07/04/2024 14:13:01</publishTime>
@@ -389,13 +389,13 @@
       <publishTime>02/09/2013 00:42:28</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>05/26/2025 11:30:08</publishTime>
+      <publishTime>05/26/2025 16:30:10</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>05/26/2025 11:30:08</publishTime>
+      <publishTime>05/26/2025 16:30:10</publishTime>
     </File>
     <File Include="bin/WebAPI.xml">
-      <publishTime>05/26/2025 11:30:08</publishTime>
+      <publishTime>05/26/2025 16:30:10</publishTime>
     </File>
     <File Include="bin/WebGrease.dll">
       <publishTime>01/23/2014 21:57:34</publishTime>
@@ -479,7 +479,7 @@
       <publishTime>10/28/2024 14:02:50</publishTime>
     </File>
     <File Include="PrecompiledApp.config">
-      <publishTime>05/26/2025 11:30:09</publishTime>
+      <publishTime>05/26/2025 16:30:11</publishTime>
     </File>
     <File Include="Scripts/bootstrap.js">
       <publishTime>10/28/2024 14:02:50</publishTime>
diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user
index 556827c1..285eec39 100644
--- a/SGGL/WebAPI/WebAPI.csproj.user
+++ b/SGGL/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />