From d5084cc572b9709e515ef3c86c869f0dbb480aaf Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Tue, 28 Mar 2023 10:56:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=B1=8D=E5=BC=82=E5=8A=A8=E9=80=80?=
 =?UTF-8?q?=E5=AD=A6=E6=B7=BB=E5=8A=A0=E5=BC=80=E9=99=A4,=E5=A4=B1?=
 =?UTF-8?q?=E8=B8=AA=E7=AD=89=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuTransferInfo/DropOutIndex.cshtml     |  2 +-
 .../Views/StuTransferInfo/DropOutIndex.js         | 15 +++++++++++++--
 .../StuTransferInfo/StuTransferInfoService.cs     |  7 +++++--
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.cshtml
index 7933f349a..2279f29e3 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.cshtml	
@@ -64,7 +64,7 @@
             <div class="lr-form-wrap" style="height:30%;" id="form">
                 <div class="col-xs-3 lr-form-item">
                     <div class="lr-form-item-title">异动类型<font face="宋体">*</font></div>
-                    <div id="AnomalousType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly></div>
+                    <div id="AnomalousType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
                 </div>
                 <div class="col-xs-3 lr-form-item">
                     <div class="lr-form-item-title">注销账号<font face="宋体">*</font></div>
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 acbc18c60..19b867e49 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	
@@ -124,8 +124,19 @@ var bootstrap = function ($, learun) {
                 text: "classname"
             });
             //提交下拉框
-            $('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType' });
-            $('#AnomalousType').lrselectSet("05");
+            //$('#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" },
+                value: "F_ItemValue",
+                text: "F_ItemName"
+                //nodeClick: function (item) {
+                //    type = item.value;
+                //    $('#titleinfo').text(item.text);
+                //    page.search();
+                //}
+            });
+            //$('#AnomalousType').lrselectSet("05");
             $('#StuStatus').lrDataItemSelect({ code: 'YesOrNoInt' });
             $('#F_WriteMark').lrDataItemSelect({ code: 'YesOrNoInt' });
             // 刷新
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 95c41d764..2c1714848 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	
@@ -297,7 +297,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             entitylist.Add(InsertEntity);
                         }
                     }
-                    else if (InsertEntity.AnomalousType == "02" || InsertEntity.AnomalousType == "05")//退学、转出
+                    else if (InsertEntity.AnomalousType == "02" || InsertEntity.AnomalousType == "05" || InsertEntity.AnomalousType == "10" || InsertEntity.AnomalousType == "11" || InsertEntity.AnomalousType == "12")//退学、死亡,失踪,开除,转出
                     {
                         if (this.BaseRepository("CollegeMIS").FindEntity<StuTransferInfoEntity>(x =>
                             x.AnomalousType == InsertEntity.AnomalousType && x.StuId == InsertEntity.StuId && x.EnteDate == InsertEntity.EnteDate) == null)
@@ -433,6 +433,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         case "02": //转校
                         case "05": //退学
                         case "06": //休学
+                        case "10": //开除
+                        case "11": //死亡
+                        case "12": //失踪
 
                             #region 复制一份学生学籍表
                             copyStuInfoBasic(upTrua, stulist, InsertStuTran);
@@ -630,7 +633,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                                 }
                                 #endregion
                             }
-                            else if (upTrua.AnomalousType == "02" || upTrua.AnomalousType == "05" || upTrua.AnomalousType == "06")
+                            else if (upTrua.AnomalousType == "02" || upTrua.AnomalousType == "05" || upTrua.AnomalousType == "06" || upTrua.AnomalousType == "10" || upTrua.AnomalousType == "11" || upTrua.AnomalousType == "12")
                             {
                                 if (upTrua.AnomalousType == "06") //休学保存部分基础数据 StuTransferInfo数据?
                                 {