明树Git Lab
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
L
letian_backend
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zengfanpei
letian_backend
Commits
7968885b
Commit
7968885b
authored
Jul 14, 2025
by
zfp1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
ee313794
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
18 deletions
+15
-18
collectIETController.js
controller/collectIETController.js
+5
-5
collectIET.js
db/models/collectIET.js
+10
-13
No files found.
controller/collectIETController.js
View file @
7968885b
...
...
@@ -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
])
}
...
...
db/models/collectIET.js
View file @
7968885b
...
...
@@ -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
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment