From ab949bb71eadda3ec1736ccdcfaa1b12b04cce6a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 05 十一月 2023 10:35:56 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx
index 04b1446..710956c 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx
@@ -67,14 +67,7 @@
let custompage = /@pageSize@|@orderBy@/i.test(_dataresource + _customScript)
// 姝ｅ垯鏇挎崲
- let _regoptions = regoptions.map(item => {
- return {
- reg: new RegExp('@' + item.key + '@', 'ig'),
- value: `'0'`
- }
- })
-
- _regoptions.push({
+ regoptions.push({
reg: new RegExp('@orderBy@', 'ig'),
value: verify.order
}, {
@@ -85,7 +78,7 @@
value: 1
})
- _regoptions.forEach(item => {
+ regoptions.forEach(item => {
_dataresource = _dataresource.replace(item.reg, item.value)
_customScript = _customScript.replace(item.reg, item.value)
_tailScript = _tailScript.replace(item.reg, item.value)
@@ -111,7 +104,7 @@
${_tailScript}
aaa:
if @ErrorCode!=''
- insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select '1949-10-01 15:00:00',@ErrorCode, @retmsg,'1949-10-01 15:00:00'
+ insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,'1949-10-01 15:00:00'
`
} else if (_tailScript) {
sql = `${declare}
@@ -119,7 +112,7 @@
${_tailScript}
aaa:
if @ErrorCode!=''
- insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select '1949-10-01 15:00:00',@ErrorCode, @retmsg,'1949-10-01 15:00:00'
+ insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,'1949-10-01 15:00:00'
`
} else {
sql = `${declare}
--
Gitblit v1.8.0