From 73597636ab6062c7ce06cc4d09866cc54cedc744 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 07 七月 2020 17:47:21 +0800
Subject: [PATCH] 2020-07-07
---
src/utils/utils.js | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index f72b359..c8c2796 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(',')}`
})
@@ -952,7 +968,7 @@
${_sqlInsert}
/* excel鏁版嵁锛堝墠40鏉★級 */
- ${_Ltext.slice(0, 40).join(' Union all ')}
+ ${conLtext.join(' Union all ')}
${_sqlBottom}
`
fsql = fsql.replace(/\n\s{8}/ig, '\n')
--
Gitblit v1.8.0