合并

SGGL/BLL/API/APIPersonService.cs

@@ -566,7 +566,7 @@ namespace BLL
             {
 
                 var getPersons = from x in db.View_SitePerson_Person
-                                 where x.ProjectId == projectId && x.States == Const.ProjectPersonStates_1
+                                 where x.ProjectId == projectId 
                                  select new Model.PersonItem
                                  {
                                      SitePersonId = x.SitePersonId,

SGGL/BLL/Common/Const.cs

@@ -5358,6 +5358,9 @@ namespace BLL
         /// </summary>
         public const string CQMS_MeetingMenuId = "30754DF1-CB18-4F53-BB66-2B2A398D7180";
 
-
+        /// <summary>
+        /// 质量会议
+        /// </summary>
+        public const string EntryEducationTrainTypeId = "8920c9cc-fa92-49b2-9493-775a55da27bb";
     }
 }

SGGL/BLL/HSSE/EduTrain/TestRecordService.cs

@@ -197,5 +197,24 @@ namespace BLL
             }
             return icount;
         }
+
+        /// <summary>
+        /// 根据人员id、日期获取入场教育合格考试记录
+        /// </summary>
+        /// <param name="testRecordId"></param>
+        /// <returns></returns>
+        public static Model.Training_TestRecord GetOKTestRecordByPersonIdAndDate(string testManId, DateTime? date)
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var testRecord = (from x in db.Training_TestRecord
+                                 join y in db.Training_TestPlan on x.TestPlanId equals y.TestPlanId
+                                 join z in db.Training_Plan on y.PlanId equals z.PlanId
+                                 where x.TestManId == testManId && x.TestStartTime >= date && x.TestScores >= 60
+                                 && z.TrainTypeId == BLL.Const.EntryEducationTrainTypeId
+                                 select x).FirstOrDefault();
+                return testRecord;
+            }
+        }
     }
 }