1

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;
+            }
+        }
     }
 }

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -17035,7 +17035,7 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   
  
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v18.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
  
   <ProjectExtensions>
     <VisualStudio>

SGGL/WebAPI/Controllers/PersonController.cs

@@ -545,9 +545,22 @@ namespace WebAPI.Controllers
         {
             var responeData = new Model.ResponeData();
             try
+            {
+                var getSitePerson = SitePerson_PersonService.GetSitePersonById(sitePersonId);
+                if (getSitePerson != null)
+                {
+                    var testRecord = BLL.TestRecordService.GetOKTestRecordByPersonIdAndDate(getSitePerson.PersonId, getSitePerson.InTime);
+                    if (testRecord != null)
                     {
                         SitePerson_PersonService.SetSitePerson_PersonStates(sitePersonId, states, DateTime.Now);
                     }
+                    else
+                    {
+                        responeData.code = 0;
+                        responeData.message = "入场教育考试未合格，无法审核入场！";
+                    }
+                }
+            }
             catch (Exception ex)
             {
                 responeData.code = 0;