From b3f026bba07911e01e7b62bd11ffdea48d464a05 Mon Sep 17 00:00:00 2001
From: dyy <807692433@qq.com>
Date: Fri, 27 Sep 2024 16:14:12 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E6=AF=95?=
 =?UTF-8?q?=E4=B8=9A=E8=AF=81=E5=8F=91=E6=94=BE=EF=BC=9A=E5=BD=92=E6=A1=A3?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EducationalAdministration/Views/StuInfoBasic/Graduate.js  | 4 ++--
 .../StuInfoBasic/StuInfoBasicService.cs                       | 3 ++-
 .../StuInfoGraduate/StuInfoGraduateEntity.cs                  | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

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月份进行； <br>  2.归档后的学生信息如：操行、奖惩、成绩、毕业证书等只有通过毕业生信息管理才能查询或打印；<br> 3.毕业学生的账户将自动取消；<br> 4.学生所占的床位也将自动退掉；<br> 5.学生所在的班级置为已毕业班级；<br> 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
         /// </summary>
         [Column("CROWNING")]
         public string Crowning { get; set; }
-#endregion
+        #endregion
 
         #region  扩展操作
         /// <summary>