From 2c8b0de7b0faa0d00608f37608a675e6dddd56df Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Tue, 9 May 2023 14:58:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=AD=A6=E5=BC=82=E5=8A=A8=E7=9A=84?=
 =?UTF-8?q?=E5=BC=82=E5=8A=A8=E7=B1=BB=E5=9E=8B=E5=A2=9E=E5=8A=A0=20?=
 =?UTF-8?q?=E6=B3=A8=E9=94=80=20=E5=92=8C=20=E8=87=AA=E5=8A=A8=E9=80=80?=
 =?UTF-8?q?=E5=AD=A6=20=E4=B8=A4=E7=A7=8D=E5=BC=82=E5=8A=A8=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuTransferInfo/DropOutIndex.js                 | 2 +-
 .../StuTransferInfo/StuTransferInfoService.cs             | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.js
index 19b867e49..fcb4110e7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.js	
@@ -127,7 +127,7 @@ var bootstrap = function ($, learun) {
             //$('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType' });
             $('#AnomalousType').lrselect({
                 url: top.$.rootUrl + '/LR_SystemModule/DataItem/GetDetailList3',
-                param: { itemCode: 'StuChangeType', strWhere: "and( F_ItemValue='05' or F_ItemValue='12'or F_ItemValue='11' or F_ItemValue='10' ) order by F_ItemValue desc" },
+                param: { itemCode: 'StuChangeType', strWhere: "and( F_ItemValue='05' or F_ItemValue='12'or F_ItemValue='11' or F_ItemValue='10'or F_ItemValue='13'or F_ItemValue='14' ) order by F_ItemValue desc" },
                 value: "F_ItemValue",
                 text: "F_ItemName"
                 //nodeClick: function (item) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs
index f3b9ef895..82cf77cc7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs	
@@ -298,7 +298,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             entitylist.Add(InsertEntity);
                         }
                     }
-                    else if (InsertEntity.AnomalousType == "02" || InsertEntity.AnomalousType == "05" || InsertEntity.AnomalousType == "10" || InsertEntity.AnomalousType == "11" || InsertEntity.AnomalousType == "12")//退学、死亡,失踪,开除,转出
+                    else if (InsertEntity.AnomalousType == "02" || InsertEntity.AnomalousType == "05" || InsertEntity.AnomalousType == "10" || InsertEntity.AnomalousType == "11" || InsertEntity.AnomalousType == "12" || InsertEntity.AnomalousType == "13" || InsertEntity.AnomalousType == "14")//退学、死亡,失踪,开除,转出,注销,自动退学
                     {
                         if (this.BaseRepository("CollegeMIS").FindEntity<StuTransferInfoEntity>(x =>
                             x.AnomalousType == InsertEntity.AnomalousType && x.StuId == InsertEntity.StuId && x.EnteDate == InsertEntity.EnteDate) == null)
@@ -430,14 +430,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     switch (upTrua.AnomalousType)
                     {
                         case "01": //留级                        
-                        case "07": //转班
-                        case "08": //转专业
                         case "02": //转校
                         case "05": //退学
                         case "06": //休学
+                        case "07": //转班
+                        case "08": //转专业
                         case "10": //开除
                         case "11": //死亡
                         case "12": //失踪
+                        case "13": //注销
+                        case "14": //自动退学
 
                             #region 复制一份学生学籍表
                             copyStuInfoBasic(upTrua, stulist, InsertStuTran);