diff --git a/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs index 953ed1b..90228da 100644 --- a/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs +++ b/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs @@ -954,7 +954,7 @@ namespace FineUIPro.Web.HSSE.SitePerson string date1 = ""; string sign = ""; string sign1 = ""; - string TestRecordId = ""; + Model.AttachFile attachFile = null; decimal? TestScores = null; DateTime? TestStartTime = null; DateTime? dateTime1 = null; @@ -981,9 +981,7 @@ namespace FineUIPro.Web.HSSE.SitePerson Signature = gTrainingTestRecord.Signature; TestScores = gTrainingTestRecord.TestScores; TestStartTime = gTrainingTestRecord.TestStartTime; - TestRecordId = gTrainingTestRecord.TestRecordId; sign = gTrainingTestRecord.PlanManName; - sign1 = AttachFileService.getFileUrl(person.PersonId + "_1"); dateTime1 = gTrainingTestRecord.TestStartTime.Value; @@ -991,7 +989,7 @@ 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 == TestRecordId + where x.TestRecordId == gTrainingTestRecord.TestRecordId select x; getSingleItem = getTestItems.Where(x => x.TestType == "1").ToList(); // SValue = sysTestRule.SValue; //每题分数 @@ -1004,6 +1002,7 @@ namespace FineUIPro.Web.HSSE.SitePerson getIsTrueItem = getTestItems.Where(x => x.TestType == "3").ToList(); // JValue = sysTestRule.JValue; //每题分数 // JValueCount = sysTestRule.JValue * getIsTrueItem.Count; //总分 + attachFile = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == gTrainingTestRecord.TestRecordId); } if (!string.IsNullOrEmpty(Signature)) @@ -1224,7 +1223,6 @@ namespace FineUIPro.Web.HSSE.SitePerson helper.WriteTable(tableJ); //集合赋值遍历 //考试抓拍照片 - var attachFile = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == TestRecordId); if (attachFile != null && !string.IsNullOrEmpty(attachFile.AttachUrl)) { List listUrl = Funs.GetStrListByStr(attachFile.AttachUrl, ',');