From 61a22eb3e6a8801ad5640e9db3c5067856146167 Mon Sep 17 00:00:00 2001
From: dyy <18335927079@163.com>
Date: Thu, 21 Apr 2022 10:30:46 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E7=94=A8?=
 =?UTF-8?q?=E5=8D=B0=E7=94=B3=E8=AF=B7=E7=BB=9F=E8=AE=A1=EF=BC=9A=E7=94=A8?=
 =?UTF-8?q?=E5=8D=B0=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E9=80=89=E6=8B=A9=E6=97=A5=E6=9C=9F=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/NWFProcess/MonitorIndexOfyyspd.cshtml      | 12 ++++++------
 .../Process/NWFProcessSerivce.cs                     |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfyyspd.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfyyspd.cshtml
index 874255043..d783e89b6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfyyspd.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorIndexOfyyspd.cshtml	
@@ -17,9 +17,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 class="lr-layout-tool-item">
                         <div id="datesearch"></div>
-                    </div>*@
+                    </div>
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
@@ -31,19 +31,19 @@
                                     <div class="lr-form-item-title">用印事项</div>
                                     <input id="LC_yysx" type="text" class="form-control" />
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
+                                @*<div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">用印时间</div>
                                     <input id="LC_yysj" type="text" class="form-control" />
-                                </div>
+                                </div>*@
                             </div>
                         </div>
                     </div>
-                    <div class="lr-layout-tool-item">
+                    @*<div class="lr-layout-tool-item">
                         <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
                     </div>
                     <div class="lr-layout-tool-item">
                         <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;<span class="lrlg">查询</span></a>
-                    </div>
+                    </div>*@
                 </div>
                 <div class="lr-layout-tool-right">
                     <div class=" btn-group btn-group-sm">
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs
index ab3e62680..1e74a9f82 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs	
@@ -1013,8 +1013,8 @@ namespace Learun.Application.WorkFlow
                 // 用印时间
                 if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
                 {
-                    dp.Add("StartTime", queryParam["StartTime"].ToString(), DbType.Date);
-                    dp.Add("EndTime", queryParam["EndTime"].ToString(), DbType.Date);
+                    dp.Add("StartTime", queryParam["StartTime"].ToString(), DbType.String);
+                    dp.Add("EndTime", queryParam["EndTime"].ToString(), DbType.String);
                     strSql.Append(" and (y.LC_yysj >= @StartTime and y.LC_yysj <= @EndTime)");
                 }