Merge branch '塔里木分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支

Learun.Framework.Ultimate V7/Doc文档/数字化智慧校园基础信息接口V1.0.docx

@@ -426,7 +426,7 @@ LessonTime
 根据身份证号更新照片接口
 标准http post请求
 地址：
-http://部署地址/Learun/adms/EducationalAdministration/EmpRegister/updatePhotoByIdCard
+http://部署地址/EducationalAdministration/EmpRegister/updatePhotoByIdCard
 所需参数：（限制一次最多传值50条）
 
 参数名称

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

@@ -22,7 +22,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         private TeachClassIBLL teachClassIBLL = new TeachClassBLL();
         private StuSelectLessonListIBLL StuSelectLesson = new StuSelectLessonListBLL();
         private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL();
-
+        private StuScoreIBLL stuScoreIBLL = new StuScoreBLL();
         #region 视图功能
 
         /// <summary>
@@ -70,6 +70,14 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             Pagination paginationobj = pagination.ToObject<Pagination>();
             var data = teachClassIBLL.GetPageList(paginationobj, queryJson);
+            var studata = stuInfoBasicIBLL.GetAllList();
+            foreach (var item in data)
+            {
+                item.StuNum = studata.Where(o =>
+                    o.DeptNo == item.DeptNo && o.MajorNo == item.MajorNo
+                                            && o.ClassNo == item.TeachClassNo && o.Grade == item.Grade
+                ).Count();
+            }
             var jsonData = new
             {
                 rows = data,
@@ -199,80 +207,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         }
         public ActionResult QzSetTeach(string keyValue, string EmpNo)
         {
-            var entityList = teachClassIBLL.GetTeachListById(keyValue);
-            string Nid = "";
-            if (entityList.Count > 0)
+            var entityList = teachClassIBLL.GetTeachListById(keyValue).ToList();
+            foreach (var item in entityList)
             {
-                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.F_SchoolId == entityList[i].F_SchoolId
-                                 && y.ClassNo == entityList[i].TeachClassNo
-                                 && y.LessonNo == entityList[i].LessonNo
-                                 && y.CheckMark == "1"
-                                ).Select(x => x.SelectId.ToString()).ToList();
-                    Nid += string.Join(",", ssList) + ",";
-                }
+                teachClassIBLL.UpEmpNos(item.AcademicYearNo, item.Semester, item.TeachClassNo, item.LessonNo, EmpNo, item.EmpNo,item.Grade);
+                stuScoreIBLL.UpEmpNos(item.AcademicYearNo, item.Semester, item.TeachClassNo, item.LessonNo, EmpNo, item.EmpNo, item.Grade);
             }
 
-            Nid = Nid.TrimEnd(',');
-            StuSelectLesson.DeleteEntity(Nid);
-
-            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
-                                 ).ToList();
-                if (stuDataList.Count > 0)
-                {
-                    for (int j = 0; j < stuDataList.Count; j++)
-                    {
-                        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;
-                        TeachEntity.MajorDetailName = entityList[i].MajorDetailName;
-                        TeachEntity.StuName = stuDataList[j].StuName;
-                        TeachEntity.GenderNo = stuDataList[j].GenderNo == true ? "0" : "1";
-                        TeachEntity.AcademicYearNo = entityList[i].AcademicYearNo;
-                        TeachEntity.Semester = entityList[i].Semester;
-                        TeachEntity.OpenLessonDeptNo = entityList[i].DeptNo;
-                        TeachEntity.OpenLessonMajorNo = entityList[i].MajorNo;
-                        TeachEntity.LessonNo = entityList[i].LessonNo;
-                        TeachEntity.PartCode = entityList[i].PartCode;
-                        TeachEntity.OrdinaryScoreScale = 0;
-                        TeachEntity.TermInScoreScale = 0;
-                        TeachEntity.TermEndScoreScale = 0;
-                        TeachEntity.OtherScoreScale = 0;
-                        TeachEntity.TeachClassNo = entityList[i].TeachClassNo;
-                        TeachEntity.LessonSortNo = entityList[i].LessonSortNo;
-                        TeachEntity.StuSortNo = entityList[i].LessonSortNo;
-                        TeachEntity.Grade = entityList[i].Grade;
-                        TeachEntity.StudyScore = 2;
-                        TeachEntity.TotalStudyHour = 2;
-                        TeachEntity.IsInEffect = "1";
-                        TeachEntity.IsPitchOn = "1";
-                        TeachEntity.F_SchoolId = entityList[i].F_SchoolId;
-                        TeachEntity.InsertTime = DateTime.Now;
-                        TeachList.Add(TeachEntity);
-                    }
-                }
-                else
-                {
-                    return Fail("设置失败,未发现相关学生!");
-                }
+                teachClassIBLL.UpEmpNo(keyValue, EmpNo); //更改当前教师
             }
-
-            StuSelectLesson.SaveEntityList(TeachList);
-
-            teachClassIBLL.UpEmpNo(keyValue, EmpNo); //更改当前教师
-
             return Success("设置成功!");
         }
         #endregion

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

@@ -185,12 +185,12 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "专业", name: "MajorNo", width: 100, align: "left",
+                        label: "专业", name: "MajorNo", width: 200, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
                                 key: value,
-                                keyId: 'id',
+                                keyId: 'majorno',
                                 callback: function (_data) {
                                     callback(_data['majorname']);
                                 }
@@ -198,8 +198,9 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "年级", name: "Grade", width: 50, align: "left" },
+                    { label: "课程编码", name: "LessonNo", width: 200, align: "left" },
                     {
-                        label: "课程", name: "LessonNo", width: 200, align: "left",
+                        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',
@@ -213,9 +214,20 @@ 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: "TeachClassName", width: 80, align: "left" },
+                    {
+                        label: "班级名称", name: "TeachClassNo", width: 80, 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/StuScoreBLL.cs

@@ -334,6 +334,29 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void UpEmpNos(string xn, string xq, string classNo, string LessonNo, string EmpNo, string HisEmpNo,string Grade)
+        {
+            try
+            {
+                stuScoreService.UpEmpNos(xn, xq, classNo, LessonNo, EmpNo, HisEmpNo,Grade);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
 
         /// <summary>
         /// 获取一次补考名单数据

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

@@ -195,6 +195,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns>
         IEnumerable<StuScoreEntity> GetAllScoreListByStuNo(string stuNo);
         object GetScoreCharts(string academicYearNo, string semester, string classNo, string lessonNo);
+        void UpEmpNos(string xn, string xq, string classNo, string LessonNo, string EmpNo, string HisEmpNo, string Grade);
 
 
         /// <summary>

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

@@ -493,6 +493,31 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void UpEmpNos(string xn, string xq, string classNo, string LessonNo, string EmpNo, string hisempno, string Grade)
+        {
+            try
+            {
+                StringBuilder sb = new StringBuilder();
+                sb.Append(" update StuScore set EmpNo ='" + EmpNo + "' where classno = '" + classNo + "' and Semester ='" + xq + "' and  AcademicYearNo ='" + xn + "' and LessonNo ='" + LessonNo + "' and empno = '" + hisempno + "' and Grade='" + Grade + "' ");
+                this.BaseRepository("CollegeMIS").ExecuteBySql(sb.ToString());
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         #endregion
         private static HttpClient Client;
 
@@ -1929,17 +1954,17 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad
                 strSql.Append(" left join ClassInfo ci on bb.ClassNo= ci.ClassNo and ci.CheckMark='1' ");
 
                 var result = this.BaseRepository("CollegeMIS").FindList<StuScoreEntity>(strSql.ToString(), dp);
-                
+
                 //计算专业排名，班级排名
                 if (result.Any())
                 {
-                    var temp = result.GroupBy(x=>new { x.AcademicYearNo,x.Semester}).Select(x => new StuScoreEntity()
+                    var temp = result.GroupBy(x => new { x.AcademicYearNo, x.Semester }).Select(x => new StuScoreEntity()
                     {
-                        AcademicYearNo=x.Key.AcademicYearNo,
-                        Semester=x.Key.Semester,
-                        StuNo=x.FirstOrDefault().StuNo,
-                        ClassNo=x.FirstOrDefault().ClassNo,
-                        MajorNo=x.FirstOrDefault().MajorNo
+                        AcademicYearNo = x.Key.AcademicYearNo,
+                        Semester = x.Key.Semester,
+                        StuNo = x.FirstOrDefault().StuNo,
+                        ClassNo = x.FirstOrDefault().ClassNo,
+                        MajorNo = x.FirstOrDefault().MajorNo
                     }).ToList();
                     if (temp.Any())
                     {
@@ -1976,7 +2001,7 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad
                         ii.RankInMajor = temp.FirstOrDefault(x => x.AcademicYearNo == ii.AcademicYearNo && x.Semester == ii.Semester).RankInMajor;
                         ii.RankInClass = temp.FirstOrDefault(x => x.AcademicYearNo == ii.AcademicYearNo && x.Semester == ii.Semester).RankInClass;
                     }
-                
+
                 }
 
                 return result;

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassBLL.cs

@@ -203,6 +203,29 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void UpEmpNos(string xn, string xq, string classNo, string LessonNo, string EmpNo, string HisEmpNo,string Grade)
+        {
+            try
+            {
+                teachClassEntity.UpEmpNos(xn, xq, classNo, LessonNo, EmpNo, HisEmpNo, Grade);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         /// <summary>
         /// 保存实体数据（新增、修改）
         /// <param name="keyValue">主键</param>
@@ -226,7 +249,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
-
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassIBLL.cs

@@ -44,7 +44,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns>
         void SaveEntity(string keyValue, TeachClassEntity entity);
 
-
+        void UpEmpNos(string xn,string xq,string classNo,string LessonNo,string EmpNo,string HisEmpNo,string Grade); 
         #endregion
 
         #region 扩展数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassService.cs

@@ -209,7 +209,31 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
-
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void UpEmpNos(string xn, string xq, string classNo, string LessonNo, string EmpNo, string hisempno, string Grade)
+        {
+            try
+            {
+                StringBuilder sb = new StringBuilder();
+                sb.Append(" update StuSelectLessonList set EmpNo ='" + EmpNo + "' where classno = '" + classNo + "' and Semester ='" + xq + "' and  AcademicYearNo ='" + xn + "' and LessonNo ='" + LessonNo + "' and empno = '" + hisempno + "' and Grade = '" + Grade + "'");
+                this.BaseRepository("CollegeMIS").ExecuteBySql(sb.ToString());
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
 
         #endregion