Merge branch 'master' of 123.57.209.16:bjquanjiang/DigitalScholl

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

@@ -34,6 +34,10 @@
         <div class="lr-form-item-title">性别<font face="宋体">*</font></div>
         <div id="Gender" isvalid="yes" checkexpession="NotNull"></div>
     </div>
+    <div class="col-xs-4 lr-form-item" data-table="StuEnroll">
+        <div class="lr-form-item-title">年级<font face="宋体">*</font></div>
+        <input id="Grade" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
     <div class="col-xs-4 lr-form-item" data-table="StuEnroll">
         <div class="lr-form-item-title">招生类别<font face="宋体">*</font></div>
         <div id="EnrollType" isvalid="yes" checkexpession="NotNull"></div>

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

@@ -36,7 +36,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">录取方式</div>
-                                    <div id="EnrollType" class="form-control"></div>
+                                    <div id="Admissions" class="form-control"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <object id="CertCtl" type="application/cert-reader" width="0" height="0">

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

@@ -86,7 +86,7 @@ var bootstrap = function ($, learun) {
                 value: "classno",
                 text: "classname"
             });
-            $('#EnrollType').lrDataItemSelect({ code: 'EnrollStudentType' });
+            $('#Admissions').lrDataItemSelect({ code: 'enrollType' });
             //刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();

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

@@ -46,7 +46,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">录取方式</div>
-                                    <div id="EnrollType" class="form-control"></div>
+                                    <div id="Admissions" class="form-control"></div>
                                 </div>
                             </div>
                         </div>

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

@@ -22,7 +22,7 @@ var bootstrap = function ($, learun) {
                 value: "year",
                 text: "year",
             });
-            $('#EnrollType').lrDataItemSelect({ code: 'EnrollStudentType' });
+            $('#Admissions').lrDataItemSelect({ code: 'enrollType' });
 
 
             $('#DeptNo').lrselect({

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

@@ -126,6 +126,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("RegistrationNo", "%" + queryParam["RegistrationNo"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.RegistrationNo Like @RegistrationNo ");
                 }
+                if (!queryParam["Admissions"].IsEmpty())
+                {
+                    dp.Add("Admissions",   queryParam["Admissions"].ToString() , DbType.String);
+                    strSql.Append(" AND t.Admissions = @Admissions ");
+                }
                 if (!queryParam["DeptNo"].IsEmpty())
                 {
                     dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
@@ -814,6 +819,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String);
                     strSql.Append(" AND t.DeptNo = @DeptNo ");
                 }
+                if (!queryParam["Admissions"].IsEmpty())
+                {
+                    dp.Add("Admissions", queryParam["Admissions"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Admissions = @Admissions ");
+                }
                 if (!queryParam["Grade"].IsEmpty())
                 {
                     dp.Add("Grade", queryParam["Grade"].ToString(), DbType.String);