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 ++++----
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Util/SysCommUtil.cs | 15 ++++++++++++++-
iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/Input.cs.vm | 2 +-
3 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Util/Comm.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Util/SysCommUtil.cs
similarity index 68%
rename from iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Util/Comm.cs
rename to iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Util/SysCommUtil.cs
index 7431f4a..9ba2ac1 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Util/Comm.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Util/SysCommUtil.cs
@@ -9,7 +9,7 @@
/// <summary>
/// 鍏叡鏂规硶
/// </summary>
- public static class Comm
+ public static class SysCommUtil
{
/// <summary>
/// 鐢熸垚鍑哄叆搴撳崟鍙锋祦姘�
@@ -42,5 +42,18 @@
return before + (maxNumber+1).ToString("D4");
}
}
+
+ /// <summary>
+ /// 楠岃瘉鏃ユ湡鏌ヨ鑼冨洿瀛楃涓叉暟缁勬槸鍚︾鍚堟煡璇㈠��
+ /// </summary>
+ /// <param name="list"></param>
+ /// <returns>true:绗﹀悎鏌ヨ鍊硷紝false锛氫笉绗﹀悎鏌ヨ鍊�</returns>
+ public static bool ValidateListForQueryTimeArray(List<string> list)
+ {
+ if (list == null) return false;
+ if (list.Count != 2) return false;
+ if (string.IsNullOrEmpty(list[0]) || string.IsNullOrEmpty(list[1])) return false;
+ return true;
+ }
}
}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/Input.cs.vm b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/Input.cs.vm
index 035ad6e..b4a8715 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/Input.cs.vm
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/Template/Input.cs.vm
@@ -51,7 +51,7 @@
@:/// <summary>
@:/// @column.ColumnComment
@:/// </summary>
- @:public virtual List<@(@column.NetType)>@(@column.NetTypeIsNullLableForQueryInput) @column.ColumnName { get; set; }
+ @:public virtual List<string> @column.ColumnName { get; set; }
@:
}
}
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