20221117人员培训发卡关联优化

SGGL/FineUIPro.Web/HSSE/SitePerson/SendCard.aspx.cs

@@ -190,7 +190,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
                 }
                 else
                 {
-                    if (ConvertTrainResult(SitePersonId) == "通过")
+                    if (ConvertTrainResult(person.PersonId) == "通过")
                     {
                         PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ReadWriteCard.aspx?PersonId={0}", this.SitePersonId, "发卡 - ")));
                     }
@@ -233,14 +233,14 @@ namespace FineUIPro.Web.HSSE.SitePerson
         /// </summary>
         /// <param name="WorkStage"></param>
         /// <returns></returns>
-        protected string ConvertTrainResult(object SitePersonId)
+        protected string ConvertTrainResult(object sitepersonId)
         {
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
                 string result = string.Empty;
-                if (SitePersonId != null)
+                var getSiteperson = SitePerson_PersonService.GetSitePersonById(sitepersonId.ToString());
+                if (getSiteperson != null)
                 {
-                    string personId = SitePersonId.ToString().Trim();
                     List<Model.Base_TrainType> trainTypeList = BLL.TrainTypeService.GetIsAboutSendCardTrainTypeList();
                     int i = 0;   //培训合格次数
                     foreach (var item in trainTypeList)
@@ -248,7 +248,9 @@ namespace FineUIPro.Web.HSSE.SitePerson
                         var q = (from x in db.EduTrain_TrainRecord
                                  join y in db.EduTrain_TrainRecordDetail
                                  on x.TrainingId equals y.TrainingId
-                                 where x.TrainTypeId == item.TrainTypeId && y.PersonId == SitePersonId.ToString() && y.CheckResult == true
+                                 where x.TrainTypeId == item.TrainTypeId && y.PersonId == getSiteperson.PersonId
+                                 && x.ProjectId == getSiteperson.ProjectId
+                                 && y.CheckResult == true
                                  select y);
                         i += q.Count();
                     }