From 22af5bed0da8a5852bd824a1e21e6fc43df6df2a Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 11 十二月 2023 19:20:43 +0800
Subject: [PATCH] 1.App 智能分析，生产进度看板接口 2.PC端设备点检项目、保养项目、点检标准、保养标准、点检记录、保养记录、维修记录 3.工序检验扫码添加判断(条码任务是否存在、工单是否关闭) 4.添加App图标图片文件
---
VueWebCoreApi/Tools/DapperHelper.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/VueWebCoreApi/Tools/DapperHelper.cs b/VueWebCoreApi/Tools/DapperHelper.cs
index 695fe58..ea6d910 100644
--- a/VueWebCoreApi/Tools/DapperHelper.cs
+++ b/VueWebCoreApi/Tools/DapperHelper.cs
@@ -185,9 +185,9 @@
StringBuilder sb = new StringBuilder();
sb.AppendFormat("SELECT COUNT(1) FROM ({0}) AS Result;", sql);
sb.AppendFormat(@"SELECT *
- FROM(SELECT *,ROW_NUMBER() OVER(ORDER BY {1} {2}) AS RowNum
+ FROM(SELECT *,ROW_NUMBER() OVER(ORDER BY {1} {2}) AS rowNum
FROM ({0}) AS Temp) AS Result
- WHERE RowNum >= {3} AND RowNum <= {4}
+ WHERE rowNum >= {3} AND rowNum <= {4}
ORDER BY {1} {2}", sql, orderBy, sort, pageIndex, pageSize); //skip, pageIndex * pageSize
using (IDbConnection conn = sqlConnection())
@@ -236,9 +236,9 @@
StringBuilder sb = new StringBuilder();
sb.AppendFormat("{0} SELECT COUNT(1) FROM ({1}) AS Result;",withsql, sql);
sb.AppendFormat(@"{0} SELECT *
- FROM(SELECT *,ROW_NUMBER() OVER(ORDER BY {2} {3}) AS RowNum
+ FROM(SELECT *,ROW_NUMBER() OVER(ORDER BY {2} {3}) AS rowNum
FROM ({1}) AS Temp) AS Result
- WHERE RowNum >= {4} AND RowNum <= {5}
+ WHERE rowNum >= {4} AND rowNum <= {5}
ORDER BY {2} {3}",withsql, sql, orderBy, sort, pageIndex, pageSize); //skip, pageIndex * pageSize
using (IDbConnection conn = sqlConnection())
@@ -320,11 +320,11 @@
JOIN CTE c ON o.{torg_code} = c.{parent_id}
)
SELECT * FROM(
- SELECT ROW_NUMBER() OVER (ORDER BY {prop} {order}) AS RowNum,*
+ SELECT ROW_NUMBER() OVER (ORDER BY {prop} {order}) AS rowNum,*
FROM (
SELECT DISTINCT *
from CTE
- ) AS subquery) AS AA WHERE RowNum >= {startRow} AND RowNum <={endRow}";
+ ) AS subquery) AS AA WHERE rowNum >= {startRow} AND rowNum <={endRow}";
total = totalRecords;
return conn.Query<T>(query, parm);
}
--
Gitblit v1.9.3