|
@ -23,10 +23,11 @@ async function getEquipment(ctx) { |
|
|
where: whereOption |
|
|
where: whereOption |
|
|
}], |
|
|
}], |
|
|
where: { |
|
|
where: { |
|
|
$and: [ |
|
|
reportTime: { $between: [moment(startTime).format('YYYY-MM-DD HH:mm:ss'), moment(endTime).format('YYYY-MM-DD HH:mm:ss')] } |
|
|
sequelize.where(sequelize.fn('date', sequelize.col('report_time')), '>=', moment(startTime).format('YYYY-MM-DD HH:mm:ss')), |
|
|
// $and: [
|
|
|
sequelize.where(sequelize.fn('date', sequelize.col('report_time')), '<=', moment(endTime).format('YYYY-MM-DD HH:mm:ss')), |
|
|
// sequelize.where(sequelize.fn('date', sequelize.col('report_time')), '>=', moment(startTime).format('YYYY-MM-DD HH:mm:ss')),
|
|
|
], |
|
|
// sequelize.where(sequelize.fn('date', sequelize.col('report_time')), '<=', moment(endTime).format('YYYY-MM-DD HH:mm:ss')),
|
|
|
|
|
|
// ],
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|