|
@ -447,7 +447,7 @@ async function exportData(ctx) { |
|
|
let header = [].concat(preHeader) |
|
|
let header = [].concat(preHeader) |
|
|
for (let k in tableAttributes) { |
|
|
for (let k in tableAttributes) { |
|
|
const comment = tableAttributes[k].comment |
|
|
const comment = tableAttributes[k].comment |
|
|
if (k != 'id' && comment) { |
|
|
if (k != 'id' && k != 'pepUserId' && comment) { |
|
|
if ([].includes(k)) { |
|
|
if ([].includes(k)) { |
|
|
// 截住不想导出的字段
|
|
|
// 截住不想导出的字段
|
|
|
continue |
|
|
continue |
|
@ -499,8 +499,8 @@ async function exportData(ctx) { |
|
|
d.departmrnt = d.departmrnt.map(dep => dep.name).join('、') |
|
|
d.departmrnt = d.departmrnt.map(dep => dep.name).join('、') |
|
|
d.role = d.role.map(r => r.name).join('、') |
|
|
d.role = d.role.map(r => r.name).join('、') |
|
|
|
|
|
|
|
|
d.idPhoto ? d.idPhoto = qiniu.domain + d.idPhoto : '' |
|
|
d.idPhoto ? d.idPhoto = qiniu.domain + '/' + d.idPhoto : '' |
|
|
d.vitae ? d.vitae = qiniu.domain + d.vitae : '' |
|
|
d.vitae ? d.vitae = qiniu.domain + '/' + d.vitae : '' |
|
|
|
|
|
|
|
|
const corOverTime = statisticOvertimeRes.find(so => so.pepUserId == d.pepUserId) |
|
|
const corOverTime = statisticOvertimeRes.find(so => so.pepUserId == d.pepUserId) |
|
|
d.overTimeCount = corOverTime ? corOverTime.count : 0 |
|
|
d.overTimeCount = corOverTime ? corOverTime.count : 0 |
|
|