|
|
@ -10,7 +10,7 @@ async function statistic (ctx) { |
|
|
|
where: { |
|
|
|
reportType: 'conserve', |
|
|
|
}, |
|
|
|
attributes: ['id', 'road', 'time', 'projectType', 'projectType', 'roadSectionStart', 'roadSectionEnd'], |
|
|
|
attributes: ['id', 'road', 'time', 'projectType', 'projectType', 'roadSectionStart', 'roadSectionEnd', 'scenePic', 'conserveBeforePic', 'conserveUnderwayPic', 'conserveAfterPic'], |
|
|
|
include: [{ |
|
|
|
model: models.User, |
|
|
|
attributes: ['name'] |
|
|
@ -18,9 +18,7 @@ async function statistic (ctx) { |
|
|
|
} |
|
|
|
|
|
|
|
if (projectType) { |
|
|
|
|
|
|
|
findOption.where.projectType = projectType; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
const reportRes = await await models.Report.findAll(findOption) |
|
|
|