lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.104.102.122:3000/lpf/SGGL_SeDin_New

Browse Source
This commit is contained in:
李鹏飞
2025-10-29 17:00:33 +08:00
parent d35ff80f3e 4205126390
commit e41a1eb9d3
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs
+4 -2
View File
@@ -41,7 +41,9 @@ namespace BLL
/// <returns></returns> /// <returns></returns>
public static IEnumerable getListData(string projetcId, string unitId, string departId, string workPostId, string name, string idCard, string states, string personType, Grid Grid1) 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) if (!string.IsNullOrEmpty(projetcId) && projetcId != Const._Null)
{ {
getDataList = getDataList.Where(e => e.ProjectId == projetcId); getDataList = getDataList.Where(e => e.ProjectId == projetcId);
@@ -94,7 +96,7 @@ namespace BLL
x.WorkPostId, x.WorkPostId,
x.WorkPostName, x.WorkPostName,
x.ProjectId, 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 ?? "", NativePlace = x.CountryName ?? "" + x.ProvinceName ?? "",
x.TeamGroupId, x.TeamGroupId,
x.TeamGroupName, x.TeamGroupName,
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+1 -1
View File
@@ -16839,7 +16839,7 @@
</COMReference> </COMReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <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> <ProjectExtensions>
<VisualStudio> <VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}"> <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
SGGL/FineUIPro.Web/HJGL/PreDesign/ProductionSchedulingPlan.aspx.cs
+2 -2
View File
@@ -1172,7 +1172,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
{ {
var dateRanges = new List<(DateTime, DateTime)> 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); combinedList.AddRange(dateRanges);
} }
@@ -1242,7 +1242,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
{ {
var dateRanges = new List<(DateTime, DateTime)> 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); combinedList.AddRange(dateRanges);
} }