From 1ac4f9ef5e2124d55c6a57f9d86497a9a437ac80 Mon Sep 17 00:00:00 2001
From: dyy <807692433@qq.com>
Date: Tue, 2 Apr 2024 13:30:14 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=AD=A6?=
 =?UTF-8?q?=E7=B1=8D=E5=BC=82=E5=8A=A8=E7=AE=A1=E7=90=86=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=97=B6=E9=97=B4=E6=AE=B5=E6=9F=A5=E8=AF=A2=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuTransferInfo/Index.cshtml        |  9 +++--
 .../Views/StuTransferInfo/Index.js            | 33 ++++++++++++++++++-
 .../StuTransferInfo/StuTransferInfoService.cs |  8 ++++-
 3 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.cshtml
index e1ed8b1ee..eafa8c898 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/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">
@@ -35,9 +38,9 @@
                                     <div id="CheckUserId"></div>
                                 </div>
                                 @*<div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">审核状态</div>
-            <div id="NationalityNo"></div>
-        </div>*@
+                        <div class="lr-form-item-title">审核状态</div>
+                        <div id="NationalityNo"></div>
+                    </div>*@
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">保留学籍</div>
                                     <div id="StuStatus"></div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.js
index f3fdd9a27..452e45319 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.js	
@@ -8,12 +8,41 @@ var selectedRow;
 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: '2',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+            });
             // 跳转
             //var modulesTree = learun.clientdata.get(['modulesTree']);
             $('#changeMajor').on('click', function () {
@@ -115,7 +144,7 @@ var bootstrap = function ($, learun) {
             // 查询
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 290, 400);
+            }, 350, 400);
             $('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType' });
             $('#ClassNo').lrselect({
                 allowSearch: true,
@@ -430,6 +459,8 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            param.StartTime = startTime;
+            param.EndTime = endTime;
             param.SqlParameter = ' and F_EnabledMark = 1 ';
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs
index b07575e55..759fa4a19 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs	
@@ -114,7 +114,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 if (!queryParam["Grade"].IsEmpty())
                 {
                     dp.Add("Grade", queryParam["Grade"].ToString(), DbType.String);
-                    strSql.Append(" AND (Grade=@Grade OR NewGrade=@Grade) ");
+                    strSql.Append(" AND (t.Grade=@Grade OR t.NewGrade=@Grade) ");
+                }
+                if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
+                {
+                    dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
+                    dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
+                    strSql.Append(" AND ( t.CreateTime >= @startTime AND t.CreateTime <= @endTime ) ");
                 }
                 return this.BaseRepository("CollegeMIS").FindList<StuTransferInfoEntity>(strSql.ToString(), dp, pagination);
             }