新专业
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/FormView.js
index 4b152fe0f..47116b74e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/FormView.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/FormView.js
@@ -27,13 +27,11 @@ var bootstrap = function ($, learun) {
$(".NewContainer").find('.contentDiv').attr("isvalid", "yes");
$(".NewContainer").find('.contentDiv').attr("checkexpession", "NotNull");
$(".NewContainer").find('.contentDiv').attr('readonly', 'readonly');
- $("#NewDeptNo").siblings('div').html($("#NewDeptNo").siblings('div').attr('data-title') + '
*');
$("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title') + '
*');
$("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title') + '
*');
$(".NewContainer").show();
if (item.id === "01" || item.id === "02") { //降级、转班
//$(".NewContainer").find('.contentDiv.zhuanban').removeAttr('readonly');
- $("#NewDeptNo").lrselectSet($("#DeptNo").lrselectGet());
$("#NewMajorNo").lrselectSet($("#MajorNo").lrselectGet());
}
else if (item.id === "03") { //转专业
@@ -43,7 +41,6 @@ var bootstrap = function ($, learun) {
$(".NewContainer").find('.contentDiv').removeAttr("isvalid");
$(".NewContainer").find('.contentDiv').removeAttr("checkexpession");
//$(".NewContainer").find('.contentDiv').removeAttr('readonly');
- $("#NewDeptNo").siblings('div').html($("#NewDeptNo").siblings('div').attr('data-title'));
$("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title'));
$("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title'));
$(".NewContainer").hide();
@@ -53,24 +50,8 @@ var bootstrap = function ($, learun) {
}
});
$('#StuChangeReason').lrDataItemSelect({ code: 'StuChangeReason' });
- $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
$('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
$('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
- $('#NewDeptNo').lrDataSourceSelect({
- code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (item) {
- if (item != null && item != undefined) {
- $('#NewMajorNo').lrselectRefresh({
- url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
- param: { strWhere: "deptno='" + item.deptno + "' AND CheckMark=1 order by majorno" }
- });
- } else {
- $('#NewMajorNo').lrselectRefresh({
- url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
- param: { strWhere: "CheckMark=1 order by majorno" }
- });
- }
- }
- });
$('#NewMajorNo').lrDataSourceSelect({
code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select: function (item) {
if (item != null && item != undefined) {
@@ -95,7 +76,6 @@ var bootstrap = function ($, learun) {
// if (data) {
// $("#StuNo").val(data.StuNo);
// $("#StuName").val(data.StuName);
- // $("#DeptNo").lrselectSet(data.DeptNo);
// $("#MajorNo").lrselectSet(data.MajorNo);
// $("#ClassNo").lrselectSet(data.ClassNo);
// } else {
@@ -113,7 +93,6 @@ var bootstrap = function ($, learun) {
// if (data) {
// $("#StuNo").val(data.StuNo);
// $("#StuName").val(data.StuName);
- // $("#DeptNo").lrselectSet(data.DeptNo);
// $("#MajorNo").lrselectSet(data.MajorNo);
// $("#ClassNo").lrselectSet(data.ClassNo);
// } else {
@@ -142,7 +121,6 @@ var bootstrap = function ($, learun) {
$(".NewContainer").find('.contentDiv').attr("isvalid", "yes");
$(".NewContainer").find('.contentDiv').attr("checkexpession", "NotNull");
$(".NewContainer").find('.contentDiv').attr('readonly', 'readonly');
- $("#NewDeptNo").siblings('div').html($("#NewDeptNo").siblings('div').attr('data-title') + '
*');
$("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title') + '
*');
$("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title') + '
*');
$(".NewContainer").show();
@@ -156,7 +134,6 @@ var bootstrap = function ($, learun) {
$(".NewContainer").find('.contentDiv').removeAttr("isvalid");
$(".NewContainer").find('.contentDiv').removeAttr("checkexpession");
//$(".NewContainer").find('.contentDiv').removeAttr('readonly');
- $("#NewDeptNo").siblings('div').html($("#NewDeptNo").siblings('div').attr('data-title'));
$("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title'));
$("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title'));
$(".NewContainer").hide();
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.js
index 1334b21eb..4a8a53b06 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.js
@@ -140,19 +140,6 @@ var bootstrap = function ($, learun) {
});
}
},
- {
- 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) {
@@ -179,19 +166,6 @@ var bootstrap = function ($, learun) {
});
}
},
- {
- label: "新系部", name: "NewDeptNo", 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: "NewMajorNo", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTermAttemper/ArrangeLessonTermAttemperEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTermAttemper/ArrangeLessonTermAttemperEntity.cs
index 4593f93d5..8f84b75f0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTermAttemper/ArrangeLessonTermAttemperEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTermAttemper/ArrangeLessonTermAttemperEntity.cs
@@ -40,11 +40,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
[Column("SEMESTER")]
public string Semester { get; set; }
///
- /// DeptNo
- ///
- [Column("DEPTNO")]
- public string DeptNo { get; set; }
- ///
/// MajorNo
///
[Column("MAJORNO")]
@@ -75,11 +70,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
[Column("ATTEMPERTIMETYPE")]
public string AttemperTimeType { get; set; }
///
- /// NewDeptNo
- ///
- [Column("NEWDEPTNO")]
- public string NewDeptNo { get; set; }
- ///
/// NewMajorNo
///
[Column("NEWMAJORNO")]
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTermAttemper/ArrangeLessonTermAttemperService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTermAttemper/ArrangeLessonTermAttemperService.cs
index 30069a1da..88edce60e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTermAttemper/ArrangeLessonTermAttemperService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTermAttemper/ArrangeLessonTermAttemperService.cs
@@ -61,11 +61,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String);
strSql.Append(" AND t.Semester = @Semester ");
}
- if (!queryParam["DeptNo"].IsEmpty())
- {
- dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
- strSql.Append(" AND t.DeptNo = @DeptNo ");
- }
if (!queryParam["MajorNo"].IsEmpty())
{
dp.Add("MajorNo", queryParam["MajorNo"].ToString(), DbType.String);
@@ -270,8 +265,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
if (entity.AttemperType == "01") //调课
{
//ArrangeLessonTerm
- //var ArrangeLessonTermList = db.FindList
(x => x.F_SchoolId == entity.F_SchoolId && x.AcademicYearNo == entity.AcademicYearNo && x.Semester == entity.Semester && x.DeptNo == entity.DeptNo && x.MajorNo == entity.MajorNo && x.LessonNo == entity.LessonNo && x.TeachClassNo.Contains(entity.TeachClassNo) && x.EmpNo == entity.EmpNo && x.ClassroomNo == entity.ClassroomNo && x.LessonDate >= entity.AttemperStartTime && x.LessonDate <= entity.AttemperEndTime);
- var ArrangeLessonTermList = db.FindList(x => x.AcademicYearNo == entity.AcademicYearNo && x.Semester == entity.Semester && x.DeptNo == entity.DeptNo && x.MajorNo == entity.MajorNo && x.LessonNo == entity.LessonNo && x.TeachClassNo.Contains(entity.TeachClassNo) && x.EmpNo == entity.EmpNo && x.ClassroomNo == entity.ClassroomNo && x.LessonDate >= entity.AttemperStartTime && x.LessonDate <= entity.AttemperEndTime);
+ //var ArrangeLessonTermList = db.FindList(x => x.F_SchoolId == entity.F_SchoolId && x.AcademicYearNo == entity.AcademicYearNo && x.Semester == entity.Semester && x.MajorNo == entity.MajorNo && x.LessonNo == entity.LessonNo && x.TeachClassNo.Contains(entity.TeachClassNo) && x.EmpNo == entity.EmpNo && x.ClassroomNo == entity.ClassroomNo && x.LessonDate >= entity.AttemperStartTime && x.LessonDate <= entity.AttemperEndTime);
+ var ArrangeLessonTermList = db.FindList(x => x.AcademicYearNo == entity.AcademicYearNo && x.Semester == entity.Semester && x.MajorNo == entity.MajorNo && x.LessonNo == entity.LessonNo && x.TeachClassNo.Contains(entity.TeachClassNo) && x.EmpNo == entity.EmpNo && x.ClassroomNo == entity.ClassroomNo && x.LessonDate >= entity.AttemperStartTime && x.LessonDate <= entity.AttemperEndTime);
if (ArrangeLessonTermList.Any())
{
foreach (var item in ArrangeLessonTermList)
@@ -293,14 +288,14 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
if (!string.IsNullOrEmpty(entity.NewEmpNo))
{
//TeachClass
- //db.ExecuteBySql($"update TeachClass set EmpNo='{entity.NewEmpNo}' where F_SchoolId='{entity.F_SchoolId}' and AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and DeptNo='{entity.DeptNo}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo='{entity.TeachClassNo}' and EmpNo='{entity.EmpNo}' ");
- db.ExecuteBySql($"update TeachClass set EmpNo='{entity.NewEmpNo}' where AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and DeptNo='{entity.DeptNo}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo='{entity.TeachClassNo}' and EmpNo='{entity.EmpNo}' ");
+ //db.ExecuteBySql($"update TeachClass set EmpNo='{entity.NewEmpNo}' where F_SchoolId='{entity.F_SchoolId}' and AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo='{entity.TeachClassNo}' and EmpNo='{entity.EmpNo}' ");
+ db.ExecuteBySql($"update TeachClass set EmpNo='{entity.NewEmpNo}' where AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo='{entity.TeachClassNo}' and EmpNo='{entity.EmpNo}' ");
//StuSelectLessonList
- //db.ExecuteBySql($"update StuSelectLessonList set EmpNo='{entity.NewEmpNo}' where F_SchoolId='{entity.F_SchoolId}' and AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and DeptNo='{entity.DeptNo}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo='{entity.TeachClassNo}' and EmpNo='{entity.EmpNo}' ");
- db.ExecuteBySql($"update StuSelectLessonList set EmpNo='{entity.NewEmpNo}' where AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and DeptNo='{entity.DeptNo}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo='{entity.TeachClassNo}' and EmpNo='{entity.EmpNo}' ");
+ //db.ExecuteBySql($"update StuSelectLessonList set EmpNo='{entity.NewEmpNo}' where F_SchoolId='{entity.F_SchoolId}' and AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo='{entity.TeachClassNo}' and EmpNo='{entity.EmpNo}' ");
+ db.ExecuteBySql($"update StuSelectLessonList set EmpNo='{entity.NewEmpNo}' where AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo='{entity.TeachClassNo}' and EmpNo='{entity.EmpNo}' ");
//StuScore
- //db.ExecuteBySql($"update StuScore set EmpNo='{entity.NewEmpNo}' where F_SchoolId='{entity.F_SchoolId}' and AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and DeptNo='{entity.DeptNo}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo='{entity.TeachClassNo}' and EmpNo='{entity.EmpNo}' and LessonSortNo='1' ");
- db.ExecuteBySql($"update StuScore set EmpNo='{entity.NewEmpNo}' where AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and DeptNo='{entity.DeptNo}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo='{entity.TeachClassNo}' and EmpNo='{entity.EmpNo}' and LessonSortNo='1' ");
+ //db.ExecuteBySql($"update StuScore set EmpNo='{entity.NewEmpNo}' where F_SchoolId='{entity.F_SchoolId}' and AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo='{entity.TeachClassNo}' and EmpNo='{entity.EmpNo}' and LessonSortNo='1' ");
+ db.ExecuteBySql($"update StuScore set EmpNo='{entity.NewEmpNo}' where AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo='{entity.TeachClassNo}' and EmpNo='{entity.EmpNo}' and LessonSortNo='1' ");
//EmpReportCard
//todo:分校区版初始化成绩时,初始化学生成绩未赋值F_SchoolId,初始化教师成绩单未赋值F_SchoolId
//db.ExecuteBySql($"update EmpReportCard set EmpNo='{entity.NewEmpNo}',EmpName='{db.FindEntity(x => x.EmpNo == entity.NewEmpNo)?.EmpName}' where F_SchoolId='{entity.F_SchoolId}' and AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and LessonNo='{entity.LessonNo}' and ClassNo='{entity.TeachClassNo}' and EmpNo='{entity.EmpNo}' and LessonSortNo='1' ");
@@ -311,19 +306,19 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
else if (entity.AttemperType == "02") //停课
{
//ArrangeLessonTerm
- //db.ExecuteBySql($"update ArrangeLessonTerm set CheckMark='0' where F_SchoolId='{entity.F_SchoolId}' and AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and DeptNo='{entity.DeptNo}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo like '%{entity.TeachClassNo}%' and EmpNo='{entity.EmpNo}' and ClassroomNo='{entity.ClassroomNo}' ");
- db.ExecuteBySql($"update ArrangeLessonTerm set CheckMark='0' where AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and DeptNo='{entity.DeptNo}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo like '%{entity.TeachClassNo}%' and EmpNo='{entity.EmpNo}' and ClassroomNo='{entity.ClassroomNo}' ");
+ //db.ExecuteBySql($"update ArrangeLessonTerm set CheckMark='0' where F_SchoolId='{entity.F_SchoolId}' and AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo like '%{entity.TeachClassNo}%' and EmpNo='{entity.EmpNo}' and ClassroomNo='{entity.ClassroomNo}' ");
+ db.ExecuteBySql($"update ArrangeLessonTerm set CheckMark='0' where AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo like '%{entity.TeachClassNo}%' and EmpNo='{entity.EmpNo}' and ClassroomNo='{entity.ClassroomNo}' ");
//StuSelectLessonList
- //db.ExecuteBySql($"update StuSelectLessonList set CheckMark='0' where F_SchoolId='{entity.F_SchoolId}' and AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and DeptNo='{entity.DeptNo}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo='{entity.TeachClassNo}' and EmpNo='{entity.EmpNo}' ");
- db.ExecuteBySql($"update StuSelectLessonList set CheckMark='0' where AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and DeptNo='{entity.DeptNo}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo='{entity.TeachClassNo}' and EmpNo='{entity.EmpNo}' ");
+ //db.ExecuteBySql($"update StuSelectLessonList set CheckMark='0' where F_SchoolId='{entity.F_SchoolId}' and AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo='{entity.TeachClassNo}' and EmpNo='{entity.EmpNo}' ");
+ db.ExecuteBySql($"update StuSelectLessonList set CheckMark='0' where AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' and MajorNo='{entity.MajorNo}' and LessonNo='{entity.LessonNo}' and TeachClassNo='{entity.TeachClassNo}' and EmpNo='{entity.EmpNo}' ");
}
else if (entity.AttemperType == "03") //对调
{
//ArrangeLessonTerm
- //var ArrangeLessonTermList = this.BaseRepository("CollegeMIS").FindList(x => x.F_SchoolId == entity.F_SchoolId && x.AcademicYearNo == entity.AcademicYearNo && x.Semester == entity.Semester && x.DeptNo == entity.DeptNo && x.MajorNo == entity.MajorNo && x.LessonNo == entity.LessonNo && x.TeachClassNo.Contains(entity.TeachClassNo) && x.EmpNo == entity.EmpNo && x.ClassroomNo == entity.ClassroomNo);
- var ArrangeLessonTermList = this.BaseRepository("CollegeMIS").FindList(x => x.AcademicYearNo == entity.AcademicYearNo && x.Semester == entity.Semester && x.DeptNo == entity.DeptNo && x.MajorNo == entity.MajorNo && x.LessonNo == entity.LessonNo && x.TeachClassNo.Contains(entity.TeachClassNo) && x.EmpNo == entity.EmpNo && x.ClassroomNo == entity.ClassroomNo);
- //var NewArrangeLessonTermList = this.BaseRepository("CollegeMIS").FindList(x => x.F_SchoolId == entity.F_SchoolId && x.AcademicYearNo == entity.AcademicYearNo && x.Semester == entity.Semester && x.DeptNo == entity.NewDeptNo && x.MajorNo == entity.NewMajorNo && x.LessonNo == entity.NewLessonNo && x.TeachClassNo.Contains(entity.NewTeachClassNo) && x.EmpNo == entity.NewEmpNo && x.ClassroomNo == entity.NewClassroomNo);
- var NewArrangeLessonTermList = this.BaseRepository("CollegeMIS").FindList(x => x.AcademicYearNo == entity.AcademicYearNo && x.Semester == entity.Semester && x.DeptNo == entity.NewDeptNo && x.MajorNo == entity.NewMajorNo && x.LessonNo == entity.NewLessonNo && x.TeachClassNo.Contains(entity.NewTeachClassNo) && x.EmpNo == entity.NewEmpNo && x.ClassroomNo == entity.NewClassroomNo);
+ //var ArrangeLessonTermList = this.BaseRepository("CollegeMIS").FindList(x => x.F_SchoolId == entity.F_SchoolId && x.AcademicYearNo == entity.AcademicYearNo && x.Semester == entity.Semester && x.MajorNo == entity.MajorNo && x.LessonNo == entity.LessonNo && x.TeachClassNo.Contains(entity.TeachClassNo) && x.EmpNo == entity.EmpNo && x.ClassroomNo == entity.ClassroomNo);
+ var ArrangeLessonTermList = this.BaseRepository("CollegeMIS").FindList(x => x.AcademicYearNo == entity.AcademicYearNo && x.Semester == entity.Semester && x.MajorNo == entity.MajorNo && x.LessonNo == entity.LessonNo && x.TeachClassNo.Contains(entity.TeachClassNo) && x.EmpNo == entity.EmpNo && x.ClassroomNo == entity.ClassroomNo);
+ //var NewArrangeLessonTermList = this.BaseRepository("CollegeMIS").FindList(x => x.F_SchoolId == entity.F_SchoolId && x.AcademicYearNo == entity.AcademicYearNo && x.Semester == entity.Semester && x.MajorNo == entity.NewMajorNo && x.LessonNo == entity.NewLessonNo && x.TeachClassNo.Contains(entity.NewTeachClassNo) && x.EmpNo == entity.NewEmpNo && x.ClassroomNo == entity.NewClassroomNo);
+ var NewArrangeLessonTermList = this.BaseRepository("CollegeMIS").FindList(x => x.AcademicYearNo == entity.AcademicYearNo && x.Semester == entity.Semester && x.MajorNo == entity.NewMajorNo && x.LessonNo == entity.NewLessonNo && x.TeachClassNo.Contains(entity.NewTeachClassNo) && x.EmpNo == entity.NewEmpNo && x.ClassroomNo == entity.NewClassroomNo);
if (ArrangeLessonTermList.Any() && NewArrangeLessonTermList.Any())
{
var oldEntity = ArrangeLessonTermList.FirstOrDefault();
@@ -331,7 +326,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
var oldEntityTemp = new ArrangeLessonTermEntity()
{
- DeptNo = oldEntity.DeptNo,
MajorNo = oldEntity.MajorNo,
LessonNo = oldEntity.LessonNo,
LessonName = oldEntity.LessonName,
@@ -351,7 +345,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
foreach (var item in ArrangeLessonTermList)
{
- item.DeptNo = newEntity.DeptNo;
item.MajorNo = newEntity.MajorNo;
item.LessonNo = newEntity.LessonNo;
item.LessonName = newEntity.LessonName;
@@ -371,7 +364,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
}
foreach (var newitem in NewArrangeLessonTermList)
{
- newitem.DeptNo = oldEntityTemp.DeptNo;
newitem.MajorNo = oldEntityTemp.MajorNo;
newitem.LessonNo = oldEntityTemp.LessonNo;
newitem.LessonName = oldEntityTemp.LessonName;
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeEntity.cs
index 4e04ce9f7..f2fe9194c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeEntity.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeEntity.cs
@@ -30,11 +30,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
[Column("STUNAME")]
public string StuName { get; set; }
///
- /// DeptNo
- ///
- [Column("DEPTNO")]
- public string DeptNo { get; set; }
- ///
/// MajorNo
///
[Column("MAJORNO")]
@@ -60,11 +55,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
[Column("STUCHANGEREMARK")]
public string StuChangeRemark { get; set; }
///
- /// NewDeptNo
- ///
- [Column("NEWDEPTNO")]
- public string NewDeptNo { get; set; }
- ///
/// NewMajorNo
///
[Column("NEWMAJORNO")]
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeService.cs
index 5fb126220..380d70153 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeService.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeService.cs
@@ -159,7 +159,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
var classInfoEntity = db.FindEntity(x => x.ClassNo == entity.NewClassNo);
if (classInfoEntity != null)
{
- db.ExecuteBySql($"update StuInfoBasic set DeptNo='{entity.NewDeptNo}',MajorNo='{entity.NewMajorNo}',ClassNo='{entity.NewClassNo}',Grade='{classInfoEntity.Grade}' where StuNo='{entity.StuNo}' ");
+ db.ExecuteBySql($"update StuInfoBasic set MajorNo='{entity.NewMajorNo}',ClassNo='{entity.NewClassNo}',Grade='{classInfoEntity.Grade}' where StuNo='{entity.StuNo}' ");
}
}
else if (entity.StuChangeType == "04" || entity.StuChangeType == "05") //退学、休学
@@ -210,7 +210,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
var classInfoEntity = db.FindEntity(x => x.ClassNo == entity.ClassNo);
if (classInfoEntity != null)
{
- db.ExecuteBySql($"update StuInfoBasic set DeptNo='{entity.DeptNo}',MajorNo='{entity.MajorNo}',ClassNo='{entity.ClassNo}',Grade='{classInfoEntity.Grade}' where StuNo='{entity.StuNo}' ");
+ db.ExecuteBySql($"update StuInfoBasic set MajorNo='{entity.MajorNo}',ClassNo='{entity.ClassNo}',Grade='{classInfoEntity.Grade}' where StuNo='{entity.StuNo}' ");
}
}
else if (entity.StuChangeType == "04" || entity.StuChangeType == "05") //退学、休学