diff --git a/DataBase/版本日志/SGGLDB_V2022-11-17.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-11-17.sql
similarity index 100%
rename from DataBase/版本日志/SGGLDB_V2022-11-17.sql
rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-11-17.sql
diff --git a/DataBase/版本日志/SGGLDB_V2022-11-18-001.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-11-18-001.sql
similarity index 100%
rename from DataBase/版本日志/SGGLDB_V2022-11-18-001.sql
rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-11-18-001.sql
diff --git a/DataBase/版本日志/SGGLDB_V2022-11-23.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-11-23.sql
similarity index 100%
rename from DataBase/版本日志/SGGLDB_V2022-11-23.sql
rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-11-23.sql
diff --git a/DataBase/版本日志/SGGLDB_V2022-11-24.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-11-24.sql
similarity index 100%
rename from DataBase/版本日志/SGGLDB_V2022-11-24.sql
rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-11-24.sql
diff --git a/DataBase/版本日志/SGGLDB_V2022-11-28.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-11-28.sql
similarity index 100%
rename from DataBase/版本日志/SGGLDB_V2022-11-28.sql
rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-11-28.sql
diff --git a/DataBase/版本日志/SGGLDB_V2022-11-30.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-11-30.sql
similarity index 100%
rename from DataBase/版本日志/SGGLDB_V2022-11-30.sql
rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-11-30.sql
diff --git a/DataBase/版本日志/SGGLDB_V2022-11-30修改明细.txt b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-11-30修改明细.txt
similarity index 100%
rename from DataBase/版本日志/SGGLDB_V2022-11-30修改明细.txt
rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-11-30修改明细.txt
diff --git a/DataBase/版本日志/SGGLDB_V2022-12-03.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-12-03.sql
similarity index 100%
rename from DataBase/版本日志/SGGLDB_V2022-12-03.sql
rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-12-03.sql
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index f230b035..d2fdfd74 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -12255,7 +12255,7 @@
True
0
/
- http://localhost:4641/
+ http://localhost:9691/
False
False
diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs
index afd87ee4..ceb35fc6 100644
--- a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs
@@ -54,17 +54,19 @@ namespace FineUIPro.Web.HSSE.EduTrain
private void BindGrid()
{
string strSql = @"SELECT TestRecord.TestRecordId,TestRecord.TestPlanId, TestRecord.TestManId,TestRecord.TestStartTime,TestRecord.TestEndTime, TestRecord.TestScores,
- (CASE WHEN TestPlan.PlanName IS NULL THEN Training.TrainingName ELSE TestPlan.PlanName END) AS PlanName,Person.IdentityCard,WorkPost.WorkPostName,Person.PersonId,SitePerson.SitePersonId,
- (CASE WHEN TestRecord.TestScores>=60 THEN '是' ELSE '否' END) AS IsPass,
- ISNULL(TestPlan.Duration,90) AS Duration,ISNULL(TestPlan.TotalScore,100) AS TotalScore,TestPlan.TestPalce,ISNULL(TestPlan.QuestionCount,95) AS QuestionCount,TestRecord.TemporaryUser,Person.PersonName AS TestManName
- ,Unit.UnitName,Person.Telephone
- FROM dbo.Training_TestRecord AS TestRecord
- LEFT JOIN dbo.Training_TestPlan AS TestPlan ON TestPlan.TestPlanId=TestRecord.TestPlanId
- LEFT JOIN dbo.Training_TestTraining AS Training ON Training.TrainingId = TestRecord.TestType
- LEFT JOIN dbo.Person_Persons AS Person ON Person.PersonId = TestRecord.TestManId
- LEFT JOIN dbo.SitePerson_Person AS SitePerson ON SitePerson.PersonId = Person.PersonId AND SitePerson.ProjectId=TestRecord.ProjectId
- LEFT JOIN dbo.Base_WorkPost AS WorkPost ON WorkPost.WorkPostId = SitePerson.WorkPostId
- LEFT JOIN dbo.Base_Unit AS Unit ON Person.UnitId=Unit.UnitId
+ (CASE WHEN TestPlan.PlanName IS NULL THEN Training.TrainingName ELSE TestPlan.PlanName END) AS PlanName,Person.IdentityCard,WorkPost.WorkPostName,Person.PersonId,SitePerson.SitePersonId,
+ (CASE WHEN TestRecord.TestScores>=60 THEN '是' ELSE '否' END) AS IsPass,
+ ISNULL(TestPlan.Duration,90) AS Duration,ISNULL(TestPlan.TotalScore,100) AS TotalScore
+ ,TestPlan.TestPalce,ISNULL(TestPlan.QuestionCount,95) AS QuestionCount,TestRecord.TemporaryUser
+ ,Person.PersonName AS TestManName
+ ,Unit.UnitName,Person.Telephone
+ FROM dbo.Training_TestRecord AS TestRecord
+ LEFT JOIN dbo.Training_TestPlan AS TestPlan ON TestRecord.TestPlanId=TestPlan.TestPlanId
+ LEFT JOIN dbo.Training_TestTraining AS Training ON Training.TrainingId = TestRecord.TestType
+ LEFT JOIN dbo.Person_Persons AS Person ON TestRecord.TestManId = Person.PersonId
+ LEFT JOIN dbo.SitePerson_Person AS SitePerson ON TestRecord.TestManId=SitePerson.PersonId AND TestRecord.ProjectId= SitePerson.ProjectId
+ LEFT JOIN dbo.Base_WorkPost AS WorkPost ON SitePerson.WorkPostId =WorkPost.WorkPostId
+ LEFT JOIN dbo.Base_Unit AS Unit ON Person.UnitId=Unit.UnitId
WHERE (isFiled IS NULL OR isFiled = 0) and TestRecord.ProjectId = '" + this.CurrUser.LoginProjectId + "'";
List listStr = new List();
if (!string.IsNullOrEmpty(this.txtName.Text.Trim()))