20221209打包

2022-12-09 10:58:21 +08:00
parent 009c3a1a37
commit ce763f6a52
10 changed files with 14 additions and 12 deletions
@@ -12255,7 +12255,7 @@
          <AutoAssignPort>True</AutoAssignPort>
          <DevelopmentServerPort>0</DevelopmentServerPort>
          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:4641/</IISUrl>
+          <IISUrl>http://localhost:9691/</IISUrl>
          <NTLMAuthentication>False</NTLMAuthentication>
          <UseCustomServer>False</UseCustomServer>
          <CustomServerUrl>
@@ -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<SqlParameter> listStr = new List<SqlParameter>();
            if (!string.IsNullOrEmpty(this.txtName.Text.Trim()))