From d3bb05f05d5814305ecea1b086443222adebc6ec Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Mon, 27 Oct 2025 20:24:44 +0800
Subject: [PATCH 1/2] 1

---
 SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs b/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs
index c1444f0a..29608a06 100644
--- a/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs
+++ b/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs
@@ -41,7 +41,9 @@ namespace BLL
         /// <returns></returns>
         public static IEnumerable getListData(string projetcId, string unitId, string departId, string workPostId, string name, string idCard, string states, string personType, Grid Grid1)
         {
-            IQueryable<Model.View_SitePerson_Person> getDataList = getDataLists;
+            Model.SGGLDB db = Funs.DB;
+            IQueryable<Model.View_SitePerson_Person> getDataList = from x in db.View_SitePerson_Person
+                                                                   select x;
             if (!string.IsNullOrEmpty(projetcId) && projetcId != Const._Null)
             {
                 getDataList = getDataList.Where(e => e.ProjectId == projetcId);
@@ -94,7 +96,7 @@ namespace BLL
                        x.WorkPostId,
                        x.WorkPostName,
                        x.ProjectId,
-                       ProjectName = Funs.DB.Base_Project.First(u => u.ProjectId == x.ProjectId).ShortName,
+                       ProjectName = db.Base_Project.First(u => u.ProjectId == x.ProjectId).ShortName,
                        NativePlace = x.CountryName ?? "" + x.ProvinceName ?? "",
                        x.TeamGroupId,
                        x.TeamGroupName,

From 4205126390f397384d9e50bcdaff0046549793c0 Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Tue, 28 Oct 2025 15:03:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?20251028=20=E6=8E=92=E4=BA=A7=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E5=89=A9=E4=BD=99=E5=A4=A9=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj                       | 2 +-
 .../HJGL/PreDesign/ProductionSchedulingPlan.aspx.cs           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index aa834918..2fd4737d 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -16839,7 +16839,7 @@
     </COMReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v18.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx.cs
index a25b86cc..1acc91cb 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx.cs
@@ -1172,7 +1172,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
                     {
                         var dateRanges = new List<(DateTime, DateTime)>
                     {
-                        (new DateTime(item.PlanStartDate.Value.Year, item.PlanStartDate.Value.Month, item.PlanStartDate.Value.Day), new DateTime(item.PlanEndDate.Value.Year, item.PlanEndDate.Value.Month, item.PlanEndDate.Value.Day)),
+                        (new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.AddDays(1).Day), new DateTime(item.PlanEndDate.Value.Year, item.PlanEndDate.Value.Month, item.PlanEndDate.Value.Day)),
                     };
                         combinedList.AddRange(dateRanges);
                     }
@@ -1242,7 +1242,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
                     {
                         var dateRanges = new List<(DateTime, DateTime)>
                     {
-                        (new DateTime(item.PlanStartDate.Value.Year, item.PlanStartDate.Value.Month, item.PlanStartDate.Value.Day), new DateTime(item.PlanEndDate.Value.Year, item.PlanEndDate.Value.Month, item.PlanEndDate.Value.Day)),
+                        (new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.AddDays(1).Day), new DateTime(item.PlanEndDate.Value.Year, item.PlanEndDate.Value.Month, item.PlanEndDate.Value.Day)),
                     };
                         combinedList.AddRange(dateRanges);
                     }