|
@@ -65,7 +65,7 @@ class CarService extends Service {
|
|
|
async listWithTravel({ vin, startTime, endTime, pageNumber = 1, pageSize = 10 }) {
|
|
|
const { ctx, service } = this;
|
|
|
const agg = [
|
|
|
- { $match: { vin, start_time: { $gte: startTime, $lt: endTime } } },
|
|
|
+ { $match: { start_time: { $gte: startTime, $lt: endTime }, vin } },
|
|
|
{ $unwind: '$mileage_list' },
|
|
|
...ctx.helper.getPageMongo(pageNumber, pageSize),
|
|
|
];
|
|
@@ -88,7 +88,7 @@ class CarService extends Service {
|
|
|
async indexTrip({ vin, startTime, endTime }) {
|
|
|
const { ctx } = this;
|
|
|
const agg = [
|
|
|
- { $match: { vin, start_time: { $gte: startTime, $lt: endTime } } },
|
|
|
+ { $match: { start_time: { $gte: startTime, $lt: endTime }, vin } },
|
|
|
{ $unwind: '$mileage_list' },
|
|
|
{ $group: { _id: { $hour: { $toDate: '$mileage_list.start_time' } },
|
|
|
dsmCount: { $sum: { $cond: [{ $eq: [ '$mileage_list.dsm_status', '1' ] }, 1, 0 ] } },
|
|
@@ -102,7 +102,7 @@ class CarService extends Service {
|
|
|
async indexSingle({ startTime, endTime, vin }) {
|
|
|
const { ctx } = this;
|
|
|
const agg = [
|
|
|
- { $match: { vin, start_time: { $gte: startTime, $lt: endTime } } },
|
|
|
+ { $match: { start_time: { $gte: startTime, $lt: endTime }, vin } },
|
|
|
{ $addFields: {
|
|
|
week: { $dayOfWeek: { $toDate: '$start_time' } },
|
|
|
} },
|