学子在线--学生选课 专业选修课根据学生选课次数表判断选课上限

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/OpenLessonPlanOfElectiveController.cs

@@ -27,6 +27,8 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         private StuSelectLessonListOfElectivePreIBLL stuSelectLessonListOfElectivePreIBLL = new StuSelectLessonListOfElectivePreBLL();
         private OpenLessonPlanOfElectiveChangeIBLL openLessonPlanOfElectiveChangeIBLL = new OpenLessonPlanOfElectiveChangeBLL();
         private DataSourceIBLL dataSourceIBLL = new DataSourceBLL();
+        private OLPElectiveStuSelectCountIBLL oLPElectiveStuSelectCountIBLL = new OLPElectiveStuSelectCountBLL();
+        private LessonInfoIBLL lessonInfoIBLL = new LessonInfoBLL();
 
         #region  视图功能
 
@@ -752,7 +754,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                     //相同时间不能报名
                     return Success("本学期此时间段已有报名的选修课！");
                 }
-
+                //专业选修课根据学生选课次数表判断选课上限
+                var lesson = lessonInfoIBLL.GetLessonInfoAndTypeByLessonNo(olpeEntity.LessonNo);
+                if (lesson.LessonTypeCode.Contains("Professional"))
+                {
+                    var oLPElectiveStuSelectCount = oLPElectiveStuSelectCountIBLL.GetOLPElectiveStuSelectCountEntity(olpeEntity.AcademicYearNo, olpeEntity.Semester, loginUserInfo.departmentId);
+                    if (sslleListOfNow1.Count() > oLPElectiveStuSelectCount.SelectMaxCount)
+                    {
+                        return Fail("本系部最多选择" + oLPElectiveStuSelectCount.SelectMaxCount + "门专业选修课！");
+                    }
+                }
             }
 
             return Fail("正在提交，请等待！");
@@ -873,6 +884,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                     }
                 }
             }
+
+            //专业选修课根据学生选课次数表判断选课上限
+            var lesson = lessonInfoIBLL.GetLessonInfoAndTypeByLessonNo(olpeEntity.LessonNo);
+            if (lesson.LessonTypeCode.Contains("Professional"))
+            {
+                var oLPElectiveStuSelectCount = oLPElectiveStuSelectCountIBLL.GetOLPElectiveStuSelectCountEntity(olpeEntity.AcademicYearNo, olpeEntity.Semester, loginUserInfo.departmentId);
+                if (sslleListOfNow1.Count() > oLPElectiveStuSelectCount.SelectMaxCount)
+                {
+                    return Fail("本系部最多选择" + oLPElectiveStuSelectCount.SelectMaxCount + "门专业选修课！");
+                }
+            }
             if (sslleListOfNow2.Count() > 0)
             {
                 foreach (var item in sslleListOfNow2)

Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config

@@ -143,7 +143,7 @@
 	<add key="dbbackuppath" value="D:\数字化校园\lr7test\Publish\Resource\DataBaseBackup"/>
 
 	<!-- 报名选修课排队需要调用的WebApi -->
-	<add key="WebApi" value="http://localhost:8081/" />
+	<add key="WebApi" value="http://localhost:31173/" />
 	<!-- 报名选修课的最大课程数 -->
 	<add key="ElectiveLessonApplyMax" value="2" />
 	<!-- 河南对接登录 -->

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/OpenLessonPlanOfElectiveStudentApi.cs

@@ -22,6 +22,8 @@ namespace Learun.Application.WebApi
         private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL();
         LessonInfoIBLL lessonInfoIbll = new LessonInfoBLL();
         EmpInfoIBLL empInfoIbll = new EmpInfoBLL();
+        private OLPElectiveStuSelectCountIBLL oLPElectiveStuSelectCountIBLL = new OLPElectiveStuSelectCountBLL();
+        private LessonInfoIBLL lessonInfoIBLL = new LessonInfoBLL();
 
         /// <summary> 
         /// 注册接口 
@@ -123,6 +125,17 @@ namespace Learun.Application.WebApi
                     //相同时间不能报名
                     return Success("本学期此时间段已有报名的选修课！");
                 }
+
+                //专业选修课根据学生选课次数表判断选课上限
+                var lesson = lessonInfoIBLL.GetLessonInfoAndTypeByLessonNo(olpeEntity.LessonNo);
+                if (lesson.LessonTypeCode.Contains("Professional"))
+                {
+                    var oLPElectiveStuSelectCount = oLPElectiveStuSelectCountIBLL.GetOLPElectiveStuSelectCountEntity(olpeEntity.AcademicYearNo, olpeEntity.Semester, stuInfoBasicEntity.DeptNo);
+                    if (sslleListOfNow1.Count() > oLPElectiveStuSelectCount.SelectMaxCount)
+                    {
+                        return Fail("本系部最多选择" + oLPElectiveStuSelectCount.SelectMaxCount + "门专业选修课！");
+                    }
+                }
             }
 
             return Fail("正在提交，请等待！");
@@ -381,6 +394,17 @@ namespace Learun.Application.WebApi
                     }
                 }
             }
+
+            //专业选修课根据学生选课次数表判断选课上限
+            var lesson = lessonInfoIBLL.GetLessonInfoAndTypeByLessonNo(olpeEntity.LessonNo);
+            if (lesson.LessonTypeCode.Contains("Professional"))
+            {
+                var oLPElectiveStuSelectCount = oLPElectiveStuSelectCountIBLL.GetOLPElectiveStuSelectCountEntity(olpeEntity.AcademicYearNo, olpeEntity.Semester, stuInfoBasicEntity.DeptNo);
+                if (sslleListOfNow1.Count() > oLPElectiveStuSelectCount.SelectMaxCount)
+                {
+                    return Fail("本系部最多选择" + oLPElectiveStuSelectCount.SelectMaxCount + "门专业选修课！");
+                }
+            }
             if (sslleListOfNow2.Count() > 0)
             {
                 foreach (var item in sslleListOfNow2)

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoBLL.cs

@@ -108,6 +108,25 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
+        public LessonInfoEntity GetLessonInfoAndTypeByLessonNo(string lessonNo)
+        {
+            try
+            {
+                return lessonInfoService.GetLessonInfoAndTypeByLessonNo(lessonNo);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         public bool GetAny()
         {
             try

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoEntity.cs

@@ -191,6 +191,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         #region  扩展字段
         [NotMapped]
         public string LessonTypeName { get; set; }
+        [NotMapped]
+        public string LessonTypeCode { get; set; }
 
         #endregion
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoIBLL.cs

@@ -35,6 +35,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <summary>
         /// <returns></returns>
         LessonInfoEntity GetLessonInfoEntityByLessonNo(string lessonNo);
+
+        LessonInfoEntity GetLessonInfoAndTypeByLessonNo(string lessonNo);
         bool GetAny();
         #endregion
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs

@@ -168,6 +168,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary>
+        /// 获取LessonInfo表实体数据和课程类型
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public LessonInfoEntity GetLessonInfoAndTypeByLessonNo(string lessonNo)
+        {
+            try
+            {
+                string sql = $"select a.*,b.LessonTypeCode from LessonInfo a join CdLessonType b  on a.LessonTypeId=b.LTId where a.LessonNo='{lessonNo}'";
+                return this.BaseRepository("CollegeMIS").FindList<LessonInfoEntity>(sql).FirstOrDefault();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         #endregion
 
         #region  提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs

@@ -206,6 +206,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 strSql.Append(" ) ");
                 strSql.Append(" and a.MajorId is not null and a.Grade is not null ");
                 strSql.Append(" AND b.AcademicYearNo='" + EADateArrangeEntityAboutElective?.AcademicYearNo + "' and b.Semester='" + EADateArrangeEntityAboutElective?.Semester + "' ");
+                //学生选课显示‘是否可选’为‘是’的课程信息
+                strSql.Append("   and b.IsAllowSelect=1 ");
                 if (!queryParam["StuMajorNo"].IsEmpty())
                 {
                     dp.Add("StuMajorNo", queryParam["StuMajorNo"].ToString(), DbType.String);