From 124a6ec046bc9ab2c72ce7f55ebaa2c39c30af67 Mon Sep 17 00:00:00 2001
From: yhw0507 <yhw0508@163.com>
Date: Tue, 27 Jun 2023 23:40:46 +0800
Subject: [PATCH] =?UTF-8?q?20230627=E4=BA=BA=E5=91=98=E6=A1=A3=E6=A1=88?=
 =?UTF-8?q?=E6=9C=AA=E5=8F=82=E5=8A=A0=E5=9F=B9=E8=AE=AD=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E6=A0=87=E8=AE=B0=E6=96=B9=E6=B3=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EduTrain/EduTrain_TrainRecordService.cs   | 41 +++++++++++++++++
 SGGL/FineUIPro.Mobile/FineUIPro.Mobile.csproj |  1 +
 .../HSSE/SitePerson/SendCard.aspx             |  2 +-
 .../HSSE/SitePerson/SendCard.aspx.cs          | 46 +------------------
 4 files changed, 45 insertions(+), 45 deletions(-)

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();
         }
+
+
+        /// <summary>
+        /// 获取培训结果
+        /// </summary>
+        /// <param name="WorkStage"></param>
+        /// <returns></returns>
+        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<Model.Base_TrainType> 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 @@
     </Compile>
     <Compile Include="PHTGL\BiddingManagement\BidDocumentsReviewDetail.aspx.cs">
       <DependentUpon>BidDocumentsReviewDetail.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="PHTGL\BiddingManagement\BidDocumentsReviewDetail.aspx.designer.cs">
       <DependentUpon>BidDocumentsReviewDetail.aspx</DependentUpon>
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 @@
                     </f:RenderField>
                     <f:TemplateField  ColumnID="tflTrainResult" Width="100px" HeaderText="培训结果" HeaderTextAlign="Center" TextAlign="Left">
                         <ItemTemplate>
-                            <asp:Label ID="lblTrainResult" runat="server" Text='<%# ConvertTrainResult(Eval("SitePersonId")) %>'></asp:Label>
+                            <asp:Label ID="lblTrainResult" runat="server" Text='<%# BLL.EduTrain_TrainRecordService.ConvertTrainResult(Eval("SitePersonId")) %>'></asp:Label>
                         </ItemTemplate>
                     </f:TemplateField>
                 </Columns>
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 获取培训结果
-        /// <summary>
-        /// 获取培训结果
-        /// </summary>
-        /// <param name="WorkStage"></param>
-        /// <returns></returns>
-        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<Model.Base_TrainType> 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 导出按钮
         /// 导出按钮