明树Git Lab

Commit 62c6cd3e authored by zfp1's avatar zfp1

update

parent 6de1d171
...@@ -107,12 +107,12 @@ async function exportExcel(req, res, next) { ...@@ -107,12 +107,12 @@ async function exportExcel(req, res, next) {
search.name = { $regex: req.body.name }; search.name = { $regex: req.body.name };
} }
if (req.body.startTime) { if (req.body.startTime) {
search.time = search.time || {}; search.indate = search.indate || {};
search.time.$gte = req.body.startTime; search.indate.$gte = req.body.startTime;
} }
if (req.body.endTime) { if (req.body.endTime) {
search.time = search.time || {}; search.indate = search.indate || {};
search.time.$lte = req.body.endTime search.indate.$lte = req.body.endTime
} }
let ret = await DB.ExcelRecord.create({ let ret = await DB.ExcelRecord.create({
creator: req.user._id, creator: req.user._id,
......
...@@ -103,19 +103,16 @@ async function importExcel(req, res, next) { ...@@ -103,19 +103,16 @@ async function importExcel(req, res, next) {
async function exportExcel(req, res, next) { async function exportExcel(req, res, next) {
try { try {
let search = {del: 0}; let search = {del: 0};
if (req.body.agrProName) {
search.agrProName = {$regex: req.body.agrProName};
}
if (req.body.name) { if (req.body.name) {
search.name = {$regex: req.body.name}; search.name = {$regex: req.body.name};
} }
if(req.body.startTime) { if(req.body.startTime) {
search.time = search.time || {}; search.outdate = search.outdate || {};
search.time.$gte = req.body.startTime; search.outdate.$gte = req.body.startTime;
} }
if(req.body.endTime) { if(req.body.endTime) {
search.time = search.time || {}; search.outdate = search.outdate || {};
search.time.$lte = req.body.endTime search.outdate.$lte = req.body.endTime
} }
let ret = await DB.ExcelRecord.create({ let ret = await DB.ExcelRecord.create({
creator: req.user._id, creator: req.user._id,
......
...@@ -109,12 +109,12 @@ async function exportExcel(req, res, next) { ...@@ -109,12 +109,12 @@ async function exportExcel(req, res, next) {
search.name = {$regex: req.body.name}; search.name = {$regex: req.body.name};
} }
if(req.body.startTime) { if(req.body.startTime) {
search.time = search.time || {}; search.indate = search.indate || {};
search.time.$gte = req.body.startTime; search.indate.$gte = req.body.startTime;
} }
if(req.body.endTime) { if(req.body.endTime) {
search.time = search.time || {}; search.indate = search.indate || {};
search.time.$lte = req.body.endTime search.indate.$lte = req.body.endTime
} }
let ret = await DB.ExcelRecord.create({ let ret = await DB.ExcelRecord.create({
creator: req.user._id, creator: req.user._id,
......
...@@ -108,12 +108,12 @@ async function exportExcel(req, res, next) { ...@@ -108,12 +108,12 @@ async function exportExcel(req, res, next) {
search.name = {$regex: req.body.name}; search.name = {$regex: req.body.name};
} }
if(req.body.startTime) { if(req.body.startTime) {
search.time = search.time || {}; search.outdate = search.outdate || {};
search.time.$gte = req.body.startTime; search.outdate.$gte = req.body.startTime;
} }
if(req.body.endTime) { if(req.body.endTime) {
search.time = search.time || {}; search.outdate = search.outdate || {};
search.time.$lte = req.body.endTime search.outdate.$lte = req.body.endTime
} }
let ret = await DB.ExcelRecord.create({ let ret = await DB.ExcelRecord.create({
creator: req.user._id, creator: req.user._id,
......
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