From d6dfba48678e1107a9e7c6524e1dfa2d3fdff03c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 08 十月 2021 19:29:21 +0800
Subject: [PATCH] 2021-10-08
---
src/menu/datasource/verifycard/utils.jsx | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 40 insertions(+), 8 deletions(-)
diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index 3b3b266..65013fd 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -7,7 +7,7 @@
* @return {Object} setting 椤甸潰璁剧疆
* @return {Array} columns 鏄剧ず瀛楁
*/
- static getDebugSql (setting, scripts, columns, searches = []) {
+ static getDebugSql (setting, scripts, columns, searches = [], defSearch) {
let sql = ''
let error = ''
let _dataresource = ''
@@ -38,11 +38,14 @@
_customScript = _customScript.replace(/@\$|\$@/ig, '')
_dataresource = _dataresource.replace(/@select\$|\$select@/ig, '')
_customScript = _customScript.replace(/@select\$|\$select@/ig, '')
- _dataresource = _dataresource.replace(/@sum\$|\$sum@/ig, '')
+ // _dataresource = _dataresource.replace(/@sum\$|\$sum@/ig, '')
_customScript = _customScript.replace(/@sum\$|\$sum@/ig, '')
+ _dataresource = _dataresource.replace(/\$sum@/ig, '/*$sum@')
+ _dataresource = _dataresource.replace(/@sum\$/ig, '@sum$*/')
+
if (_customScript) {
- _customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@login_city nvarchar(50) select @ErrorCode='',@retmsg =''
+ _customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@departmentcode nvarchar(50),@organization nvarchar(50),@login_city nvarchar(50) select @ErrorCode='',@retmsg =''
${_customScript}
`
}
@@ -77,7 +80,7 @@
reg: new RegExp('@' + item.datefield + '1@', 'ig')
})
}
- if (['dateweek', 'datemonth', 'daterange'].includes(item.type)) {
+ if (['dateweek', 'datemonth', 'daterange', 'range'].includes(item.type)) {
_regoptions.push({
var: new RegExp('@' + item.field, 'ig'),
reg: new RegExp('@' + item.field + '@', 'ig')
@@ -114,7 +117,7 @@
}
})
- let _search = ''
+ let _search = defSearch
if (setting.queryType === 'statistics' && _dataresource) {
_regoptions.forEach(item => {
@@ -136,7 +139,7 @@
}, {
reg: new RegExp('@FullName@', 'ig'),
})
- if (setting.laypage !== 'false') {
+ if (setting.laypage === 'true') {
_regoptions.push({
reg: new RegExp('@pageSize@', 'ig'),
}, {
@@ -170,13 +173,36 @@
}
}
+ let sumSql = ''
+
+ if (arr_field && _dataresource && /\/\*\$sum@/ig.test(_dataresource)) {
+ let _sql = _dataresource.replace(/\/\*\$sum@|@sum\$\*\//ig, '')
+ _sql = `${_sql} ${_search}`
+ if (_customScript) {
+ sumSql = `/* sql sum楠岃瘉 */
+ ${_customScript}
+ ${_sql}
+ aaa:
+ if @ErrorCode!=''
+ insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@
+ `
+ } else {
+ sumSql = `/* sql sum楠岃瘉 */
+ ${_sql}`
+ }
+ }
+
// 鏁版嵁婧愬鐞�, 瀛樺湪鏄剧ず鍒楁椂
if (arr_field && _dataresource) {
if (/\s/.test(_dataresource)) {
_dataresource = '(' + _dataresource + ') tb'
}
- _dataresource = `select${setting.laypage !== 'false' ? ' top 10' : ''} ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${setting.order}) as rows from ${_dataresource} ${_search}) tmptable ${setting.laypage !== 'false' ? 'where rows > 0' : ''} order by tmptable.rows`
+ if (setting.order) {
+ _dataresource = `select${setting.laypage === 'true' ? ' top 10' : ''} ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${setting.order}) as rows from ${_dataresource} ${_search}) tmptable ${setting.laypage === 'true' ? 'where rows > 0' : ''} order by tmptable.rows`
+ } else {
+ _dataresource = `select${setting.laypage === 'true' ? ' top 10' : ''} ${arr_field} from ${_dataresource} ${_search}`
+ }
}
if (_customScript) {
@@ -194,7 +220,13 @@
sql = sql.replace(/\n\s{8}/ig, '\n')
console.info(sql)
+
+ if (sumSql) {
+ sumSql = sumSql.replace(/\n\s{10}/ig, '\n')
+
+ console.info(sumSql)
+ }
- return { error, sql }
+ return { error, sql, sumSql }
}
}
\ No newline at end of file
--
Gitblit v1.8.0