Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

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

@@ -100,8 +100,8 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                 }
             }
             
-            //职业资格证书（-表中无学年学期字段？？？待增加 todo:）
-            entity.StudentCertificateList = studentCertificateIBLL.GetList(entity.StuNo).OrderByDescending(x => x.CreateTime).ToList();
+            //职业资格证书
+            entity.StudentCertificateList = studentCertificateIBLL.GetList("{\"AcademicYearNo\":\"" + entity.AcademicYearNo + "\",\"Semester\":\"" + entity.Semester + "\",\"StuNo\":\"" + entity.StuNo + "\"}").OrderByDescending(x => x.CreateTime).ToList();
             //奖罚情况
             entity.StuEncourgementList = stuEncourgementIBLL.GetEncourgementListByStuNo(entity.AcademicYearNo, entity.Semester, entity.StuNo).ToList();
             entity.StuPunishmentList = stuPunishmentIBLL.GetPunishmentListByStuNo(entity.AcademicYearNo, entity.Semester, entity.StuNo).ToList();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ScoreCheckInfo/RecordTablePrint.cshtml

@@ -20,7 +20,7 @@
         <button id="print">打印表格</button>
     </div>
     <div class="table-page">
-        <h1 class="table-title">学生成绩考核记载表（ @Model.AcademicYearNo 学年，第 @Model.Semester 学期）</h1>
+        <h1 class="table-title">学生成绩考核记载表（<span>@Model.AcademicYearNo</span>学年，第<span>@Model.Semester</span>学期）</h1>
         <table id="table" border="1" cellspacing="0" cellpadding="10" width="100%" align="center">
             @{
                 var scoreList = Model.StuScoreList as IEnumerable<StuScoreEntity>;

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

@@ -3,49 +3,57 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-12 lr-form-item"  data-table="StudentCertificate" >
+    <div class="col-xs-12 lr-form-item" data-table="StudentCertificate">
+        <div class="lr-form-item-title">学年<font face="宋体">*</font></div>
+        <div id="AcademicYearNo" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="StudentCertificate">
+        <div class="lr-form-item-title">学期<font face="宋体">*</font></div>
+        <div id="Semester"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="StudentCertificate">
         <div class="lr-form-item-title">学生学号<font face="宋体">*</font></div>
         <input id="StuNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="StudentCertificate" >
+    <div class="col-xs-12 lr-form-item" data-table="StudentCertificate">
         <div class="lr-form-item-title">学生姓名<font face="宋体">*</font></div>
         <input id="StuName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="StudentCertificate" >
+    <div class="col-xs-12 lr-form-item" data-table="StudentCertificate">
         <div class="lr-form-item-title">专业部<font face="宋体">*</font></div>
-        <div id="DeptNo" isvalid="yes" checkexpession="NotNull" readonly ></div>
+        <div id="DeptNo" isvalid="yes" checkexpession="NotNull" readonly></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="StudentCertificate" >
+    <div class="col-xs-12 lr-form-item" data-table="StudentCertificate">
         <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
-        <div id="MajorNo" isvalid="yes" checkexpession="NotNull" readonly ></div>
+        <div id="MajorNo" isvalid="yes" checkexpession="NotNull" readonly></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="StudentCertificate" >
+    <div class="col-xs-12 lr-form-item" data-table="StudentCertificate">
         <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
-        <div id="ClassNo" isvalid="yes" checkexpession="NotNull" readonly ></div>
+        <div id="ClassNo" isvalid="yes" checkexpession="NotNull" readonly></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="StudentCertificate" >
+    <div class="col-xs-12 lr-form-item" data-table="StudentCertificate">
         <div class="lr-form-item-title">证书名称<font face="宋体">*</font></div>
         <input id="SCName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="StudentCertificate" >
+    <div class="col-xs-12 lr-form-item" data-table="StudentCertificate">
         <div class="lr-form-item-title">证书级别<font face="宋体">*</font></div>
         <input id="SCLevel" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="StudentCertificate" >
+    <div class="col-xs-12 lr-form-item" data-table="StudentCertificate">
         <div class="lr-form-item-title">证书种类<font face="宋体">*</font></div>
         <input id="SCType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="StudentCertificate" >
+    <div class="col-xs-12 lr-form-item" data-table="StudentCertificate">
         <div class="lr-form-item-title">分值<font face="宋体">*</font></div>
         <input id="SCScore" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="StudentCertificate" >
+    <div class="col-xs-12 lr-form-item" data-table="StudentCertificate">
         <div class="lr-form-item-title">获取时间<font face="宋体">*</font></div>
-        <input id="SCTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#SCTime').trigger('change'); } })"  isvalid="yes" checkexpession="NotNull" />
+        <input id="SCTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#SCTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="StudentCertificate" >
+    <div class="col-xs-12 lr-form-item" data-table="StudentCertificate">
         <div class="lr-form-item-title">附件上传</div>
-        <div id="SCUrl"  ></div>
+        <div id="SCUrl"></div>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StudentCertificate/Form.js")

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

@@ -43,6 +43,22 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            //学年
+            $('#AcademicYearNo').lrselect({
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
+                value: 'value',
+                text: 'text'
+            });
+            //学期
+            $('#Semester').lrselect({
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester',
+                value: 'value',
+                text: 'text'
+            });
             $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });

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

@@ -10,6 +10,14 @@
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学年</div>
+                                    <div id="AcademicYearNo"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学期</div>
+                                    <div id="Semester"></div>
+                                </div>
                                 <div class="col-xs-6 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/StudentCertificate/Index.js

@@ -20,6 +20,22 @@ var bootstrap = function ($, learun) {
             $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
+            //学年
+            $('#AcademicYearNo').lrselect({
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
+                value: 'value',
+                text: 'text'
+            });
+            //学期
+            $('#Semester').lrselect({
+                placeholder: "请选择学期",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester',
+                value: 'value',
+                text: 'text'
+            });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -30,8 +46,8 @@ var bootstrap = function ($, learun) {
                     id: 'form',
                     title: '新增',
                     url: top.$.rootUrl + '/EducationalAdministration/StudentCertificate/Form',
-                    width: 720,
-                    height: 550,
+                    width: 800,
+                    height: 600,
                     callBack: function (id) {
                         var res = false;
                         // 验证数据
@@ -53,8 +69,8 @@ var bootstrap = function ($, learun) {
                         id: 'form',
                         title: '编辑',
                         url: top.$.rootUrl + '/EducationalAdministration/StudentCertificate/Form?keyValue=' + keyValue,
-                        width: 720,
-                        height: 550,
+                        width: 800,
+                        height: 600,
                         callBack: function (id) {
                             var res = false;
                             // 验证数据
@@ -164,6 +180,8 @@ var bootstrap = function ($, learun) {
             $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/StudentCertificate/GetPageList',
                 headData: [
+                    { label: "学年", name: "AcademicYearNo", width: 80, align: "left" },
+                    { label: "学期", name: "Semester", width: 80, align: "left" },
                     { label: "学生学号", name: "StuNo", width: 150, align: "left" },
                     { label: "学生姓名", name: "StuName", width: 100, align: "left" },
                     {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ScoreCheckInfo/ScoreCheckInfoService.cs

@@ -31,7 +31,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             {
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
-                strSql.Append(@" * ");
+                strSql.Append(@" t.* ");
                 strSql.Append("  FROM ScoreCheckInfo t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StudentCertificate/StudentCertificateBLL.cs

@@ -71,11 +71,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// 获取页面显示列表数据
         /// </summary>
         /// <returns></returns>
-        public IEnumerable<StudentCertificateEntity> GetList(string stuNo)
+        public IEnumerable<StudentCertificateEntity> GetList(string queryJson)
         {
             try
             {
-                return studentCertificateService.GetList(stuNo);
+                return studentCertificateService.GetList(queryJson);
 
             }
             catch (Exception ex)

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StudentCertificate/StudentCertificateEntity.cs

@@ -94,6 +94,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("STATUS")]
         public int? Status { get; set; }
+        /// <summary>
+        /// 学年
+        /// </summary>
+        [Column("ACADEMICYEARNO")]
+        public string AcademicYearNo { get; set; }
+        /// <summary>
+        /// 学期
+        /// </summary>
+        [Column("SEMESTER")]
+        public string Semester { get; set; }
         #endregion
 
         #region 扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StudentCertificate/StudentCertificateIBLL.cs

@@ -33,7 +33,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// 获取页面显示列表数据
         /// </summary>
         /// <returns></returns>
-        IEnumerable<StudentCertificateEntity> GetList(string stuNo);
+        IEnumerable<StudentCertificateEntity> GetList(string queryJson);
         /// <summary>
         /// 获取主表实体数据
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StudentCertificate/StudentCertificateService.cs

@@ -146,12 +146,40 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// 获取页面显示列表数据
         /// </summary>
         /// <returns></returns>
-        public IEnumerable<StudentCertificateEntity> GetList(string stuNo)
+        public IEnumerable<StudentCertificateEntity> GetList(string queryJson)
         {
             try
             {
-                return this.BaseRepository("CollegeMIS").FindList<StudentCertificateEntity>(x => x.StuNo == stuNo && x.Status==2);
-                
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.* ");
+                strSql.Append("  FROM StudentCertificate t ");
+                strSql.Append("  WHERE 1=1 and t.Status=2 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["StuNo"].IsEmpty())
+                {
+                    dp.Add("StuNo", queryParam["StuNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.StuNo = @StuNo ");
+                }
+                if (!queryParam["StuName"].IsEmpty())
+                {
+                    dp.Add("StuName", "%" + queryParam["StuName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.StuName Like @StuName ");
+                }
+                if (!queryParam["AcademicYearNo"].IsEmpty())
+                {
+                    dp.Add("AcademicYearNo", queryParam["AcademicYearNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.AcademicYearNo = @AcademicYearNo ");
+                }
+                if (!queryParam["Semester"].IsEmpty())
+                {
+                    dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Semester = @Semester ");
+                }
+
+                return this.BaseRepository("CollegeMIS").FindList<StudentCertificateEntity>(strSql.ToString(), dp);
+
             }
             catch (Exception ex)
             {