From 21ac0f666d1bad8572796efa6fadc43834241883 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Tue, 23 May 2023 18:36:35 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=201=E3=80=81=E4=BB=A3=E7=A0=81?=
=?UTF-8?q?=E7=94=9F=E6=88=90=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2=E6=94=AF?=
=?UTF-8?q?=E6=8C=81uniapp=202=E3=80=81=E6=96=B0=E5=A2=9Edate=E8=8C=83?=
=?UTF-8?q?=E5=9B=B4=E9=80=89=E6=8B=A9=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/CommonController.cs | 1 -
.../wwwroot/CodeGenTemplate/TplDto.txt | 2 +-
.../wwwroot/CodeGenTemplate/TplService.txt | 5 +++--
.../wwwroot/CodeGenTemplate/v3/Vue.txt | 22 ++++++++++++++-----
4 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/ZR.Admin.WebApi/Controllers/CommonController.cs b/ZR.Admin.WebApi/Controllers/CommonController.cs
index 8c47e07..e2a5b67 100644
--- a/ZR.Admin.WebApi/Controllers/CommonController.cs
+++ b/ZR.Admin.WebApi/Controllers/CommonController.cs
@@ -60,7 +60,6 @@ namespace ZR.Admin.WebApi.Controllers
[Log(Title = "企业消息测试")]
public IActionResult SendMsg(string msg, string toUser = "")
{
- throw new Exception("ddddd");
WxNoticeHelper.SendMsg("消息测试", msg, toUser, WxNoticeHelper.MsgType.markdown);
return SUCCESS(msg);
}
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplDto.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplDto.txt
index 78eb7b5..2639a9b 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplDto.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplDto.txt
@@ -18,7 +18,7 @@ namespace ${options.DtosNamespace}
{
$foreach(item in genTable.Columns)
$if(item.IsQuery)
-$if(item.htmlType == "datetime")
+$if(item.htmlType.StartsWith("date"))
public DateTime? Begin$item.CsharpField { get; set; }
public DateTime? End$item.CsharpField { get; set; }
$elseif(item.htmlType == "selectMulti")
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt
index b486b6d..a3fb503 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt
@@ -39,8 +39,9 @@ $if(column.HtmlType == "month")
DateTime monthEnd = Convert.ToDateTime(parm.${column.CsharpField}).AddMonths(1);
predicate = predicate.AndIF(parm.${column.CsharpField} != null, it => it.${column.CsharpField} >= parm.${column.CsharpField} && it.${column.CsharpField} < monthEnd);
$else
- predicate = predicate.AndIF(parm.Begin${column.CsharpField} == null, it => it.${column.CsharpField} >= DateTime.Now.AddDays(-1));
- predicate = predicate.AndIF(parm.Begin${column.CsharpField} != null, it => it.${column.CsharpField} >= parm.Begin${column.CsharpField} && it.${column.CsharpField} <= parm.End${column.CsharpField});
+ predicate = predicate.AndIF(parm.Begin${column.CsharpField} == null, it => it.${column.CsharpField} >= DateTime.Now.ToShortDateString().ParseToDateTime());
+ predicate = predicate.AndIF(parm.Begin${column.CsharpField} != null, it => it.${column.CsharpField} >= parm.Begin${column.CsharpField});
+ predicate = predicate.AndIF(parm.End${column.CsharpField} != null, it => it.${column.CsharpField} <= parm.End${column.CsharpField});
$end
$elseif(column.CsharpType == "int" || column.CsharpType == "long")
predicate = predicate.AndIF(parm.${column.CsharpField} != null, ${codeTool.QueryExp(column.CsharpField, column.QueryType)};
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
index 3c557a4..5ab312a 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
@@ -34,15 +34,25 @@ $elseif(column.HtmlType == "datetime")
+$elseif(column.HtmlType == "datePicker")
+
+
+
+
$elseif(column.HtmlType.Contains("select") || column.HtmlType == "radio")
@@ -376,12 +386,12 @@ $end
const total = ref(0)
const dataList = ref([])
const queryRef = ref()
-const defaultTime = ref([new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)])
$foreach(item in genTable.Columns)
-$if(item.HtmlType == "datetime" && item.IsQuery == true)
+$if((item.HtmlType == "datetime" || item.HtmlType == "datePicker") && item.IsQuery == true)
// ${item.ColumnComment}时间范围
const dateRange${item.CsharpField} = ref([])
+const defaultTime = ref([new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)])
$elseif(item.HtmlType == "customInput")
/******************自定义编辑 start **********************/
@@ -438,7 +448,7 @@ $end
function getList(){
$foreach(item in genTable.Columns)
-$if(item.HtmlType == "datetime" && item.IsQuery == true)
+$if((item.HtmlType == "datetime" || item.HtmlType == "datePicker") && item.IsQuery == true)
proxy.addDateRange(queryParams, dateRange${item.CsharpField}.value, '${item.CsharpField}');
$end
$end
@@ -462,7 +472,7 @@ function handleQuery() {
// 重置查询操作
function resetQuery(){
$foreach(item in genTable.Columns)
-$if(item.HtmlType == "datetime" && item.IsQuery == true)
+$if((item.HtmlType == "datetime" || item.HtmlType == "datePicker") && item.IsQuery == true)
// ${item.ColumnComment}时间范围
dateRange${item.CsharpField}.value = []
$end