培训

SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.IO;
+using System.Linq;
 using System.Text;
 namespace FineUIPro.Web.HSSE.EduTrain
 {
@@ -24,7 +25,24 @@ namespace FineUIPro.Web.HSSE.EduTrain
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 GetButtonPower();
 
+                var sysTestRule = Funs.DB.Sys_TestRule.FirstOrDefault();
+                if (sysTestRule != null)
+                {
+                    if (sysTestRule.PassingScore > 0)
+                    {
+                        this.lbPassScore.Text = "红色表示分数低于" + sysTestRule.PassingScore.ToString() + "分。";
+                    }
+                    else
+                    {
+                        this.lbPassScore.Text = "红色表示分数低于80分。";
+                    }
+                }
+                else
+                {
+                    this.lbPassScore.Text = "红色表示分数低于80分。";
 
+                    
+                }
 
                 ///更新没有结束时间且超时的考试记录
                 GetDataService.UpdateTestPlanStates();
@@ -56,11 +74,11 @@ namespace FineUIPro.Web.HSSE.EduTrain
                          + @" LEFT JOIN dbo.Training_TestTraining AS Training ON Training.TrainingId = TestRecord.TestType"
                          + @" LEFT JOIN dbo.SitePerson_Person AS Person ON Person.PersonId = TestRecord.TestManId "
                          + @" 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+"'";
+                         + @" WHERE TestRecord.TestStartTime is not null and  (isFiled IS NULL OR isFiled = 0) and TestRecord.ProjectId = '" + this.CurrUser.LoginProjectId+"'";
             List<SqlParameter> listStr = new List<SqlParameter>();
             if (!string.IsNullOrEmpty(this.txtName.Text.Trim()))
             {
-                strSql += " AND (Person.PersonName LIKE @name OR TestPlan.PlanName LIKE @name OR Training.TrainingName LIKE @name)";
+                strSql += " AND (Person.PersonName LIKE @name OR TestPlan.PlanName LIKE @name OR Training.TrainingName LIKE @name OR Unit.UnitName  like @name)";
                 listStr.Add(new SqlParameter("@name", "%" + this.txtName.Text.Trim() + "%"));
             }
             if (!string.IsNullOrEmpty(this.txtMinScores.Text.Trim()))