xiaju/SGGL_JT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.104.102.122:3000/xiaju/SGGL_JT

Browse Source
This commit is contained in:
李超
2026-05-17 08:37:41 +08:00
parent 58f8a1213b 169862a7fd
commit 4e4d3d5d78
2 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj
+1 -1
View File
@@ -18538,7 +18538,7 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v18.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">
SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs
+33 -25
View File
@@ -335,10 +335,18 @@ namespace FineUIPro.Web.HSSE.SitePerson
if (!string.IsNullOrEmpty(birthDateStr))
{
// 解析日期字符串为DateTime对象
var birthDate = DateTime.ParseExact(birthDateStr, "yyyyMMdd", null);
if (birthDate.AddYears(60) < DateTime.Now)
try
{
Grid1.Rows[i].RowCssClass = "Yellow";
var birthDate = DateTime.ParseExact(birthDateStr, "yyyyMMdd", null);
if (birthDate.AddYears(60) < DateTime.Now)
{
Grid1.Rows[i].RowCssClass = "Yellow";
}
}
catch (Exception ex)
{
ErrLogInfo.WriteLog($"{person.PersonName}身份证号码异常：{idCard}；");
continue;
}
}
}
@@ -751,7 +759,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
}
#endregion
#region 批量审核
/// <summary>
/// 批量审核
@@ -779,7 +787,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
ShowNotify("操作完成!", MessageBoxIcon.Success);
}
#endregion
#region 查询
/// <summary>
/// 查询
@@ -1025,22 +1033,22 @@ namespace FineUIPro.Web.HSSE.SitePerson
var gTrainingTestRecord =
(from x in Funs.DB.Training_TestRecord
join TestPlan in Funs.DB.Training_TestPlan on x.TestPlanId equals TestPlan.TestPlanId into
gTestPlan
from TestPlan in gTestPlan.DefaultIfEmpty()
join user in Funs.DB.Sys_User on TestPlan.PlanManId equals user.UserId into gUser
from user in gUser.DefaultIfEmpty()
where x.TestManId == person.PersonId && x.TestScores >= 70 && x.ProjectId == CurrUser.LoginProjectId
orderby x.TestEndTime descending
select new
{
TestRecordId = x.TestRecordId,
TestStartTime = x.TestStartTime,
TestEndTime = x.TestEndTime,
Signature = x.Signature,
TestScores = x.TestScores,
PlanManName = user == null ? "" : user.UserName
}).FirstOrDefault();
join TestPlan in Funs.DB.Training_TestPlan on x.TestPlanId equals TestPlan.TestPlanId into
gTestPlan
from TestPlan in gTestPlan.DefaultIfEmpty()
join user in Funs.DB.Sys_User on TestPlan.PlanManId equals user.UserId into gUser
from user in gUser.DefaultIfEmpty()
where x.TestManId == person.PersonId && x.TestScores >= 70 && x.ProjectId == CurrUser.LoginProjectId
orderby x.TestEndTime descending
select new
{
TestRecordId = x.TestRecordId,
TestStartTime = x.TestStartTime,
TestEndTime = x.TestEndTime,
Signature = x.Signature,
TestScores = x.TestScores,
PlanManName = user == null ? "" : user.UserName
}).FirstOrDefault();
string date1 = "";
string date11 = "";
@@ -1087,8 +1095,8 @@ namespace FineUIPro.Web.HSSE.SitePerson
workPostName = WorkPostService.getWorkPostNamesWorkPostIds(person.WorkPostId);
// sysTestRule = Funs.DB.Sys_TestRule.FirstOrDefault();
getTestItems = from x in Funs.DB.Training_TestRecordItem
where x.TestRecordId == gTrainingTestRecord.TestRecordId
select x;
where x.TestRecordId == gTrainingTestRecord.TestRecordId
select x;
getSingleItem = getTestItems.Where(x => x.TestType == "1").ToList();
// SValue = sysTestRule.SValue; //每题分数
// SValueCount = sysTestRule.SValue * getSingleItem.Count; //总分
@@ -1128,14 +1136,14 @@ namespace FineUIPro.Web.HSSE.SitePerson
dt = dt.AddDays(2);
date1 = string.Format("{0:yyyy年MM月dd日}", dt);
}
if (!string.IsNullOrEmpty(date1))
{
DateTime dt = DateTime.Parse(date1);
dt = dt.AddDays(2);
date11 = string.Format("{0:yyyy年MM月dd日}", dt);
}
string sign2 = AttachFileService.getFileUrl(person.PersonId + "_2");
if (!string.IsNullOrEmpty(sign2))
{