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

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

@@ -7,24 +7,23 @@
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
             <div class="lr-layout-tool">
                 <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="datesearch"></div>
+                    </div>
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">学号</div>
-                                    <input id="StuNo" type="text" class="form-control" />
+                                    <input id="StuNo" type="text" class="form-control"/>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">姓名</div>
-                                    <input id="StuName" type="text" class="form-control" />
+                                    <input id="StuName" type="text" class="form-control"/>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">奖励名称</div>
-                                    <input id="EncourgeName" type="text" class="form-control" />
-                                </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">奖励日期</div>
-                                    <input id="EncourgeDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy/MM/dd' })" />
+                                    <input id="EncourgeName" type="text" class="form-control"/>
                                 </div>
                             </div>
                         </div>

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

@@ -7,15 +7,44 @@
 var refreshGirdData;
 var bootstrap = function ($, learun) {
     "use strict";
+    var startTime;
+    var endTime;
     var page = {
         init: function () {
             page.initGird();
             page.bind();
         },
         bind: function () {
+            // 时间搜索框
+            $('#datesearch').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '3',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+            });
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 300, 400);
+            }, 200, 400);
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -68,12 +97,12 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/StuEncourgement/GetPageList',
                 headData: [
-                    { label: "学号", name: "StuNo", width: 100, align: "left"},
-                    { label: "姓名", name: "StuName", width: 100, align: "left"},
-                    { label: "奖励名称", name: "EncourgeName", width: 100, align: "left"},
-                    { label: "奖励原因", name: "Reason", width: 100, align: "left"},
-                    { label: "奖励金额", name: "Fee", width: 100, align: "left"},
-                    { label: "奖励日期", name: "EncourgeDate", width: 100, align: "left"},
+                    { label: "学号", name: "StuNo", width: 200, align: "left"},
+                    { label: "姓名", name: "StuName", width: 200, align: "left"},
+                    { label: "奖励名称", name: "EncourgeName", width: 200, align: "left"},
+                    { label: "奖励原因", name: "Reason", width: 200, align: "left"},
+                    { label: "奖励金额", name: "Fee", width: 200, align: "left"},
+                    { label: "奖励日期", name: "EncourgeDate", width: 200, align: "left"},
                 ],
                 mainId:'ID',
                 isPage: true
@@ -82,6 +111,8 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            param.StartTime = startTime;
+            param.EndTime = endTime;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };

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

@@ -7,6 +7,9 @@
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
             <div class="lr-layout-tool">
                 <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="datesearch"></div>
+                    </div>
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
@@ -22,10 +25,6 @@
                                     <div class="lr-form-item-title">处分名称</div>
                                     <div id="PunishNo"></div>
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">处分日期</div>
-                                    <input id="PunishDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy/MM/dd' })" />
-                                </div>
                             </div>
                         </div>
                     </div>

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

@@ -7,15 +7,44 @@
 var refreshGirdData;
 var bootstrap = function ($, learun) {
     "use strict";
+    var startTime;
+    var endTime;
     var page = {
         init: function () {
             page.initGird();
             page.bind();
         },
         bind: function () {
+            // 时间搜索框
+            $('#datesearch').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '3',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+            });
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 300, 400);
+            }, 200, 400);
             $('#PunishNo').lrDataItemSelect({ code: 'Punishment' });
             
             // 刷新
@@ -137,6 +166,8 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            param.StartTime = startTime;
+            param.EndTime = endTime;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/APStuHealthRecords/Form.cshtml

@@ -3,25 +3,25 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap">
-    <div class="col-xs-12 lr-form-item"  data-table="APStuHealthRecords" >
-        <div class="lr-form-item-title">系</div>
-        <div id="DeptNo"  ></div>
+    <div class="col-xs-12 lr-form-item" data-table="APStuHealthRecords">
+        <div class="lr-form-item-title">系<font face="宋体">*</font></div>
+        <div id="DeptNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="APStuHealthRecords" >
-        <div class="lr-form-item-title">专业</div>
-        <div id="MajorNo"  ></div>
+    <div class="col-xs-12 lr-form-item" data-table="APStuHealthRecords">
+        <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
+        <div id="MajorNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="APStuHealthRecords" >
-        <div class="lr-form-item-title">班级</div>
-        <div id="ClassNo"  ></div>
+    <div class="col-xs-12 lr-form-item" data-table="APStuHealthRecords">
+        <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
+        <div id="ClassNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="APStuHealthRecords" >
-        <div class="lr-form-item-title">学生</div>
-        <div id="Stuno"  ></div>
+    <div class="col-xs-12 lr-form-item" data-table="APStuHealthRecords">
+        <div class="lr-form-item-title">学生<font face="宋体">*</font></div>
+        <div id="Stuno" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="APStuHealthRecords" >
+    <div class="col-xs-12 lr-form-item" data-table="APStuHealthRecords">
         <div class="lr-form-item-title">描述</div>
-        <textarea id="Remark" class="form-control" style="height:100px;"  ></textarea>
+        <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/LogisticsManagement/Views/APStuHealthRecords/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs

@@ -89,7 +89,7 @@ namespace Learun.Application.WebApi.Modules
         public Response GetStuLessonInfo(dynamic _)
         {
             var param = this.GetReqData<TimeParameter>();
-            var lessonInfos = stuAttendanceIBLL.GetStuLessonInfo(userInfo.account,param.StartDate,param.EndDate);
+            var lessonInfos = stuAttendanceIBLL.GetStuLessonInfo(userInfo.account, param.StartDate, param.EndDate);
             var empNos = lessonInfos.Select(a => a.EmpNo).ToList();
             var lessonTerms = arrangeLessonTermIBLL.GetListByEmpNo(empNos);
 
@@ -223,10 +223,10 @@ namespace Learun.Application.WebApi.Modules
             else if (param.Description == "教师")
             {
                 //教师
-                var empInfo = empInfoIbll.GetAllList().Where(x => x.EmpNo == userInfo.account).FirstOrDefault().EmpNo;
+                var empInfo = empInfoIbll.GetAllList().Where(x => x.EmpNo == param.Account).FirstOrDefault().EmpNo;
                 if (empInfo != null)
                 {
-                    Data = arrangeLessonTermIBLL.GetTimeTableInEducation(param.StartDate, param.EndDate, "", param.EmpNo, "");
+                    Data = arrangeLessonTermIBLL.GetTimeTableInEducation(param.StartDate, param.EndDate, "", param.Account, "");
                 }
             }
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementService.cs

@@ -82,12 +82,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("EncourgeName", "%" + queryParam["EncourgeName"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.EncourgeName Like @EncourgeName ");
                 }
-                if (!queryParam["EncourgeDate"].IsEmpty())
+                if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
                 {
-                    dp.Add("EncourgeDate", queryParam["EncourgeDate"].ToString(), DbType.String);
-                    strSql.Append(" AND t.EncourgeDate = @EncourgeDate ");
+                    dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
+                    dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
+                    strSql.Append(" AND ( t.EncourgeDate >= @startTime AND t.EncourgeDate <= @endTime ) ");
                 }
-
                 return this.BaseRepository("CollegeMIS").FindList<StuEncourgementEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentService.cs

@@ -77,10 +77,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("PunishNo", queryParam["PunishNo"].ToString(), DbType.String);
                     strSql.Append(" AND t.PunishNo = @PunishNo ");
                 }
-                if (!queryParam["PunishDate"].IsEmpty())
+                if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
                 {
-                    dp.Add("PunishDate", queryParam["PunishDate"].ToString(), DbType.String);
-                    strSql.Append(" AND t.PunishDate = @PunishDate ");
+                    dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
+                    dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
+                    strSql.Append(" AND ( t.PunishDate >= @startTime AND t.PunishDate <= @endTime ) ");
                 }
                 return this.BaseRepository("CollegeMIS").FindList<StuPunishmentEntity>(strSql.ToString(), dp, pagination);
             }

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/MealCardRunTab/list.vue

@@ -188,7 +188,9 @@
 				let _postParam = {
 					pagination: {
 						rows: _this.rows,
-						page: _this.page
+						page: _this.page,
+						sidx: 'centralTm',
+						sord: 'desc',
 					},
 					queryJson: JSON.stringify(_this.multipleData)
 				};