From c05aeceef15d1617fcbcf3cae628b1a9ca6f4517 Mon Sep 17 00:00:00 2001
From: jianweie code <jianweie@163.com>
Date: Mon, 27 Mar 2023 23:59:20 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8datatime?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=9F=A5=E8=AF=A2=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E4=BA=86=E8=8C=83=E5=9B=B4=EF=BC=8C=E4=BD=86=E6=98=AF=E6=A8=A1?=
 =?UTF-8?q?=E7=B3=8A=E6=9F=A5=E8=AF=A2=E5=AF=BC=E5=87=BAexcel=E6=9C=AA?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E8=8C=83=E5=9B=B4=E5=88=A4=E6=96=AD=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CrudTemplete/Controllers/Controller.tpl       | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/CoreCms.Net.CodeGenerator/CrudTemplete/Controllers/Controller.tpl b/CoreCms.Net.CodeGenerator/CrudTemplete/Controllers/Controller.tpl
index e752201d..03107706 100644
--- a/CoreCms.Net.CodeGenerator/CrudTemplete/Controllers/Controller.tpl
+++ b/CoreCms.Net.CodeGenerator/CrudTemplete/Controllers/Controller.tpl
@@ -411,8 +411,19 @@ namespace CoreCms.Net.Web.Admin.Controllers
 			var {{field.DbColumnName}} = Request.Form["{{field.DbColumnName}}"].FirstOrDefault();
             if (!string.IsNullOrEmpty({{field.DbColumnName}}))
             {
-                var dt = {{field.DbColumnName}}.ObjectToDate();
-                where = where.And(p => p.{{field.DbColumnName}} > dt);
+                if ({{field.DbColumnName}}.Contains("到"))
+                {
+                    var dts = {{field.DbColumnName}}.Split("到");
+                    var dtStart = dts[0].Trim().ObjectToDate();
+                    where = where.And(p => p.{{field.DbColumnName}} > dtStart);
+                    var dtEnd = dts[1].Trim().ObjectToDate();
+                    where = where.And(p => p.{{field.DbColumnName}} < dtEnd);
+                }
+                else
+                {
+                    var dt = {{field.DbColumnName}}.ObjectToDate();
+                    where = where.And(p => p.{{field.DbColumnName}} > dt);
+                }
             }{% elsif  field.DataType == 'bit' %}
 			//{{field.ColumnDescription}} {{field.DataType}}
 			var {{field.DbColumnName}} = Request.Form["{{field.DbColumnName}}"].FirstOrDefault();