From 6e6b156bb0100043214c170d7171eb79e0d7e344 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 26 4月 2024 13:48:42 +0800
Subject: [PATCH] 时间查询 选完时间再清除掉 接口报错
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm
index e4b01f4..56aa65c 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm
@@ -92,11 +92,11 @@
if (@column.EffectType == "datepicker" && @column.QueryType == "between"){
- @:.Where(input.@column.ColumnName!=null, u => u.@(@column.ColumnName)>= Convert.ToDateTime(input.@(@column.ColumnName)[0]+" 00:00:00") && u.@(@column.ColumnName)<= Convert.ToDateTime(input.@(@column.ColumnName)[1]+" 23:59:59"))
+ @:.Where(SysCommUtil.ValidateListForQueryTimeArray(input.@column.ColumnName), u => u.@(@column.ColumnName) > Convert.ToDateTime(input.@(@column.ColumnName)[0]+" 00:00:00").AddSeconds(-1) && u.@(@column.ColumnName)< Convert.ToDateTime(input.@(@column.ColumnName)[1]+" 23:59:59").AddSeconds(1))
}
else if (@column.EffectType == "datetimepicker" && @column.QueryType == "between"){
- @:.Where(input.@column.ColumnName!=null, u => u.@(@column.ColumnName)>= Convert.ToDateTime(input.@(@column.ColumnName)[0]) && u.@(@column.ColumnName)<= Convert.ToDateTime(input.@(@column.ColumnName)[1]))
+ @:.Where(SysCommUtil.ValidateListForQueryTimeArray(input.@column.ColumnName), u => u.@(@column.ColumnName) > Convert.ToDateTime(input.@(@column.ColumnName)[0]).AddSeconds(-1) && u.@(@column.ColumnName)< Convert.ToDateTime(input.@(@column.ColumnName)[1]).AddSeconds(1))
}
else {
@@ -161,11 +161,11 @@
} else if (@column.EffectType == "datepicker"&&@column.QueryType == "between")
{
- @:.Where(input.@column.ColumnName!=null, u => u.@(@column.ColumnName)>= Convert.ToDateTime(input.@(@column.ColumnName)[0]+" 00:00:00") && u.@(@column.ColumnName)<= Convert.ToDateTime(input.@(@column.ColumnName)[1]+" 23:59:59"))
+ @:.Where(SysCommUtil.ValidateListForQueryTimeArray(input.@column.ColumnName), u => u.@(@column.ColumnName) > Convert.ToDateTime(input.@(@column.ColumnName)[0]+" 00:00:00").AddSeconds(-1) && u.@(@column.ColumnName)< Convert.ToDateTime(input.@(@column.ColumnName)[1]+" 23:59:59").AddSeconds(1))
} else if (@column.EffectType == "datetimepicker" && @column.QueryType == "between"){
- @:.Where(input.@column.ColumnName!=null, u => u.@(@column.ColumnName)>= Convert.ToDateTime(input.@(@column.ColumnName)[0]) && u.@(@column.ColumnName)<= Convert.ToDateTime(input.@(@column.ColumnName)[1]))
+ @:.Where(SysCommUtil.ValidateListForQueryTimeArray(input.@column.ColumnName), u => u.@(@column.ColumnName) > Convert.ToDateTime(input.@(@column.ColumnName)[0]).AddSeconds(-1) && u.@(@column.ColumnName)< Convert.ToDateTime(input.@(@column.ColumnName)[1]).AddSeconds(1))
}else if (@column.EffectType == "fk")
{
@:.Where(p@(@column.ColumnName) > 0, u => u.@(@column.ColumnName) @column.QueryType p@(@column.ColumnName))
--
Gitblit v1.9.3