From 0c1a33a33b45fc3265cb7fef20beb48407cd6c98 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 24 八月 2023 14:54:06 +0800
Subject: [PATCH] 2023-08-24
---
src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx | 53 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 36 insertions(+), 17 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx
index 6b955e5..0d8cbf7 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx
@@ -28,33 +28,45 @@
}
let _customScript = ''
+ let _tailScript = ''
scripts && scripts.forEach(script => {
if (script.status === 'false') return
- _customScript += `
- ${script.sql}
- `
+ if (script.position !== 'back') {
+ _customScript += `
+ ${script.sql}
+ `
+ } else {
+ _tailScript += `
+ ${script.sql}
+ `
+ }
})
- if (_customScript) {
- _customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100) select @ErrorCode='',@retmsg =''
- ${_customScript}
- `
- }
+ let declare = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100) select @ErrorCode='',@retmsg =''`
if (verify.defaultSql === 'false') {
_dataresource = ''
}
+
+ if (/\s/.test(_dataresource)) {
+ _dataresource = '(' + _dataresource + ') tb'
+ }
_dataresource = _dataresource.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|typename)@/ig, `'${timestamp}'`)
_customScript = _customScript.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|typename)@/ig, `'${timestamp}'`)
+ _tailScript = _tailScript.replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id|datam|typename)@/ig, `'${timestamp}'`)
_dataresource = _dataresource.replace(/@\$|\$@/ig, '')
_customScript = _customScript.replace(/@\$|\$@/ig, '')
+ _tailScript = _tailScript.replace(/@\$|\$@/ig, '')
// 澶栬仈鏁版嵁搴撴浛鎹�
if (window.GLOB.externalDatabase !== null) {
_dataresource = _dataresource.replace(/@db@/ig, window.GLOB.externalDatabase)
_customScript = _customScript.replace(/@db@/ig, window.GLOB.externalDatabase)
+ _tailScript = _tailScript.replace(/@db@/ig, window.GLOB.externalDatabase)
}
+
+ let custompage = /@pageSize@|@orderBy@/i.test(_dataresource + _customScript)
// 姝ｅ垯鏇挎崲
let _regoptions = regoptions.map(item => {
@@ -78,36 +90,43 @@
_regoptions.forEach(item => {
_dataresource = _dataresource.replace(item.reg, item.value)
_customScript = _customScript.replace(item.reg, item.value)
+ _tailScript = _tailScript.replace(item.reg, item.value)
})
if (verify.queryType === 'statistics' && _dataresource) {
_search = ''
}
- // 鏁版嵁婧愬鐞�, 瀛樺湪鏄剧ず鍒楁椂
+ // 鏁版嵁婧愬鐞�, 瀛樺湪鏄剧ず鍒楁椂
if (_dataresource) {
- if (/\s/.test(_dataresource)) {
- _dataresource = '(' + _dataresource + ') tb'
- }
-
- if (verify.order) {
- _dataresource = `/*system_query*/select ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${verify.order}) as rows from ${_dataresource} ${_search}) tmptable order by tmptable.rows`
- } else {
+ if (custompage || !verify.order) {
_dataresource = `/*system_query*/select ${arr_field} from ${_dataresource} ${_search}`
+ } else {
+ _dataresource = `/*system_query*/select ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${verify.order}) as rows from ${_dataresource} ${_search}) tmptable order by tmptable.rows `
}
}
if (_customScript) {
sql = `/* sql 楠岃瘉 */
+ ${declare}
${_customScript}
${_dataresource}
+ ${_tailScript}
aaa:
if @ErrorCode!=''
insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@
`
+ } else if (_tailScript) {
+ sql = `${declare}
+ ${_dataresource}
+ ${_tailScript}
+ aaa:
+ if @ErrorCode!=''
+ insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@
+ `
} else {
sql = `/* sql 楠岃瘉 */
- declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100) select @ErrorCode='',@retmsg =''
+ ${declare}
${_dataresource}`
}
sql = sql.replace(/\n\s{8}/ig, '\n')
--
Gitblit v1.8.0