diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Graduate.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Graduate.js index 413dbe927..26e63a7c1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Graduate.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Graduate.js @@ -39,7 +39,7 @@ var bootstrap = function ($, learun) { }); $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' }); $('#FinishSchoolMark').lrselect({ - data: [{ text: "准许毕业", value: "1" }, { text: "待准许", value: "0" }], + data: [{ text: "已毕业", value: "2" },{ text: "准许毕业", value: "1" }, { text: "待准许", value: "0" }], text: "text", value: "value" }) @@ -62,7 +62,7 @@ var bootstrap = function ($, learun) { $('#lr_store').on('click', function () { learun.layerConfirm('1.毕业生归档必须在6-8月份进行;
2.归档后的学生信息如:操行、奖惩、成绩、毕业证书等只有通过毕业生信息管理才能查询或打印;
3.毕业学生的账户将自动取消;
4.学生所占的床位也将自动退掉;
5.学生所在的班级置为已毕业班级;
6.归档操作后不可撤消,请谨慎操作!', function (res) { if (res) { - learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/StuStore', { keyValue: keyValue }, function () { + learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/StuStore', {}, function () { refreshGirdData(); }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs index 1dab84677..a94eb0170 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs @@ -787,7 +787,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration var PropertyInfoGraduate = typegraduate.GetProperties(); foreach (var itemStuInfo in PropertyInfoStuInfo) { - var objStuInfoType = itemStuInfo.GetValue(StuInfoType); + var objStuInfoType = itemStuInfo.GetValue(item); foreach (var itemGraduate in PropertyInfoGraduate) { if (itemGraduate.Name == itemStuInfo.Name) @@ -816,6 +816,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration db.Delete(item); db.Insert(GraduateEntity); } + db.Commit(); } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoGraduate/StuInfoGraduateEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoGraduate/StuInfoGraduateEntity.cs index 389b0311a..80fade45f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoGraduate/StuInfoGraduateEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoGraduate/StuInfoGraduateEntity.cs @@ -808,7 +808,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("CROWNING")] public string Crowning { get; set; } -#endregion + #endregion #region 扩展操作 ///