From e863a39cdeabf1aaf1cfd47335852b2e00ac6397 Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Mon, 24 Mar 2025 15:31:10 +0800
Subject: [PATCH] 1

---
 ...WH_V2025-03-24-xiaj（关键事项）.sql} |  0
 ...WH_V2025-03-24-xiaj（进度管理）.sql} |  0
 .../版本日志/SUBQHSE_V2025-03-18-bwj.sql  | 27 ++++++++++++++++---
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj       |  3 ++-
 SGGL/Model/Model.cs                           |  2 +-
 5 files changed, 26 insertions(+), 6 deletions(-)
 rename DataBase/版本日志/{SGGLDB_WH_V2025-03-22-xiaj（关键事项）.sql => SGGLDB_WH_V2025-03-24-xiaj（关键事项）.sql} (100%)
 rename DataBase/版本日志/{SGGLDB_WH_V2025-03-22-xiaj（进度管理）.sql => SGGLDB_WH_V2025-03-24-xiaj（进度管理）.sql} (100%)

diff --git a/DataBase/版本日志/SGGLDB_WH_V2025-03-22-xiaj（关键事项）.sql b/DataBase/版本日志/SGGLDB_WH_V2025-03-24-xiaj（关键事项）.sql
similarity index 100%
rename from DataBase/版本日志/SGGLDB_WH_V2025-03-22-xiaj（关键事项）.sql
rename to DataBase/版本日志/SGGLDB_WH_V2025-03-24-xiaj（关键事项）.sql
diff --git a/DataBase/版本日志/SGGLDB_WH_V2025-03-22-xiaj（进度管理）.sql b/DataBase/版本日志/SGGLDB_WH_V2025-03-24-xiaj（进度管理）.sql
similarity index 100%
rename from DataBase/版本日志/SGGLDB_WH_V2025-03-22-xiaj（进度管理）.sql
rename to DataBase/版本日志/SGGLDB_WH_V2025-03-24-xiaj（进度管理）.sql
diff --git a/DataBase/版本日志/SUBQHSE_V2025-03-18-bwj.sql b/DataBase/版本日志/SUBQHSE_V2025-03-18-bwj.sql
index 13dede19..81310f6f 100644
--- a/DataBase/版本日志/SUBQHSE_V2025-03-18-bwj.sql
+++ b/DataBase/版本日志/SUBQHSE_V2025-03-18-bwj.sql
@@ -300,22 +300,41 @@ and (pu.RoleId like '%22F78A47-F59C-4FE8-9C43-2DD304CB2108%' or pu.RoleId like '
 --or (DATEADD(day,60,(select top 1 EndDate from JDGL_QuantityCompletion WHERE ProjectId=@projectId order by EndDate desc))<GETDATE())
 )
 UNION ALL
-SELECT MonthPlan.MonthPlanId AS DataId
+SELECT DISTINCT --MonthPlan.MonthPlanId AS DataId
+	'' AS DataId
 	,'94287B92-7E96-4B90-BC6F-DAF30AE3B314' AS MenuId
-	,'�¶ȼƻ���δ���' AS MenuName
+	,'���ȹ������¶ȼƻ���δ���' AS MenuName
 	,'' AS Content
 	,users.UserId
 	,users.UserName
 	,GETDATE() AS DataTime
 	,CONVERT(varchar(100),GETDATE(), 23) AS DataTimeStr
-	,'../JDGL/Check/MonthPlanEdit.aspx?ToDo=ToDo' AS PCUrl
+	,'../JDGL/Check/MonthPlanEditNew.aspx?ToDo=ToDo&Months='+CONVERT(varchar(100),Months, 23) AS PCUrl
 FROM JDGL_MonthPlan AS MonthPlan
 LEFT JOIN Sys_User AS users ON users.UserId =@userId
 LEFT JOIN Project_ProjectUser as pu on pu.UserId=@userId
 WHERE MonthPlan.ProjectId=@projectId
-and MonthPlan.DutyPerson=@userId and MonthPlan.RealDate is null and DATENAME(DAY,GETDATE())>=22 and 
+and MonthPlan.DutyPerson like '%'+@userId+'%' and MonthPlan.RealDate is null and DATENAME(DAY,GETDATE())>=22 and 
 DATENAME(year,GETDATE())=DATENAME(year,MonthPlan.PlanDate) and DATENAME(MONTH,GETDATE())=DATENAME(MONTH,MonthPlan.PlanDate)
 
+UNION ALL
+SELECT DISTINCT --WeekPlan.WeekPlanId AS DataId
+	'' AS DataId
+	,'56A54B4B-BBA3-4249-9FFC-3A60DAC79059' AS MenuId
+	,'���ȹ������ܽ��ȼƻ���δ���' AS MenuName
+	,'' AS Content
+	,users.UserId
+	,users.UserName
+	,GETDATE() AS DataTime
+	,CONVERT(varchar(100),GETDATE(), 23) AS DataTimeStr
+	,'../JDGL/Check/WeekPlanEdit.aspx?ToDo=ToDo&WeekNo='+WeekPlan.WeekNo AS PCUrl
+FROM JDGL_WeekPlan AS WeekPlan
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+LEFT JOIN Project_ProjectUser as pu on pu.UserId=@userId
+WHERE WeekPlan.ProjectId=@projectId
+and WeekPlan.DutyPerson like '%'+@userId+'%' and WeekPlan.IsOK =0 and DATENAME(DAY,GETDATE())<=DATENAME(DAY,WeekPlan.EndDate)  
+and DATENAME(year,GETDATE())=DATENAME(year,WeekPlan.EndDate) and DATENAME(MONTH,GETDATE())=DATENAME(MONTH,WeekPlan.EndDate)
+
 
 ORDER BY DataTime DESC
 END
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 3966232c..c3b092b2 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -2405,6 +2405,7 @@
     <Content Include="File\Excel\DataIn\ProjectSetup导入模板.xls" />
     <Content Include="File\Word\HSSE\环境监测数据接口.docx" />
     <Content Include="libman.json" />
+    <Content Include="File\Excel\DataOut\关键事项.xlsx" />
     <None Include="packages.config" />
     <Content Include="ReportPrint\ReportTabFile\分包商上传周报.tab" />
     <Content Include="ReportPrint\ReportTabFile\HSSE日志暨管理数据收集.tab" />
@@ -19772,7 +19773,7 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index e07b7fc8..ec01dcfb 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -52793,7 +52793,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WED_WorkCode", DbType="VarChar(20)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WED_WorkCode", DbType="NVarChar(100)")]
 		public string WED_WorkCode
 		{
 			get