测试班级开课计划

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

@@ -145,9 +145,10 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             List<StuSelectLessonListEntity> TeachList = new List<StuSelectLessonListEntity>();
             for (int i = 0; i < entityList.Count; i++)
             {
-                var stuDataList = stuInfoBasicIBLL.GetAllList().Where(s => s.DeptNo == entityList[i].DeptNo
-                                 && s.MajorNo == entityList[i].MajorNo && s.F_SchoolId == entityList[i].F_SchoolId
-                                 && s.ClassNo == entityList[i].TeachClassNo
+                var stuDataList = stuInfoBasicIBLL.GetAllList().Where(s =>
+                                s.MajorNo == entityList[i].MajorNo 
+                                && s.F_SchoolId == entityList[i].F_SchoolId
+                                && s.ClassNo == entityList[i].TeachClassNo
                                  ).ToList();
                 if (stuDataList.Count > 0)
                 {
@@ -157,6 +158,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                         TeachEntity.StuNo = stuDataList[j].StuNo;
                         TeachEntity.MajorNo = entityList[i].MajorNo;
                         TeachEntity.ClassNo = stuDataList[j].ClassNo;
+                        TeachEntity.GenderNo = stuDataList[j].GenderNo == true ? "0" : "1";
                         TeachEntity.MajorDetailNo = entityList[i].MajorDetailNo;
                         TeachEntity.MajorDetailName = entityList[i].MajorDetailName;
                         TeachEntity.StuName = stuDataList[j].StuName;
@@ -178,7 +180,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                         TeachEntity.TotalStudyHour = 2;
                         TeachEntity.IsInEffect = "1";
                         TeachEntity.IsPitchOn = "1";
-                        TeachEntity.IsPitchOn = "1";
                         TeachEntity.F_SchoolId = entityList[i].F_SchoolId;
                         TeachEntity.CheckMark = "1";
                         TeachEntity.InsertTime = DateTime.Now;
@@ -206,8 +207,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                 for (int i = 0; i < entityList.Count; i++)
                 {
                     List<string> ssList = StuSelectLesson.GetAllList().Where(
-                                    y => y.DeptNo == entityList[i].DeptNo
-                                 && y.MajorNo == entityList[i].MajorNo
+                                    y =>  y.MajorNo == entityList[i].MajorNo
                                  && y.F_SchoolId == entityList[i].F_SchoolId
                                  && y.ClassNo == entityList[i].TeachClassNo
                                  && y.LessonNo == entityList[i].LessonNo
@@ -223,8 +223,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             List<StuSelectLessonListEntity> TeachList = new List<StuSelectLessonListEntity>();
             for (int i = 0; i < entityList.Count; i++)
             {
-                var stuDataList = stuInfoBasicIBLL.GetAllList().Where(s => s.DeptNo == entityList[i].DeptNo
-                                 && s.MajorNo == entityList[i].MajorNo && s.F_SchoolId == entityList[i].F_SchoolId
+                var stuDataList = stuInfoBasicIBLL.GetAllList().Where(s => 
+                                    s.MajorNo == entityList[i].MajorNo 
+                                  && s.F_SchoolId == entityList[i].F_SchoolId
                                  && s.ClassNo == entityList[i].TeachClassNo
                                  ).ToList();
                 if (stuDataList.Count > 0)
@@ -233,7 +234,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                     {
                         StuSelectLessonListEntity TeachEntity = new StuSelectLessonListEntity();
                         TeachEntity.StuNo = stuDataList[j].StuNo;
-                        TeachEntity.DeptNo = entityList[i].DeptNo;
                         TeachEntity.MajorNo = entityList[i].MajorNo;
                         TeachEntity.ClassNo = stuDataList[j].ClassNo;
                         TeachEntity.MajorDetailNo = entityList[i].MajorDetailNo;
@@ -258,7 +258,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                         TeachEntity.TotalStudyHour = 2;
                         TeachEntity.IsInEffect = "1";
                         TeachEntity.IsPitchOn = "1";
-                        TeachEntity.IsPitchOn = "1";
                         TeachEntity.F_SchoolId = entityList[i].F_SchoolId;
                         TeachEntity.InsertTime = DateTime.Now;
                         TeachList.Add(TeachEntity);

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/Index.js

@@ -188,7 +188,7 @@ var bootstrap = function ($, learun) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
                                 key: value,
-                                keyId: 'id',
+                                keyId: 'majorno',
                                 callback: function (_data) {
                                     callback(_data['majorname']);
                                 }
@@ -200,7 +200,7 @@ var bootstrap = function ($, learun) {
                         label: "课程", name: "LessonNo", width: 200, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ClassLessonPlan',
                                 key: value,
                                 keyId: 'lessonno',
                                 callback: function (_data) {
@@ -212,7 +212,19 @@ var bootstrap = function ($, learun) {
                     { label: "人数", name: "StuNum", width: 80, align: "left" },
                     { label: "上机课时", name: "PracticeHour", width: 80, align: "left" },
                     { label: "课程区别码", name: "PartCode", width: 80, align: "left" },
-                    { label: "班级", name: "TeachClassNo", width: 80, align: "left" },
+                    {
+                        label: "班级", name: "TeachClassNo", width: 110, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                key: value,
+                                keyId: 'classno',
+                                callback: function (_data) {
+                                    callback(_data['classname']);
+                                }
+                            });
+                        }
+                    },
                     {
                         label: "教师", name: "EmpNo", width: 80, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs

@@ -1083,15 +1083,15 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad
             try
             {
                 var strSql = new StringBuilder();
-                //strSql.Append("select distinct s.LessonNo as value,s.LessonName as text from stuscore s where s.LessonSortNo='1' ");
+                strSql.Append("select distinct s.LessonNo as value,s.LessonName as text from stuscore s where s.LessonSortNo='1' ");
                 //只显示“公开课”类型的课程
-                strSql.Append("select distinct s.LessonNo as value,l.LessonName as text from stuscore s  ");
-                strSql.Append(" left join LessonInfo l on s.LessonNo=l.LessonNo left join CdLessonType t on l.LessonTypeId=t.LTId ");
-                strSql.Append(" where s.LessonSortNo='1' and t.LessonTypeCode='OpenLesson' ");
-                if (userType == "教师")
-                {
-                    strSql.Append(" and s.EmpNo='" + userAccount + "' ");
-                }
+                //strSql.Append("select distinct s.LessonNo as value,l.LessonName as text from stuscore s  ");
+                //strSql.Append(" left join LessonInfo l on s.LessonNo=l.LessonNo left join CdLessonType t on l.LessonTypeId=t.LTId ");
+                //strSql.Append(" where s.LessonSortNo='1' and t.LessonTypeCode='OpenLesson' ");
+                //if (userType == "教师")
+                //{
+                //    strSql.Append(" and s.EmpNo='" + userAccount + "' ");
+                //}
                 var data = this.BaseRepository("CollegeMIS").FindList<WebHelper.YearGrade>(strSql.ToString());
                 data = data.Where(x => !string.IsNullOrEmpty(x.value)).OrderBy(x => x.value);
                 return data;

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonList/StuSelectLessonListService.cs

@@ -176,8 +176,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     stuLessonList.GenderNo = item.GenderNo;
                     stuLessonList.AcademicYearNo = item.AcademicYearNo;
                     stuLessonList.Semester = item.Semester;
-                    stuLessonList.OpenLessonDeptNo = item.OpenLessonDeptNo;
-                    stuLessonList.OpenLessonMajorNo = item.OpenLessonMajorNo;
+                    stuLessonList.OpenLessonDeptNo = "";
+                    stuLessonList.OpenLessonMajorNo = "";
                     stuLessonList.LessonNo = item.LessonNo;
                     stuLessonList.LessonName = item.LessonName;
                     stuLessonList.PartCode = item.PartCode;

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj

@@ -1826,6 +1826,7 @@
     <Analyzer Include="..\..\..\packages\Microsoft.DependencyValidation.Analyzers.0.10.0\analyzers\dotnet\cs\Microsoft.DependencyValidation.Analyzers.resources.dll" />
     <Analyzer Include="..\..\..\packages\Microsoft.DependencyValidation.Analyzers.0.10.0\analyzers\dotnet\Microsoft.DependencyValidation.Analyzers.dll" />
   </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
     <Folder Include="EducationalAdministration\ClassPlanTeach\" />
   </ItemGroup>