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

1

This commit is contained in:
夏菊 2026-05-15 17:04:52 +08:00
parent 15fa506804
commit 06c34bf0d6
2 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -18538,7 +18538,7 @@
</FlavorProperties> </FlavorProperties>
</VisualStudio> </VisualStudio>
</ProjectExtensions> </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. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">

49
SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs
View File

@ -335,10 +335,17 @@ namespace FineUIPro.Web.HSSE.SitePerson
if (!string.IsNullOrEmpty(birthDateStr)) if (!string.IsNullOrEmpty(birthDateStr))
{ {
// 解析日期字符串为DateTime对象 // 解析日期字符串为DateTime对象
var birthDate = DateTime.ParseExact(birthDateStr, "yyyyMMdd", null); try
if (birthDate.AddYears(60) < DateTime.Now)
{ {
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}；");
} }
} }
} }
@ -1025,22 +1032,22 @@ namespace FineUIPro.Web.HSSE.SitePerson
var gTrainingTestRecord = var gTrainingTestRecord =
(from x in Funs.DB.Training_TestRecord (from x in Funs.DB.Training_TestRecord
join TestPlan in Funs.DB.Training_TestPlan on x.TestPlanId equals TestPlan.TestPlanId into join TestPlan in Funs.DB.Training_TestPlan on x.TestPlanId equals TestPlan.TestPlanId into
gTestPlan gTestPlan
from TestPlan in gTestPlan.DefaultIfEmpty() from TestPlan in gTestPlan.DefaultIfEmpty()
join user in Funs.DB.Sys_User on TestPlan.PlanManId equals user.UserId into gUser join user in Funs.DB.Sys_User on TestPlan.PlanManId equals user.UserId into gUser
from user in gUser.DefaultIfEmpty() from user in gUser.DefaultIfEmpty()
where x.TestManId == person.PersonId && x.TestScores >= 70 && x.ProjectId == CurrUser.LoginProjectId where x.TestManId == person.PersonId && x.TestScores >= 70 && x.ProjectId == CurrUser.LoginProjectId
orderby x.TestEndTime descending orderby x.TestEndTime descending
select new select new
{ {
TestRecordId = x.TestRecordId, TestRecordId = x.TestRecordId,
TestStartTime = x.TestStartTime, TestStartTime = x.TestStartTime,
TestEndTime = x.TestEndTime, TestEndTime = x.TestEndTime,
Signature = x.Signature, Signature = x.Signature,
TestScores = x.TestScores, TestScores = x.TestScores,
PlanManName = user == null ? "" : user.UserName PlanManName = user == null ? "" : user.UserName
}).FirstOrDefault(); }).FirstOrDefault();
string date1 = ""; string date1 = "";
string date11 = ""; string date11 = "";
@ -1087,8 +1094,8 @@ namespace FineUIPro.Web.HSSE.SitePerson
workPostName = WorkPostService.getWorkPostNamesWorkPostIds(person.WorkPostId); workPostName = WorkPostService.getWorkPostNamesWorkPostIds(person.WorkPostId);
// sysTestRule = Funs.DB.Sys_TestRule.FirstOrDefault(); // sysTestRule = Funs.DB.Sys_TestRule.FirstOrDefault();
getTestItems = from x in Funs.DB.Training_TestRecordItem getTestItems = from x in Funs.DB.Training_TestRecordItem
where x.TestRecordId == gTrainingTestRecord.TestRecordId where x.TestRecordId == gTrainingTestRecord.TestRecordId
select x; select x;
getSingleItem = getTestItems.Where(x => x.TestType == "1").ToList(); getSingleItem = getTestItems.Where(x => x.TestType == "1").ToList();
// SValue = sysTestRule.SValue; //每题分数 // SValue = sysTestRule.SValue; //每题分数
// SValueCount = sysTestRule.SValue * getSingleItem.Count; //总分 // SValueCount = sysTestRule.SValue * getSingleItem.Count; //总分