学生学籍变更需求

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs

@@ -392,14 +392,14 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             {
                 if (model != null)
                 {
-                    return Fail("学号已存在！");
+                    return Fail("学生编号已存在！");
                 }
             }
             else
             {
                 if (model != null && model.StuId != keyValue)
                 {
-                    return Fail("学号已存在！");
+                    return Fail("学生编号已存在！");
                 }
                 entity.SyncFlag = true;
                 //判断排课同步数据是否存在：若存在，清除同步数据；

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml

@@ -27,6 +27,14 @@
         <div class="lr-form-item-title">学号</div>
         <input id="ProvinceCode" type="text" class="form-control" />
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">国籍<font face="宋体">*</font></div>
+        <div id="CountryNo" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">身份证件类型<font face="宋体">*</font></div>
+        <div id="IdCardType" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">身份证号<font face="宋体">*</font></div>
         <input id="IdentityCardNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
@@ -59,6 +67,38 @@
         <div class="lr-form-item-title">出生日期<font face="宋体">*</font></div>
         <input id="Birthday" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#Birthday').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
+    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">学生来源</div>
+        <div id="StuOrigin" isvalid="yes"></div>
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">招生对象</div>
+        <div id="RecruitObject" isvalid="yes"></div>
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">招生方式</div>
+        <div id="RecruitWay" isvalid="yes"></div>
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">联招合作类型</div>
+        <div id="RecruitCooperateType" isvalid="yes"></div>
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">联招合作办学形式</div>
+        <div id="RecruitCooperateForm" isvalid="yes"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">联招学校代码</div>
+        <input id="RecruitCooperateSchoolNo" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">校外教学点</div>
+        <input id="SchoolOutsidePlace" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">入学方式<font face="宋体">*</font></div>
+        <div id="EntranceWay" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
     <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">入学年月<font face="宋体">*</font></div>
         <input id="EntranceDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#EntranceDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
@@ -139,6 +179,16 @@
         <div class="lr-form-item-title">年级<font face="宋体">*</font></div>
         <div id="Grade" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">专业方向</div>
+        <div id="MajorDetailNo" type="text" class="form-control"></div>
+    </div><div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">专业简称</div>
+        <input id="MajorDetailName" type="text" class="form-control" />
+    </div><div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">专业拼音全称</div>
+        <input id="MajorDetailSpell" type="text" class="form-control" />
+    </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">实习状态</div>
         <div id="InternshipStatus" type="text" class="form-control"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js

@@ -103,7 +103,7 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
-            $('#GuardianType').lrDataItemSelect({ code: 'GuardianType' });
+            $('#GuardianType').lrDataItemSelect({ code: 'GuardianType' }); 
             $('#HealthStatus').lrDataItemSelect({ code: 'QRCodeHealthStatus' });
             $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
             $('#NationalityNo').lrDataItemSelect({ code: 'National' });
@@ -178,8 +178,16 @@ var bootstrap = function ($, learun) {
             $('#FiveYear').lrDataItemSelect({ code: 'PieceCultivateWay' });
             $('#InternshipStatus').lrDataItemSelect({ code: 'InternshipStatus' });
             $('#IsRestudy').lrDataItemSelect({ code: 'YesOrNoInt' });
-
-        },
+            $('#IdCardType').lrDataItemSelect({ code: 'IdCardType' });
+            $('#RecruitObject').lrDataItemSelect({ code: 'RecruitObject' }); 
+            $('#RecruitWay').lrDataItemSelect({ code: 'RecruitWay' }); 
+            $('#RecruitCooperateType').lrDataItemSelect({ code: 'RecruitCooperateType' }); 
+            $('#StuOrigin').lrDataItemSelect({ code: 'AdmissionsDataSource' }); 
+            $('#EntranceWay').lrDataItemSelect({ code: 'EntranceWay' }); 
+            $('#RecruitCooperateForm').lrDataItemSelect({ code: 'RecruitCooperateForm' }); 
+            $('#MajorDetailNo').lrDataItemSelect({ code: 'MajorDetail' }); 
+            $('#CountryNo').lrDataItemSelect({ code: 'Nationality' }); 
+             }, 
         initData: function () {
             if (!!keyValue) {
                 $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetFormData?keyValue=' + keyValue, function (data) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml

@@ -27,6 +27,14 @@
         <div class="lr-form-item-title">学号</div>
         <input id="ProvinceCode" type="text" class="form-control" />
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">国籍<font face="宋体">*</font></div>
+        <div id="CountryNo" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">身份证件类型<font face="宋体">*</font></div>
+        <div id="IdCardType" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">身份证号<font face="宋体">*</font></div>
         <input id="IdentityCardNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
@@ -59,6 +67,38 @@
         <div class="lr-form-item-title">出生日期<font face="宋体">*</font></div>
         <input id="Birthday" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#Birthday').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
+    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">学生来源</div>
+        <div id="StuOrigin" isvalid="yes"></div>
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">招生对象</div>
+        <div id="RecruitObject" isvalid="yes"></div>
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">招生方式</div>
+        <div id="RecruitWay" isvalid="yes"></div>
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">联招合作类型</div>
+        <div id="RecruitCooperateType" isvalid="yes"></div>
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">联招合作办学形式</div>
+        <div id="RecruitCooperateForm" isvalid="yes"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">联招学校代码</div>
+        <input id="RecruitCooperateSchoolNo" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">校外教学点</div>
+        <input id="SchoolOutsidePlace" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">入学方式<font face="宋体">*</font></div>
+        <div id="EntranceWay" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
     <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">入学年月<font face="宋体">*</font></div>
         <input id="EntranceDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#EntranceDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
@@ -139,6 +179,16 @@
         <div class="lr-form-item-title">年级<font face="宋体">*</font></div>
         <div id="Grade" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">专业方向</div>
+        <div id="MajorDetailNo" type="text" class="form-control"></div>
+    </div><div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">专业简称</div>
+        <input id="MajorDetailName" type="text" class="form-control" />
+    </div><div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">专业拼音全称</div>
+        <input id="MajorDetailSpell" type="text" class="form-control" />
+    </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">实习状态</div>
         <div id="InternshipStatus" type="text" class="form-control"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.js

@@ -178,6 +178,15 @@ var bootstrap = function ($, learun) {
             $('#FiveYear').lrDataItemSelect({ code: 'PieceCultivateWay' });
             $('#InternshipStatus').lrDataItemSelect({ code: 'InternshipStatus' });
             $('#IsRestudy').lrDataItemSelect({ code: 'YesOrNoInt' });
+            $('#IdCardType').lrDataItemSelect({ code: 'IdCardType' });
+            $('#RecruitObject').lrDataItemSelect({ code: 'RecruitObject' });
+            $('#RecruitWay').lrDataItemSelect({ code: 'RecruitWay' });
+            $('#RecruitCooperateType').lrDataItemSelect({ code: 'RecruitCooperateType' });
+            $('#StuOrigin').lrDataItemSelect({ code: 'AdmissionsDataSource' });
+            $('#EntranceWay').lrDataItemSelect({ code: 'EntranceWay' });
+            $('#RecruitCooperateForm').lrDataItemSelect({ code: 'RecruitCooperateForm' });
+            $('#MajorDetailNo').lrDataItemSelect({ code: 'MajorDetail' });
+            $('#CountryNo').lrDataItemSelect({ code: 'Nationality' });
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs

@@ -70,6 +70,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("MAJORDETAILNAME")]
         public string MajorDetailName { get; set; }
         /// <summary>
+        /// 专业拼音全称
+        /// </summary>
+        [Column("MAJORDETAILSPELL")]
+        public string MajorDetailSpell { get; set; }
+        /// <summary>
         /// 年级
         /// </summary>
         [Column("GRADE")]