学生学籍导出

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

@@ -63,8 +63,8 @@
                                     <div id="EduSystem"></div>
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">身体状态</div>
-                                    <div id="HealthStatus"></div>
+                                    <div class="lr-form-item-title">健康状况</div>
+                                    <div id="HealthStatusNo"></div>
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">学习形式</div>

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

@@ -128,7 +128,7 @@ var bootstrap = function ($, learun) {
             $('#CheckMark').lrselect({ data: [{ id: '1', text: '已审核' }, { id: '0', text: '未审核' }] });
             $('#PartyFaceNo').lrDataItemSelect({ code: 'PolityStatus' });
             $('#EduSystem').lrDataItemSelect({ code: 'EduSystem' });
-            $('#HealthStatus').lrDataItemSelect({ code: 'QRCodeHealthStatus' });
+            $('#HealthStatusNo').lrDataItemSelect({ code: 'StuHealthType' });
             $('#StudyModality').lrDataItemSelect({ code: 'StudyModality' });
             $('#Photo').lrselect({ data: [{ id: '1', text: '是' }, { id: '0', text: '否' }] });
 
@@ -487,7 +487,8 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "学制", name: "EduSystem", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                        label: "学制", name: "EduSystem", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
                                 code: 'EduSystem',
@@ -496,18 +497,7 @@ var bootstrap = function ($, learun) {
                                 }
                             });
                         }
-                    },
-                    {
-                        label: "身体状态", name: "HealthStatus", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'QRCodeHealthStatus',
-                                callback: function (_data) {
-                                    callback(_data.text);
-                                }
-                            });
-                        }
-                    },
+                    },                    
                     {
                         label: "学习形式", name: "StudyModality", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
@@ -550,12 +540,6 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    //{
-                    //    label: "异动状态", name: "AbmormityMoveMark", width: 80, align: "center",
-                    //    formatter: function (cellvalue) {
-                    //        return cellvalue == "1" ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
-                    //    }
-                    //},
                     {
                         label: "是否上传头像", name: "Photo", width: 80, align: "center",
                         formatter: function (cellvalue) {
@@ -566,10 +550,21 @@ var bootstrap = function ($, learun) {
                             }
                         }
                     },
-                    { label: "拼音", name: "SpellFull", width: 100, align: "left", ishide: true },
-                    { label: "就读方式", name: "StudyingWay", width: 100, align: "left", ishide: true },
+                    { label: "拼音", name: "SpellFull", width: 100, align: "left", ishide: false },
+                    {
+                        label: "就读方式", name: "StudyingWay", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'BCdCountry',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
                     {
-                        label: "国籍", name: "CountryNo", width: 100, align: "left", ishide: true,
+                        label: "国籍", name: "CountryNo", width: 100, align: "left", 
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
@@ -581,7 +576,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "港澳台侨外", name: "OverseasChineseNo", width: 100, align: "left", ishide: true,
+                        label: "港澳台侨外", name: "OverseasChineseNo", width: 100, align: "left", ishide: false,
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
@@ -593,7 +588,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "婚姻状况", name: "MarriageStatus", width: 100, align: "left", ishide: true,
+                        label: "婚姻状况", name: "MarriageStatus", width: 100, align: "left", ishide: false,
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
@@ -604,20 +599,19 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "乘火车区间", name: "TrainInterval", width: 100, align: "left", ishide: true, },
-                    { label: "是否随迁子女", name: "IsTrailChildren", width: 100, align: "left", ishide: true, },
-                    { label: "生源地行政区划码", name: "StuPlaceCode", width: 100, align: "left", ishide: true, },
-                    { label: "出生地行政区划码", name: "BirthPlaceCode", width: 100, align: "left", ishide: true, },
-                    { label: "籍贯地行政区划码", name: "NativePlaceCode", width: 100, align: "left", ishide: true, },
-                    { label: "所属派出所", name: "BelongPolice", width: 100, align: "left", ishide: true, },
-                    { label: "户口所在地行政区划码", name: "ResidencePlaceCode", width: 100, align: "left", ishide: true, },
-                    { label: "是否农户", name: "ResidenceNo", width: 100, align: "left", ishide: true, },
+                    { label: "乘火车区间", name: "TrainInterval", width: 100, align: "left", ishide: false, },
+                    { label: "是否随迁子女", name: "IsTrailChildren", width: 100, align: "left", ishide: false, },
+                    { label: "生源地行政区划码", name: "StuPlaceCode", width: 100, align: "left", ishide: false, },
+                    { label: "出生地行政区划码", name: "BirthPlaceCode", width: 100, align: "left", ishide: false, },
+                    { label: "籍贯地行政区划码", name: "NativePlaceCode", width: 100, align: "left", ishide: false, },
+                    { label: "所属派出所", name: "BelongPolice", width: 100, align: "left", ishide: false, },
+                    { label: "户口所在地行政区划码", name: "ResidencePlaceCode", width: 100, align: "left", ishide: false, },
                     {
-                        label: "学生居住地类型", name: "StuLivePlaceType", width: 100, align: "left", ishide: true,
+                        label: "是否农户", name: "ResidenceNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'StuLivePlaceType',
+                                code: 'YesOrNoInt',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }
@@ -625,7 +619,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "健康状况", name: "HealthStatusNo", width: 100, align: "left", ishide: true,
+                        label: "健康状况", name: "HealthStatusNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
@@ -636,11 +630,20 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "学生来源", name: "StuOrigin", width: 100, align: "left", ishide: true, },
-                    { label: "招生对象", name: "RecruitObject", width: 100, align: "left", ishide: true, },
-                    { label: "贫困户否建档立卡贫困户", name: "PoorIsRecord", width: 100, align: "left", ishide: true, },
                     {
-                        label: "招生方式", name: "RecruitWay", width: 100, align: "left", ishide: true,
+                        label: "招生对象", name: "RecruitObject", width: 100, align: "left",  
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'RecruitObject',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "招生方式", name: "RecruitWay", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
@@ -652,7 +655,22 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "联招合作类型", name: "RecruitCooperateType", width: 100, align: "left", ishide: true,
+                        label: "联招合作类型", name: "RecruitCooperateType", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'RecruitCooperateType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "准考证号", name: "AdmissionNo", width: 100, align: "left", ishide: false, },
+                    { label: "考生号", name: "ksh", width: 100, align: "left", ishide: false, },
+                    { label: "考试总分", name: "ExamScore", width: 100, align: "left", ishide: false, },
+                    {
+                        label: "联招合作办学形式", name: "RecruitCooperateForm", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
@@ -663,19 +681,15 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "准考证号", name: "AdmissionNo", width: 100, align: "left", ishide: true, },
-                    { label: "考生号", name: "ksh", width: 100, align: "left", ishide: true, },
-                    { label: "考试总分", name: "ExamScore", width: 100, align: "left", ishide: true, },
-                    { label: "联招合作办学形式", name: "RecruitCooperateForm", width: 100, align: "left", ishide: true, },
-                    { label: "联招合作学校代码", name: "RecruitCooperateSchoolNo", width: 100, align: "left", ishide: true, },
-                    { label: "校外教学点", name: "SchoolOutsidePlace", width: 100, align: "left", ishide: true, },
-                    { label: "英文姓名", name: "EnglishName", width: 100, align: "left", ishide: true, },
-                    { label: "家庭邮政编码", name: "PostalCode", width: 100, align: "left", ishide: true, },
-                    { label: "其他联系方式", name: "OtherContact", width: 100, align: "left", ishide: true, },
-                    { label: "成员1姓名", name: "OneName", width: 100, align: "left", ishide: true, },
-                    { label: "成员1联系电话", name: "OneMobile", width: 100, align: "left", ishide: true },
+                    { label: "联招合作学校代码", name: "RecruitCooperateSchoolNo", width: 100, align: "left", ishide: false, },
+                    { label: "校外教学点", name: "SchoolOutsidePlace", width: 100, align: "left", ishide: false, },
+                    { label: "英文姓名", name: "EnglishName", width: 100, align: "left", ishide: false, },
+                    { label: "家庭邮政编码", name: "PostalCode", width: 100, align: "left", ishide: false, },
+                    { label: "其他联系方式", name: "OtherContact", width: 100, align: "left", ishide: false, },
+                    { label: "成员1姓名", name: "OneName", width: 100, align: "left", ishide: false, },
+                    { label: "成员1联系电话", name: "OneMobile", width: 100, align: "left", ishide: false },
                     {
-                        label: "成员1关系", name: "OneMembership", width: 100, align: "left", ishide: true,
+                        label: "成员1关系", name: "OneMembership", width: 100, align: "left", ishide: false,
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
@@ -686,15 +700,15 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "成员1是否监护人", name: "OneIsGuardian", width: 100, align: "left", ishide: true, },
+                    { label: "成员1是否监护人", name: "OneIsGuardian", width: 100, align: "left", ishide: false, },
                     {
-                        label: "成员1出生年月", name: "OneBirthday", width: 100, align: "left", ishide: true,
+                        label: "成员1出生年月", name: "OneBirthday", width: 100, align: "left", ishide: false,
                         formatter: function (value) {
                             return learun.formatDate(value, 'yyyy-MM-dd');
                         }
                     },
                     {
-                        label: "成员1身份证件类型", name: "OneIdCardType", width: 100, align: "left", ishide: true,
+                        label: "成员1身份证件类型", name: "OneIdCardType", width: 100, align: "left", ishide: false,
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
@@ -705,9 +719,9 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "成员1身份证件号", name: "OneIdCardNo", width: 100, align: "left", ishide: true, },
+                    { label: "成员1身份证件号", name: "OneIdCardNo", width: 100, align: "left", ishide: false, },
                     {
-                        label: "成员1民族", name: "OneNationalityNo", width: 100, align: "left", ishide: true,
+                        label: "成员1民族", name: "OneNationalityNo", width: 100, align: "left", ishide: false,
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
@@ -719,7 +733,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "成员1健康状况", name: "OneHealthStatus", width: 100, align: "left", ishide: true,
+                        label: "成员1健康状况", name: "OneHealthStatus", width: 100, align: "left", ishide: false,
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
@@ -730,11 +744,11 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "成员1工作或学习单位", name: "OneJob", width: 100, align: "left", ishide: true, },
-                    { label: "成员2姓名", name: "TwoName", width: 100, align: "left", ishide: true, },
-                    { label: "成员2联系电话", name: "TwoMobile", width: 100, align: "left", ishide: true },
+                    { label: "成员1工作或学习单位", name: "OneJob", width: 100, align: "left", ishide: false, },
+                    { label: "成员2姓名", name: "TwoName", width: 100, align: "left", ishide: false, },
+                    { label: "成员2联系电话", name: "TwoMobile", width: 100, align: "left", ishide: false },
                     {
-                        label: "成员2关系", name: "TwoMembership", width: 100, align: "left", ishide: true,
+                        label: "成员2关系", name: "TwoMembership", width: 100, align: "left", ishide: false,
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
@@ -745,15 +759,15 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "成员2是否监护人", name: "TwoIsGuardian", width: 100, align: "left", ishide: true, },
+                    { label: "成员2是否监护人", name: "TwoIsGuardian", width: 100, align: "left", ishide: false, },
                     {
-                        label: "成员2出生年月", name: "TwoBirthday", width: 100, align: "left", ishide: true,
+                        label: "成员2出生年月", name: "TwoBirthday", width: 100, align: "left", ishide: false,
                         formatter: function (value) {
                             return learun.formatDate(value, 'yyyy-MM-dd');
                         }
                     },
                     {
-                        label: "成员2身份证件类型", name: "TwoIdCardType", width: 100, align: "left", ishide: true,
+                        label: "成员2身份证件类型", name: "TwoIdCardType", width: 100, align: "left", ishide: false,
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
@@ -764,9 +778,9 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "成员2身份证件号", name: "TwoIdCardNo", width: 100, align: "left", ishide: true, },
+                    { label: "成员2身份证件号", name: "TwoIdCardNo", width: 100, align: "left", ishide: false, },
                     {
-                        label: "成员2民族", name: "TwoNationalityNo", width: 100, align: "left", ishide: true,
+                        label: "成员2民族", name: "TwoNationalityNo", width: 100, align: "left", ishide: false,
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
@@ -778,7 +792,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "成员2健康状况", name: "TwoHealthStatus", width: 100, align: "left", ishide: true,
+                        label: "成员2健康状况", name: "TwoHealthStatus", width: 100, align: "left", ishide: false,
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
@@ -789,8 +803,8 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "成员2工作或学习单位", name: "TwoJob", width: 100, align: "left", ishide: true, },
-                    { label: "成员2职务", name: "TwoPosition", width: 100, align: "left", ishide: true, },
+                    { label: "成员2工作或学习单位", name: "TwoJob", width: 100, align: "left", ishide: false, },
+                    { label: "成员2职务", name: "TwoPosition", width: 100, align: "left", ishide: false, },
 
                 ],
                 mainId: 'StuId',

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

@@ -146,6 +146,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("HealthStatus", "" + queryParam["HealthStatus"].ToString() + "", DbType.String);
                     strSql.Append(" AND t.HealthStatus = @HealthStatus ");
                 }
+                if (!queryParam["HealthStatusNo"].IsEmpty())
+                {
+                    dp.Add("HealthStatusNo", "" + queryParam["HealthStatusNo"].ToString() + "", DbType.String);
+                    strSql.Append(" AND t.HealthStatusNo = @HealthStatusNo ");
+                }
                 if (!queryParam["StudyModality"].IsEmpty())
                 {
                     dp.Add("StudyModality", "" + queryParam["StudyModality"].ToString() + "", DbType.String);