Merge branch '塔里木分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollFormView.cshtml

@@ -89,6 +89,10 @@
         <div class="lr-form-item-title">是否录取</div>
         <div id="IsAdmission"></div>
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuEnroll">
+        <div class="lr-form-item-title">是否住校</div>
+        <div id="zusu"></div>
+    </div>
     <div class="col-xs-12 lr-form-item"  data-table="StuEnroll">
         <div class="lr-form-item-title">备注</div>
         <textarea id="Remark" class="form-control" style="height:100px;"  ></textarea>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollFormView.js

@@ -24,6 +24,10 @@ var bootstrap = function ($, learun) {
                 type: 'radio',
                 code: 'YesOrNoBit',
             });
+            $('#zusu').lrRadioCheckbox({
+                type: 'radio',
+                code: 'YesOrNoBit',
+            });
             $('#IdCardPto1').lrUploader({ isUpload: false });
             $('#IdCardPto2').lrUploader({ isUpload: false });
             $('#MidDiplomaPto').lrUploader({ isUpload: false });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollIndex.js

@@ -270,6 +270,18 @@ var bootstrap = function ($, learun) {
                             }
                         }
                     },
+                    {
+                        label: "是否住校", name: "zusu", width: 100, align: "left",
+                        formatter: function (value) {
+                            if (value == true) {
+                                return "<span class=\"label label-success\">是</span>";
+                            } else if (value == false) {
+                                return "<span class=\"label label-danger\">否</span>";
+                            } else {
+                                return "";
+                            }
+                        }
+                    }
                 ],
                 //isMultiselect: true,
                 mainId: 'StuId',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionIndex.js

@@ -178,6 +178,18 @@ var bootstrap = function ($, learun) {
                             }
                         }
                     },
+                    {
+                        label: "是否住校", name: "zusu", width: 100, align: "left",
+                        formatter: function (value) {
+                            if (value == true) {
+                                return "<span class=\"label label-success\">是</span>";
+                            } else if (value == false) {
+                                return "<span class=\"label label-danger\">否</span>";
+                            } else {
+                                return "";
+                            }
+                        }
+                    }
                 ],
                 //isMultiselect: true,
                 mainId: 'StuId',

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollEntity.cs

@@ -259,6 +259,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("REMARK")]
         public string Remark { get; set; }
+
+        [Column("ZUSU")]
+        public bool? zusu { get; set; }
         /// <summary>
         /// 班级
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs

@@ -98,7 +98,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 t.DeptNo,
                 t.Grade,
                 t.THROUGHPROJECT,
-                t.Status,t.StuMobile,t.Specialty,t.City,t.County,t.EmpNo,t.IsAdmission,t.EnrollStatus,t.MidTermExam
+                t.Status,t.StuMobile,t.Specialty,t.City,t.County,t.EmpNo,t.IsAdmission,t.EnrollStatus,t.MidTermExam,t.zusu
                 ");
                 strSql.Append("  FROM StuEnroll t ");
                 strSql.Append("  WHERE 1=1 ");