明树Git Lab

Commit 7968885b authored by zfp1's avatar zfp1

update

parent ee313794
......@@ -13,15 +13,15 @@ async function list(req, res, next) {
// search.deviceNumber = {$regex: req.body.deviceNumber}
// }
if(req.body.startTime) {
search.createdAt = search.time || {};
search.createdAt.$gte = new Date(req.body.startTime);
search.time = search.time || {};
search.time.$gte = new Date(req.body.startTime);
}
if(req.body.endTime) {
search.createdAt = search.time || {};
search.createdAt.$lte =new Date(req.body.endTime)
search.time = search.time || {};
search.time.$lte =new Date(req.body.endTime)
}
if(_.isArray(req.body.time) && req.body.time.length == 2) {
search.createdAt = {
search.time = {
$lte: new Date(req.body.time[1]),
$gte: new Date(req.body.time[0])
}
......
......@@ -18,9 +18,6 @@ const collectIndustryEnvironmentalTestingSchema = new Schema({
},
time: {
type: Date,
get: v => moment(v).format("YYYY-MM-DD HH:mm:ss"),
comment: "采集时间",
default: new Date()
},
/*---------------------------------------------*/
......@@ -99,18 +96,18 @@ const collectIndustryEnvironmentalTestingSchema = new Schema({
// },
createdAt: {
type: Date,
default: Date.now,
get: v => moment(v).format("YYYY-MM-DD HH:mm:ss"),
// createdAt: {
// type: Date,
// default: Date.now,
// get: v => moment(v).format("YYYY-MM-DD HH:mm:ss"),
},
updatedAt: {
type: Date,
default: Date.now,
get: v => moment(v).format("YYYY-MM-DD HH:mm:ss"),
// },
// updatedAt: {
// type: Date,
// default: Date.now,
// get: v => moment(v).format("YYYY-MM-DD HH:mm:ss"),
},
// },
del: {
type: Number,
default: 0,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment