From b8cdbe3fbd57bbd513509a7d76c529096b1a7153 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 15 七月 2020 14:39:10 +0800
Subject: [PATCH] 2020-07-15
---
src/utils/utils.js | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 9b4447d..715db52 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -747,8 +747,11 @@
})
}
+ // 鎺у埗鍙版墦鍗版暟鎹�
+ let conLtext = []
let _Ltext = data.map((item, lindex) => {
let vals = []
+ let convals = []
btn.columns.forEach((col, cindex) => {
if (col.import === 'false') return
@@ -838,16 +841,29 @@
}
if (col.type === 'date') {
- vals.push(`case when ${col.Column}='' then '1900-01-01' else dateadd(day,cast('${val}' as int)-2,'1900-01-01') end as ${col.Column}`)
+ vals.push(`case when '${val}'='' then '1900-01-01' else dateadd(day,cast('${val}' as int)-2,'1900-01-01') end`)
} else {
- vals.push(`'${val}' as ${col.Column}`)
+ vals.push(`'${val}'`)
+ }
+
+ if (lindex < 40) {
+ if (col.type === 'date') {
+ convals.push(`case when '${val}'='' then '1900-01-01' else dateadd(day,cast('${val}' as int)-2,'1900-01-01') end as ${col.Column}`)
+ } else {
+ convals.push(`'${val}' as ${col.Column}`)
+ }
}
})
let _lineIndex = '0000' + (lindex + 1) + '0'
_lineIndex = _lineIndex.substring(_lineIndex.length - 6)
- vals.push(`'${upId + _lineIndex}' as jskey`)
+ vals.push(`'${upId + _lineIndex}'`)
+
+ if (lindex < 40) {
+ convals.push(`'${upId + _lineIndex}' as jskey`)
+ conLtext.push(`Select ${convals.join(',')}`)
+ }
return `Select ${vals.join(',')}`
})
@@ -946,13 +962,14 @@
aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
- if (window.GLOB.systemType !== 'official' && options.sysType !== 'cloud') {
+ // if (window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') {
+ if (window.GLOB.systemType !== 'production') {
let fsql = `
${_sql}
${_sqlInsert}
/* excel鏁版嵁锛堝墠40鏉★級 */
- ${_Ltext.slice(0, 40).join(' Union all ')}
+ ${conLtext.join(' Union all ')}
${_sqlBottom}
`
fsql = fsql.replace(/\n\s{8}/ig, '\n')
@@ -1576,7 +1593,8 @@
_sql += `
aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
- if (window.GLOB.systemType !== 'official' && options.sysType !== 'cloud') {
+ // if (window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') {
+ if (window.GLOB.systemType !== 'production') {
_sql = _sql.replace(/\n\s{8}/ig, '\n')
console.log(_sql)
}
--
Gitblit v1.8.0