【修改】休学：异动类型增加参军入伍；

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.cshtml

@@ -111,7 +111,7 @@
                     <div class="lr-form-wrap" style="height:30%;" id="form">
                         <div class="col-xs-4 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="readonly"></div>
+                            <div id="AnomalousType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
                         </div>
                         <div class="col-xs-4 lr-form-item">
                             <div class="lr-form-item-title">注销账号<font face="宋体">*</font></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.js

@@ -169,7 +169,13 @@ var bootstrap = function ($, learun) {
             });
             //提交下拉框
           
-            $('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType' });
+            //$('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType' });
+            $('#AnomalousType').lrselect({
+                url: top.$.rootUrl + '/LR_SystemModule/DataItem/GetDetailList3',
+                param: { itemCode: 'StuChangeType', strWhere: "and( F_ItemValue='06' or F_ItemValue='17' ) order by F_ItemValue desc" },
+                value: "F_ItemValue",
+                text: "F_ItemName"
+            });
             $('#AnomalousType').lrselectSet("06");
             $('#StuStatus').lrDataItemSelect({ code: 'YesOrNoInt' });
             $('#F_WriteMark').lrDataItemSelect({ code: 'YesOrNoInt' });

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs

@@ -300,7 +300,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             entitylist.Add(InsertEntity);
                         }
                     }
-                    else if (InsertEntity.AnomalousType == "06")//休学
+                    else if (InsertEntity.AnomalousType == "06" || InsertEntity.AnomalousType == "17")//休学、参军入伍
                     {
                         if (this.BaseRepository("CollegeMIS").FindEntity<StuTransferInfoEntity>(x =>
                             x.AnomalousType == InsertEntity.AnomalousType && x.StuId == InsertEntity.StuId && x.EnteDate == InsertEntity.EnteDate && x.SuspensionPeriod == InsertEntity.SuspensionPeriod &&
@@ -453,6 +453,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         case "13": //注销
                         case "14": //自动退学
                         case "15": //跳级
+                        case "17": //参军入伍
 
                             #region 复制一份学生学籍表
                             copyStuInfoBasic(upTrua, stulist, InsertStuTran);
@@ -644,9 +645,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                                 }
                                 #endregion
                             }
-                            else if (upTrua.AnomalousType == "02" || upTrua.AnomalousType == "05" || upTrua.AnomalousType == "06" || upTrua.AnomalousType == "10" || upTrua.AnomalousType == "11" || upTrua.AnomalousType == "12" || upTrua.AnomalousType == "13" || upTrua.AnomalousType == "14")
+                            else if (upTrua.AnomalousType == "02" || upTrua.AnomalousType == "05" || upTrua.AnomalousType == "06" || upTrua.AnomalousType == "10" || upTrua.AnomalousType == "11" || upTrua.AnomalousType == "12" || upTrua.AnomalousType == "13" || upTrua.AnomalousType == "14" || upTrua.AnomalousType == "17")
                             {
-                                if (upTrua.AnomalousType == "06") //休学保存部分基础数据 StuTransferInfo数据?
+                                if (upTrua.AnomalousType == "06" || upTrua.AnomalousType == "17") //休学、参军入伍保存部分基础数据 StuTransferInfo数据?
                                 {
                                     upTrua.NationalityNo = stulist.NationalityNo;
                                     upTrua.Province = stulist.F_ProvinceId;
@@ -967,7 +968,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     //    changeEntity.Create();
                     //    db.Insert(changeEntity);
                     //}
-                    if (upTrua.AnomalousType != "04" && upTrua.AnomalousType != "05" && upTrua.AnomalousType != "06" && upTrua.AnomalousType != "10" && upTrua.AnomalousType != "11" && upTrua.AnomalousType != "12" && upTrua.AnomalousType != "13" && upTrua.AnomalousType != "14")
+                    if (upTrua.AnomalousType != "04" && upTrua.AnomalousType != "05" && upTrua.AnomalousType != "06" && upTrua.AnomalousType != "10" && upTrua.AnomalousType != "11" && upTrua.AnomalousType != "12" && upTrua.AnomalousType != "13" && upTrua.AnomalousType != "14" && upTrua.AnomalousType != "17")
                     {
                         var tableInfos = this.BaseRepository("CollegeMIS").FindTable(
                                                        @"SELECT t.[name] AS 表名,c.[name] AS 字段名,cast(ep.[value]