From f1255d9404e48a8eff209ff1f5abff59ad0c4183 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Thu, 30 Jun 2022 15:27:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=94=9F=E6=8A=A5=E5=90=8D=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/StuEnrollController.cs        | 12 +---
 .../StuEnroll/StuEnrollBLL.cs                 | 23 ++++++++
 .../StuEnroll/StuEnrollIBLL.cs                |  1 +
 .../StuEnroll/StuEnrollService.cs             | 58 +++++++++++++++++++
 4 files changed, 83 insertions(+), 11 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs
index 4991cb6c5..84edf0c21 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs	
@@ -967,17 +967,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             stuEnrollIBLL.Admission(keyValue, IsAdmission);
             return Success("保存成功");
         }
-
-        /// <summary>
-        /// 新生成绩初始化
-        /// </summary>
-        /// <returns></returns>
-        public ActionResult EnrollScoreAdd()
-        {
-            stuEnrollIBLL.EnrollScoreAdd();
-            return Success("保存成功");
-        }
-
+        
         #endregion
 
     }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollBLL.cs
index 9773c9c63..5472aa65a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollBLL.cs	
@@ -105,6 +105,29 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary> 
+        /// 获取页面显示列表数据 
+        /// <summary> 
+        /// <param name="queryJson">查询参数</param> 
+        /// <returns></returns> 
+        public IEnumerable<StuEnrollEntity> GetList(string queryJson)
+        {
+            try
+            {
+                return stuEnrollService.GetList(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         /// <summary>
         /// 获取页面显示列表数据
         /// <summary>
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollIBLL.cs
index 41470ab2b..873057513 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollIBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollIBLL.cs	
@@ -23,6 +23,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns>
         IEnumerable<StuEnrollEntity> GetPageList(Pagination pagination, string queryJson);
         DataTable GetTJList(string queryJson);
+        IEnumerable<StuEnrollEntity> GetList(string queryJson);
         IEnumerable<StuEnrollEntity> AllStudent();
         IEnumerable<Acc_DormitoryBuildEntity> GetDormitorys(Pagination pagination, string queryJson);
 
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs
index 83b370358..f7f0dd85a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs	
@@ -2027,6 +2027,64 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
+
+        /// <summary> 
+        /// 获取页面显示列表数据 
+        /// <summary> 
+        /// <param name="queryJson">查询参数</param> 
+        /// <returns></returns> 
+        public IEnumerable<StuEnrollEntity> GetList(string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@" 
+                t.StuId, 
+                t.StuName, 
+                t.Gender, 
+                t.Nationals, 
+                t.HomeAddress, 
+                t.IDCard, 
+                t.StuMobile, 
+                t.FromSchool, 
+                t.MidTermExam, 
+                t.Specialty, 
+                t.City, 
+                t.County, 
+                t.MajorNo, 
+                t.IdCardPto1, 
+                t.IdCardPto2, 
+                t.MidDiplomaPto, 
+                t.MidAchievementPto, 
+                t.Remark 
+                ");
+                strSql.Append("  FROM StuEnroll t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数 
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["StuName"].IsEmpty())
+                {
+                    dp.Add("StuName", "%" + queryParam["StuName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.StuName Like @StuName ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<StuEnrollEntity>(strSql.ToString(), dp);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+
         #endregion 获取数据
 
         #region 提交数据