diff --git a/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainRecordService.cs b/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainRecordService.cs
index 03260c2c..cc7a3036 100644
--- a/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainRecordService.cs
+++ b/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainRecordService.cs
@@ -149,5 +149,46 @@ namespace BLL
{
return (from x in Funs.DB.EduTrain_TrainRecord where x.TrainStartDate < time && x.ProjectId == projectId select x).Count();
}
+
+
+ ///
+ /// 获取培训结果
+ ///
+ ///
+ ///
+ public static string ConvertTrainResult(object sitepersonId)
+ {
+ using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+ {
+ string result = string.Empty;
+ var getSiteperson = SitePerson_PersonService.GetSitePersonById(sitepersonId.ToString());
+ if (getSiteperson != null)
+ {
+ List trainTypeList = BLL.TrainTypeService.GetIsAboutSendCardTrainTypeList();
+ int i = 0; //培训合格次数
+ foreach (var item in trainTypeList)
+ {
+ 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 == getSiteperson.PersonId
+ && x.ProjectId == getSiteperson.ProjectId
+ && y.CheckResult == true
+ select y);
+ i += q.Count();
+ }
+
+ if (i >= trainTypeList.Count)
+ {
+ result = "通过";
+ }
+ else
+ {
+ result = "未通过";
+ }
+ }
+ return result;
+ }
+ }
}
}
diff --git a/SGGL/FineUIPro.Mobile/FineUIPro.Mobile.csproj b/SGGL/FineUIPro.Mobile/FineUIPro.Mobile.csproj
index af590214..cf24d76b 100644
--- a/SGGL/FineUIPro.Mobile/FineUIPro.Mobile.csproj
+++ b/SGGL/FineUIPro.Mobile/FineUIPro.Mobile.csproj
@@ -3365,6 +3365,7 @@
BidDocumentsReviewDetail.aspx
+ ASPXCodeBehind
BidDocumentsReviewDetail.aspx
diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/SendCard.aspx b/SGGL/FineUIPro.Web/HSSE/SitePerson/SendCard.aspx
index 7f81542b..d835d95c 100644
--- a/SGGL/FineUIPro.Web/HSSE/SitePerson/SendCard.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/SendCard.aspx
@@ -76,7 +76,7 @@
-
+
diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/SendCard.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/SendCard.aspx.cs
index 12f5468d..14e0fef3 100644
--- a/SGGL/FineUIPro.Web/HSSE/SitePerson/SendCard.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/SendCard.aspx.cs
@@ -190,7 +190,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
}
else
{
- if (ConvertTrainResult(person.PersonId) == "通过")
+ if (EduTrain_TrainRecordService.ConvertTrainResult(person.PersonId) == "通过")
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ReadWriteCard.aspx?PersonId={0}", this.SitePersonId, "发卡 - ")));
}
@@ -225,49 +225,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
}
}
}
- #endregion
-
- #region 获取培训结果
- ///
- /// 获取培训结果
- ///
- ///
- ///
- protected string ConvertTrainResult(object sitepersonId)
- {
- using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
- {
- string result = string.Empty;
- var getSiteperson = SitePerson_PersonService.GetSitePersonById(sitepersonId.ToString());
- if (getSiteperson != null)
- {
- List trainTypeList = BLL.TrainTypeService.GetIsAboutSendCardTrainTypeList();
- int i = 0; //培训合格次数
- foreach (var item in trainTypeList)
- {
- 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 == getSiteperson.PersonId
- && x.ProjectId == getSiteperson.ProjectId
- && y.CheckResult == true
- select y);
- i += q.Count();
- }
-
- if (i >= trainTypeList.Count)
- {
- result = "通过";
- }
- else
- {
- result = "未通过";
- }
- }
- return result;
- }
- }
- #endregion
+ #endregion
#region 导出按钮
/// 导出按钮