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

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

@@ -18,10 +18,14 @@
                                     <div class="lr-form-item-title">学期</div>
                                     <div id="Semester"></div>
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
+                                <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">班级</div>
                                     <div id="ClassNo"></div>
                                 </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">年级</div>
+                                    <input id="Grade" type="text" class="form-control" />
+                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">学生学号</div>
                                     <input id="StuNo" type="text" class="form-control" />

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

@@ -13,10 +13,10 @@
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
-                        <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;录入</a>
+                        @*<a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;录入</a>*@
                         <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
-                        <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                        @*<a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>*@
                     </div>
                 </div>
             </div>

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

@@ -82,8 +82,9 @@ var bootstrap = function ($, learun) {
                                 return '微信快捷登录PC端';
                             } else if (val == 'modifypwdtip') {
                                 return '30天未修改密码登录后提示修改';
+                            }else if (val == 'modifypwdfirstday') {
+                                return '每月1日强制修改密码';
                             }
-
                         }
                     },
                     {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentService.cs

@@ -54,6 +54,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("ClassNo", queryParam["ClassNo"].ToString(), DbType.String);
                     strSql.Append(" AND t.ClassNo = @ClassNo ");
                 }
+                if (!queryParam["Grade"].IsEmpty())
+                {
+                    dp.Add("Grade", queryParam["Grade"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Grade = @Grade ");
+                }
                 if (!queryParam["StuNo"].IsEmpty())
                 {
                     dp.Add("StuNo", "%" + queryParam["StuNo"].ToString() + "%", DbType.String);

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachSwitch/TeachSwitchService.cs

@@ -72,6 +72,26 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     jsEntity.Create();
                     this.BaseRepository().Insert(jsEntity);
                 }
+                if (!data.Any(a => a.type == "modifypwdfirstday"))
+                {
+                    var jsEntity = new TeachSwitchEntity()
+                    {
+                        status = "0",
+                        type = "modifypwdfirstday"
+                    };
+                    jsEntity.Create();
+                    this.BaseRepository().Insert(jsEntity);
+                }
+                if (!data.Any(a => a.type == "modifypwdtip"))
+                {
+                    var jsEntity = new TeachSwitchEntity()
+                    {
+                        status = "0",
+                        type = "modifypwdtip"
+                    };
+                    jsEntity.Create();
+                    this.BaseRepository().Insert(jsEntity);
+                }
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
                 strSql.Append(@"