【修改】表、实体删除系；

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

@@ -364,7 +364,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                 OLPEId = olpeEntity.Id,
                 NoticeBookNo = stuInfoBasicEntity.NoticeNo,
                 StuNo = stuInfoBasicEntity.StuNo,
-                DeptNo = stuInfoBasicEntity.DeptNo,
                 MajorNo = stuInfoBasicEntity.MajorNo,
                 ClassNo = stuInfoBasicEntity.ClassNo,
                 MajorDetailNo = stuInfoBasicEntity.MajorDetailNo,
@@ -653,7 +652,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                 OLPEId = olpeEntity.Id,
                 NoticeBookNo = stuInfoBasicEntity.NoticeNo,
                 StuNo = stuInfoBasicEntity.StuNo,
-                DeptNo = stuInfoBasicEntity.DeptNo,
                 MajorNo = stuInfoBasicEntity.MajorNo,
                 ClassNo = stuInfoBasicEntity.ClassNo,
                 MajorDetailNo = stuInfoBasicEntity.MajorDetailNo,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuCancelExam/Form.cshtml

@@ -19,10 +19,6 @@
         <div class="lr-form-item-title">姓名</div>
         <input id="StuName" type="text" class="form-control"  />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="StuCancelExam" >
-        <div class="lr-form-item-title">系部</div>
-        <input id="DeptNo" type="text" class="form-control"  />
-    </div>
     <div class="col-xs-12 lr-form-item"  data-table="StuCancelExam" >
         <div class="lr-form-item-title">专业</div>
         <input id="MajorNo" type="text" class="form-control"  />

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

@@ -73,19 +73,6 @@ var bootstrap = function ($, learun) {
                     { label: "学期", name: "Semester", width: 100, align: "left" },
                     { label: "学号", name: "StuNo", width: 100, align: "left" },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
-                    {
-                        label: "系部", name: "DeptNo", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
-                                key: value,
-                                keyId: 'deptno',
-                                callback: function (_data) {
-                                    callback(_data['deptname']);
-                                }
-                            });
-                        }
-                    },
                     {
                         label: "专业", name: "MajorNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {

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

@@ -200,7 +200,6 @@ namespace Learun.Application.WebApi.Modules
             {
                 m.AcademicYearNo,
                 m.Semester,
-                m.DeptNo,
                 m.MajorNo,
                 m.LessonNo,
                 m.TeachClassNo,

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

@@ -400,7 +400,6 @@ namespace Learun.Application.WebApi
                 OLPEId = olpeEntity.Id,
                 NoticeBookNo = stuInfoBasicEntity.NoticeNo,
                 StuNo = stuInfoBasicEntity.StuNo,
-                DeptNo = stuInfoBasicEntity.DeptNo,
                 MajorNo = stuInfoBasicEntity.MajorNo,
                 ClassNo = stuInfoBasicEntity.ClassNo,
                 MajorDetailNo = stuInfoBasicEntity.MajorDetailNo,

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/EpidemicSituationCopyApi.cs

@@ -15,7 +15,6 @@ namespace Learun.Application.WebApi
     public class EpidemicSituationCopyApi : BaseApi
     {
         private EpidemicSituationIBLL epidemicSituationIBLL = new EpidemicSituationBLL();
-        private CdDeptIBLL cdDeptIbll = new CdDeptBLL();
         private CdMajorIBLL cdMajorIbll = new CdMajorBLL();
         private ClassInfoIBLL classInfoIbll = new ClassInfoBLL();
         private StuInfoBasicIBLL stuInfoBasicIbll = new StuInfoBasicBLL();
@@ -45,10 +44,9 @@ namespace Learun.Application.WebApi
             var stuEntity = stuInfoBasicIbll.GetStuInfoBasicEntityByStuNo(keyValue);
             if (stuEntity != null)
             {
-                var detptName = cdDeptIbll.GetCdDeptEntityByNo(stuEntity.DeptNo)?.DeptName;
                 var majorName = cdMajorIbll.GetCdMajorEntityByMajorNo(stuEntity.MajorNo)?.MajorName;
                 var className = classInfoIbll.GetClassInfoEntityByClassNo(stuEntity.ClassNo)?.ClassName;
-                res = $"{detptName} {majorName} {className}";
+                res = $"{majorName} {className}";
             }
 
             return Success(new { res, Address = stuEntity?.MailAddress });

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

@@ -87,7 +87,6 @@ namespace Learun.Application.WebApi
             var stuInfo = stuInfoBasicIBLL.GetStuInfoBasicEntityByStuNo(userInfo.account);
             StuAttendanceLeaveEntity entity = new StuAttendanceLeaveEntity();
             entity.ClassNo = stuInfo.ClassNo;
-            entity.DeptNo = stuInfo.DeptNo;
             entity.Grade = stuInfo.Grade;
             entity.MajorNo = stuInfo.MajorNo;
             entity.StuNo = userInfo.account;
@@ -143,8 +142,6 @@ namespace Learun.Application.WebApi
                     stuAttendanceEntity.AcademicYearNo = entity.AcademicYearNo;
                     stuAttendanceEntity.ClassName = entity.ClassName;
                     stuAttendanceEntity.ClassNo = entity.ClassNo;
-                    stuAttendanceEntity.DeptName = entity.DeptName;
-                    stuAttendanceEntity.DeptNo = entity.DeptNo;
                     stuAttendanceEntity.EmpNo = entity.EmpNo;
                     stuAttendanceEntity.Grade = entity.Grade;
                     stuAttendanceEntity.InertDate = DateTime.Now;

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermEntity.cs

@@ -39,12 +39,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("SEMESTER")]
         public string Semester { get; set; }
         /// <summary>
-        /// 系所码
-        /// </summary>
-        /// <returns></returns>
-        [Column("DEPTNO")]
-        public string DeptNo { get; set; }
-        /// <summary>
         /// 专业码
         /// </summary>
         /// <returns></returns>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CdMajor/CdMajorEntity.cs

@@ -43,11 +43,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("F_SCHOOLID")]
         public string F_SchoolId { get; set; }
         /// <summary>
-        /// 系所代码
-        /// </summary>
-        [Column("DEPTNO")]
-        public string DeptNo { get; set; }
-        /// <summary>
         /// 教委专业代码
         /// </summary>
         [Column("GOVMAJORNO")]

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassInfo/ClassInfoEntity.cs

@@ -30,11 +30,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("CLASSNAME")]
         public string ClassName { get; set; }
         /// <summary>
-        /// 系所码
-        /// </summary>
-        [Column("DEPTNO")]
-        public string DeptNo { get; set; }
-        /// <summary>
         /// 专业码
         /// </summary>
         [Column("MAJORNO")]

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs

@@ -58,11 +58,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("POSITIONLEVEL")]
         public string PositionLevel { get; set; }
         /// <summary>
-        /// 系所
-        /// </summary>
-        [Column("DEPTNO")]
-        public string DeptNo { get; set; }
-        /// <summary>
         /// 所在教研室(二级科室）
         /// </summary>
         [Column("STAFFROOMNO")]

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

@@ -85,11 +85,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("TEACHOUTLINE")]
         public string TeachOutline { get; set; }
         /// <summary>
-        /// 负责开课院系代码
-        /// </summary>
-        [Column("TEACHDEPTNO")]
-        public string TeachDeptNo { get; set; }
-        /// <summary>
         /// 负责开课专业代码
         /// </summary>
         [Column("TEACHMAJORNO")]

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/R_EnterBuilding/R_EnterBuildingService.cs

@@ -67,7 +67,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
 
                 var stuInfo = this.BaseRepository("CollegeMIS").FindList<StuInfoBasicEntity>();
-                var data=this.BaseRepository("CollegeMIS").FindList<R_EnterBuildingEntity>(expression, pagination).Join(stuInfo,a=>a.SId,b=>b.StuNo,(a,b)=>new {a,b}).Select(a=>new{a.a.BId,a.a.SId,a.a.EnterTime,a.b.MajorNo,a.b.ClassNo}).ToList().ConvertAll(a=>(object)a);
+                var data = this.BaseRepository("CollegeMIS").FindList<R_EnterBuildingEntity>(expression, pagination).Join(stuInfo, a => a.SId, b => b.StuNo, (a, b) => new { a, b }).Select(a => new { a.a.BId, a.a.SId, a.a.EnterTime, a.b.MajorNo, a.b.ClassNo }).ToList().ConvertAll(a => (object)a);
                 return data;
 
             }
@@ -169,12 +169,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             {
 
                 var queryParam = queryJson.ToJObject();
-                var express = LinqExtensions.True<CdDeptEntity>();
-                if (!queryParam["DeptNo"].IsEmpty())
-                {
-                    var deptNo = queryParam["DeptNo"].ToString();
-                    express = express.And(a => a.DeptNo == deptNo);
-                }
 
                 var esExpress = LinqExtensions.True<R_EnterBuildingEntity>();
                 // 添加时间
@@ -186,20 +180,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
 
                 List<object> list = new List<object>();
-                var deptList = this.BaseRepository("CollegeMIS").FindList<CdDeptEntity>(express);
-                var stuData = this.BaseRepository("CollegeMIS").FindList<StuInfoBasicEntity>();
-                foreach (var deptEntity in deptList)
-                {
-                    var StuIDList = stuData.Where(a => a.DeptNo == deptEntity.DeptNo).Select(a => a.StuNo).ToList();
-                    var StuGroup = this.BaseRepository("CollegeMIS")
-                        .FindList<R_EnterBuildingEntity>(esExpress).Where(a => StuIDList.Contains(a.SId)).GroupBy(a => a.SId);
-                    var StuEnterList = StuGroup.Select(a => a.Key).ToList();
-                    var NormalNum = stuData.Where(a => StuEnterList.Contains(a.StuNo))
-                        .Count(a => a.HealthStatus != "1" && a.HealthStatus != "2");
-                    var AbnormalNum = stuData.Where(a => StuEnterList.Contains(a.StuNo)).Count(a => a.HealthStatus == "1" || a.HealthStatus == "2");
 
-                    list.Add(new { DeptNo = deptEntity.DeptNo, Num = StuGroup.Count(), Normal = NormalNum, Abnormal = AbnormalNum });
-                }
+                list.Add(new { DeptNo = "", Num = 0, Normal = 0, Abnormal = 0 });
 
                 return list;
             }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/R_EnterSchool/R_EnterSchoolService.cs

@@ -66,7 +66,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
 
                 var stuInfo = this.BaseRepository("CollegeMIS").FindList<StuInfoBasicEntity>();
-                var data=this.BaseRepository("CollegeMIS").FindList<R_EnterSchoolEntity>(expression, pagination).Join(stuInfo,a=>a.SId,b=>b.StuNo,(a,b)=>new {a,b}).Select(a=>new{a.a.UId,a.a.SId,a.a.EnterTime,a.b.MajorNo,a.b.ClassNo}).ToList().ConvertAll(a=>(object)a);
+                var data = this.BaseRepository("CollegeMIS").FindList<R_EnterSchoolEntity>(expression, pagination).Join(stuInfo, a => a.SId, b => b.StuNo, (a, b) => new { a, b }).Select(a => new { a.a.UId, a.a.SId, a.a.EnterTime, a.b.MajorNo, a.b.ClassNo }).ToList().ConvertAll(a => (object)a);
 
                 return data;
             }
@@ -163,14 +163,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             try
             {
-
                 var queryParam = queryJson.ToJObject();
-                var express = LinqExtensions.True<CdDeptEntity>();
-                if (!queryParam["DeptNo"].IsEmpty())
-                {
-                    var deptNo = queryParam["DeptNo"].ToString();
-                    express = express.And(a => a.DeptNo == deptNo);
-                }
 
                 var esExpress = LinqExtensions.True<R_EnterSchoolEntity>();
                 // 添加时间
@@ -181,20 +174,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     esExpress = esExpress.And(t => t.EnterTime >= startTime && t.EnterTime <= endTime);
                 }
                 List<object> list = new List<object>();
-                var deptList = this.BaseRepository("CollegeMIS").FindList<CdDeptEntity>(express);
                 var stuData = this.BaseRepository("CollegeMIS").FindList<StuInfoBasicEntity>();
-                foreach (var deptEntity in deptList)
-                {
-                    var StuIDList = stuData.Where(a => a.DeptNo == deptEntity.DeptNo).Select(a => a.StuNo).ToList();
-                    var StuGroup = this.BaseRepository("CollegeMIS")
-                        .FindList<R_EnterSchoolEntity>(esExpress).Where(a => StuIDList.Contains(a.SId)).GroupBy(a => a.SId);
-                    var StuEnterList = StuGroup.Select(a => a.Key).ToList();
-                    var NormalNum = stuData.Where(a => StuEnterList.Contains(a.StuNo))
-                        .Count(a => a.HealthStatus != "1" && a.HealthStatus != "2");
-                    var AbnormalNum = stuData.Where(a => StuEnterList.Contains(a.StuNo)).Count(a => a.HealthStatus == "1" || a.HealthStatus == "2");
 
-                    list.Add(new { DeptNo = deptEntity.DeptNo, Num = StuGroup.Count(), Normal = NormalNum, Abnormal = AbnormalNum });
-                }
+                list.Add(new { DeptNo = "", Num = 0, Normal = 0, Abnormal = 0 });
 
                 return list;
             }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SignUpHelper.cs

@@ -183,7 +183,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         OLPEId = olpeEntity.Id,
                         NoticeBookNo = stuInfoBasicEntity.NoticeNo,
                         StuNo = stuInfoBasicEntity.StuNo,
-                        DeptNo = stuInfoBasicEntity.DeptNo,
                         MajorNo = stuInfoBasicEntity.MajorNo,
                         ClassNo = stuInfoBasicEntity.ClassNo,
                         MajorDetailNo = stuInfoBasicEntity.MajorDetailNo,

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendance/StuAttendanceEntity.cs

@@ -45,16 +45,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("GRADE")]
         public string Grade { get; set; }
         /// <summary>
-        /// 系所码
-        /// </summary>
-        [Column("DEPTNO")]
-        public string DeptNo { get; set; }
-        /// <summary>
-        /// 系名
-        /// </summary>
-        [Column("DEPTNAME")]
-        public string DeptName { get; set; }
-        /// <summary>
         /// 专业码
         /// </summary>
         [Column("MAJORNO")]

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuAttendanceLeave/StuAttendanceLeaveEntity.cs

@@ -51,18 +51,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("GRADE")]
         public string Grade { get; set; }
 
-        /// <summary>
-        /// 系所码
-        /// </summary>
-        [Column("DEPTNO")]
-        public string DeptNo { get; set; }
-
-        /// <summary>
-        /// 系名
-        /// </summary>
-        [Column("DEPTNAME")]
-        public string DeptName { get; set; }
-
         /// <summary>
         /// 专业码
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuCancelExam/StuCancelExamEntity.cs

@@ -40,11 +40,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("STUNO")]
         public string StuNo { get; set; }
         /// <summary>
-        /// DeptNo
-        /// </summary>
-        [Column("DEPTNO")]
-        public string DeptNo { get; set; }
-        /// <summary>
         /// MajorNo
         /// </summary>
         [Column("MAJORNO")]

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuCancelExam/StuCancelExamService.cs

@@ -225,7 +225,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             model.AcademicYearNo = stuSelectLessonListEntity.AcademicYearNo;
                             model.Semester = stuSelectLessonListEntity.Semester;
                             model.StuNo = stuSelectLessonListEntity.StuNo;
-                            model.DeptNo = stuSelectLessonListEntity.DeptNo;
                             model.MajorNo = stuSelectLessonListEntity.MajorNo;
                             model.ClassNo = stuSelectLessonListEntity.ClassNo;
                             model.StuName = stuSelectLessonListEntity.StuName;

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs

@@ -49,11 +49,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("KSH")]
         public string ksh { get; set; }
         /// <summary>
-        /// 系所代码
-        /// </summary>
-        [Column("DEPTNO")]
-        public string DeptNo { get; set; }
-        /// <summary>
         /// 专业代码
         /// </summary>
         [Column("MAJORNO")]

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

@@ -33,12 +33,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("STUNO")]
         public string StuNo { get; set; }
         /// <summary>
-        /// DeptNo
-        /// </summary>
-        /// <returns></returns>
-        [Column("DEPTNO")]
-        public string DeptNo { get; set; }
-        /// <summary>
         /// MajorNo
         /// </summary>
         /// <returns></returns>
@@ -87,12 +81,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("SEMESTER")]
         public string Semester { get; set; }
         /// <summary>
-        /// OpenLessonDeptNo
-        /// </summary>
-        /// <returns></returns>
-        [Column("OPENLESSONDEPTNO")]
-        public string OpenLessonDeptNo { get; set; }
-        /// <summary>
         /// OpenLessonMajorNo
         /// </summary>
         /// <returns></returns>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveEntity.cs

@@ -35,11 +35,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("STUNO")]
         public string StuNo { get; set; }
         /// <summary>
-        /// DeptNo
-        /// </summary>
-        [Column("DEPTNO")]
-        public string DeptNo { get; set; }
-        /// <summary>
         /// MajorNo
         /// </summary>
         [Column("MAJORNO")]

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElectivePre/StuSelectLessonListOfElectivePreEntity.cs

@@ -35,11 +35,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("STUNO")]
         public string StuNo { get; set; }
         /// <summary>
-        /// DeptNo
-        /// </summary>
-        [Column("DEPTNO")]
-        public string DeptNo { get; set; }
-        /// <summary>
         /// MajorNo
         /// </summary>
         [Column("MAJORNO")]

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

@@ -34,12 +34,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("SEMESTER")]
         public string Semester { get; set; }
         /// <summary>
-        /// DeptNo
-        /// </summary>
-        /// <returns></returns>
-        [Column("DEPTNO")]
-        public string DeptNo { get; set; }
-        /// <summary>
         /// MajorNo
         /// </summary>
         /// <returns></returns>