From 47b9baefdeeb41f50a9b7abc1abcf5e90931a89d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 31 八月 2023 11:17:48 +0800
Subject: [PATCH] 2023-08-31
---
src/utils/utils-datamanage.js | 32 +++++++++++++-------------------
1 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index be72648..ecd38da 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -11,7 +11,6 @@
* @param {Number} pageIndex 椤电爜
* @param {Number} pageSize 姣忛〉鏁伴噺
* @param {String} BID 涓婄骇ID
- * @return {Object} param
*/
static getQueryDataParams (setting, search = [], orderBy = '', pageIndex = 1, pageSize = 10, BID, id, year) {
let param = null
@@ -54,6 +53,11 @@
if (setting.interType === 'inner') {
param.func = setting.innerFunc
+
+ if (setting.recordUser === 'true') {
+ param.username = sessionStorage.getItem('User_Name') || ''
+ param.fullname = sessionStorage.getItem('Full_Name') || ''
+ }
} else {
if (window.GLOB.mkHS) {
if (setting.sysInterface === 'true' && window.GLOB.cloudServiceApi) {
@@ -201,16 +205,14 @@
let arr_field = setting.all_field || setting.arr_field
if (_dataresource) {
- if (setting.laypage && orderBy) {
- if (setting.custompage) {
- LText = `/*system_query*/select ${arr_field} from ${_dataresource} ${_search} `
+ if (setting.custompage) {
+ LText = `/*system_query*/select ${arr_field} from ${_dataresource} ${_search} `
+ } else if (setting.laypage && orderBy) {
+ LText = `/*system_query*/select top ${pageSize} ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${orderBy}) as rows from ${_dataresource} ${_search}) tmptable where rows > ${pageSize * (pageIndex - 1)} order by tmptable.rows `
+ if (setting.sub_field) {
+ DateCount = `/*system_query*/select count(1) as total from (select distinct ${setting.primaryKey} from ${_dataresource} ${_search})a`
} else {
- LText = `/*system_query*/select top ${pageSize} ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${orderBy}) as rows from ${_dataresource} ${_search}) tmptable where rows > ${pageSize * (pageIndex - 1)} order by tmptable.rows `
- if (setting.sub_field) {
- DateCount = `/*system_query*/select count(1) as total from (select distinct ${setting.primaryKey} from ${_dataresource} ${_search})a`
- } else {
- DateCount = `/*system_query*/select count(1) as total from ${_dataresource} ${_search}`
- }
+ DateCount = `/*system_query*/select count(1) as total from ${_dataresource} ${_search}`
}
} else if (orderBy) {
LText = `/*system_query*/select ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${orderBy}) as rows from ${_dataresource} ${_search}) tmptable order by tmptable.rows `
@@ -443,13 +445,6 @@
_customScript = _customScript.replace(item.reg, item.value)
})
- // _dataresource = _dataresource.replace(/@select\$|\$select@/ig, '')
- // _customScript = _customScript.replace(/@select\$|\$select@/ig, '')
- // _dataresource = _dataresource.replace(/\$sum@/ig, '/*')
- // _dataresource = _dataresource.replace(/@sum\$/ig, '*/')
- // _customScript = _customScript.replace(/\$sum@/ig, '/*')
- // _customScript = _customScript.replace(/@sum\$/ig, '*/')
-
let _search = ''
if (setting.queryType !== 'statistics' && _dataresource) {
_search = Utils.joinMainSearchkey(searchlist)
@@ -492,8 +487,7 @@
primaryKey: setting.primaryKey || '',
foreign_key: '',
sql: _dataresource,
- script: _customScript,
- // transaction: setting.transaction === 'true'
+ script: _customScript
}
}
--
Gitblit v1.8.0