明树Git Lab

Skip to content

L
letian_backend
Commit f5fc6f34 authored by zfp1's avatar zfp1
Browse files
Options

!

parent d752f549
Show whitespace changes
Inline Side-by-side
Showing with 43 additions and 43 deletions
controller/productDeepController.js
View file @ f5fc6f34
...@@ -27,15 +27,15 @@ async function listDeepPlant(req, res, next) { ...@@ -27,15 +27,15 @@ async function listDeepPlant(req, res, next) {
} }
const count = await DB.ProductDeep.countDocuments(search); const count = await DB.ProductDeep.countDocuments(search);
let list = await DB.ProductDeep.find(search).populate({path: "productPhotos2"}).populate({path: "homepageCarouselImgs"}).populate({path: "monitorInfo.device"}).sort({_id: -1}).skip(skip).limit(pageSize).lean().exec(); let list = await DB.ProductDeep.find(search).populate({path: "productPhotos2"}).populate({path: "homepageCarouselImgs"}).populate({path: "monitorInfo.device"}).sort({_id: -1}).skip(skip).limit(pageSize).lean().exec();
let namemap = await getSccjMap(); // let namemap = await getSccjMap();
let ret = []; // let ret = [];
for (let index = 0; index < list.length; index++) { // for (let index = 0; index < list.length; index++) {
const element = list[index]; // const element = list[index];
element.agrPlantBase = namemap[element.agrPlantBase]; // element.agrPlantBase = namemap[element.agrPlantBase];
element.workshop = namemap[element.workshop]; // element.workshop = namemap[element.workshop];
ret.push(element); // ret.push(element);
} // }
res.sendData({ count, list: ret }); res.sendData({ count, list });
} catch (error) { } catch (error) {
next(error); next(error);
} }
......
controller/productDirPlantController.js
View file @ f5fc6f34
...@@ -30,14 +30,14 @@ async function listDirectPlant(req, res, next) { ...@@ -30,14 +30,14 @@ async function listDirectPlant(req, res, next) {
const count = await DB.ProductPlant.countDocuments(search); const count = await DB.ProductPlant.countDocuments(search);
let list = await DB.ProductPlant.find(search).populate({path: "plantPlan"}).populate({path: "homepageCarouselImgs"}).populate({path: "productPhotos2"}).populate({path: "monitorInfo.device"}).sort({_id: -1}).skip(skip).limit(pageSize).lean().exec(); let list = await DB.ProductPlant.find(search).populate({path: "plantPlan"}).populate({path: "homepageCarouselImgs"}).populate({path: "productPhotos2"}).populate({path: "monitorInfo.device"}).sort({_id: -1}).skip(skip).limit(pageSize).lean().exec();
let namemap = await getSccjMap(); // let namemap = await getSccjMap();
let ret = []; // let ret = [];
for (let index = 0; index < list.length; index++) { // for (let index = 0; index < list.length; index++) {
const element = list[index]; // const element = list[index];
element.agrPlantBase = namemap[element.agrPlantBase]; // element.agrPlantBase = namemap[element.agrPlantBase];
ret.push(element); // ret.push(element);
} // }
res.sendData({ count, list: ret }); res.sendData({ count, list });
} catch (error) { } catch (error) {
next(error); next(error);
} }
......
controller/productPreController.js
View file @ f5fc6f34
...@@ -28,14 +28,14 @@ async function listPrePlant(req, res, next) { ...@@ -28,14 +28,14 @@ async function listPrePlant(req, res, next) {
} }
const count = await DB.ProductPre.countDocuments(search); const count = await DB.ProductPre.countDocuments(search);
let list = await DB.ProductPre.find(search).populate({path: "productPhotos2"}).populate({path: "sourcePlantProduct"}).populate({path: "homepageCarouselImgs"}).populate({path: "monitorInfo.device"}).sort({_id: -1}).skip(skip).limit(pageSize).lean().exec(); let list = await DB.ProductPre.find(search).populate({path: "productPhotos2"}).populate({path: "sourcePlantProduct"}).populate({path: "homepageCarouselImgs"}).populate({path: "monitorInfo.device"}).sort({_id: -1}).skip(skip).limit(pageSize).lean().exec();
let namemap = await getSccjMap(); // let namemap = await getSccjMap();
let ret = []; // let ret = [];
for (let index = 0; index < list.length; index++) { // for (let index = 0; index < list.length; index++) {
const element = list[index]; // const element = list[index];
element.agrPlantBase = namemap[element.agrPlantBase]; // element.agrPlantBase = namemap[element.agrPlantBase];
ret.push(element); // ret.push(element);
} // }
res.sendData({ count, list: ret }); res.sendData({ count, list });
} catch (error) { } catch (error) {
next(error); next(error);
} }
......
controller/productTracController.js
View file @ f5fc6f34
...@@ -37,7 +37,7 @@ async function listTraceCode(req, res, next) { ...@@ -37,7 +37,7 @@ async function listTraceCode(req, res, next) {
} }
const count = await DB.ProTraceCode.countDocuments(search); const count = await DB.ProTraceCode.countDocuments(search);
let list = await DB.ProTraceCode.find(search).sort({ _id: -1 }).skip(skip).limit(pageSize).populate({ path: "rawMatCul.proSteps.img" }).populate({ path: "proProcess.proSteps.img" }).populate({ path: "cjVideo" }).populate({ path: "qualityInsReportImgs" }).populate({ path: "flourMerchantImgs" }).populate({ path: "pesticidetImgs" }).lean(); let list = await DB.ProTraceCode.find(search).sort({ _id: -1 }).skip(skip).limit(pageSize).populate({ path: "rawMatCul.proSteps.img" }).populate({ path: "proProcess.proSteps.img" }).populate({ path: "cjVideo" }).populate({ path: "qualityInsReportImgs" }).populate({ path: "flourMerchantImgs" }).populate({ path: "pesticidetImgs" }).lean();
let namemap = await getSccjMap(); // let namemap = await getSccjMap();
let ret = []; let ret = [];
for (let index = 0; index < list.length; index++) { for (let index = 0; index < list.length; index++) {
const element = list[index]; const element = list[index];
...@@ -50,15 +50,15 @@ async function listTraceCode(req, res, next) { ...@@ -50,15 +50,15 @@ async function listTraceCode(req, res, next) {
} else if (element.source && element.type == 4) { } else if (element.source && element.type == 4) {
element.source = await DB.ProductLt.findOne({ _id: element.source }).lean(); element.source = await DB.ProductLt.findOne({ _id: element.source }).lean();
} }
element.workshop = namemap[element.workshop]; // element.workshop = namemap[element.workshop];
element.agrPlantBase = namemap[element.agrPlantBase]; // element.agrPlantBase = namemap[element.agrPlantBase];
if (element.rawMatCul && element.rawMatCul.proAdr) { // if (element.rawMatCul && element.rawMatCul.proAdr) {
element.rawMatCul.proAdr = namemap[element.rawMatCul.proAdr] // element.rawMatCul.proAdr = namemap[element.rawMatCul.proAdr]
} // }
if (element.proProcess && element.proProcess.proAdr) { // if (element.proProcess && element.proProcess.proAdr) {
element.proProcess.proAdr = namemap[element.proProcess.proAdr] // element.proProcess.proAdr = namemap[element.proProcess.proAdr]
} // }
ret.push(element); ret.push(element);
} }
res.sendData({ count, list: ret }); res.sendData({ count, list: ret });
......
controller/productltController.js
View file @ f5fc6f34
...@@ -28,15 +28,15 @@ async function listlt(req, res, next) { ...@@ -28,15 +28,15 @@ async function listlt(req, res, next) {
const count = await DB.ProductLt.countDocuments(search); const count = await DB.ProductLt.countDocuments(search);
let list = await DB.ProductLt.find(search).populate({path: "homepageCarouselImgs"}).populate({path: "productPhotos2"}).populate({path: "monitorInfo.device"}).sort({_id: -1}).skip(skip).limit(pageSize).lean().exec(); let list = await DB.ProductLt.find(search).populate({path: "homepageCarouselImgs"}).populate({path: "productPhotos2"}).populate({path: "monitorInfo.device"}).sort({_id: -1}).skip(skip).limit(pageSize).lean().exec();
let namemap = await getSccjMap(); // let namemap = await getSccjMap();
let ret = []; // let ret = [];
for (let index = 0; index < list.length; index++) { // for (let index = 0; index < list.length; index++) {
const element = list[index]; // const element = list[index];
element.agrPlantBase = namemap[element.agrPlantBase]; // // element.agrPlantBase = namemap[element.agrPlantBase];
element.workshop = namemap[element.workshop]; // // element.workshop = namemap[element.workshop];
ret.push(element); // ret.push(element);
} // }
res.sendData({ count, list: ret }); res.sendData({ count, list });
} catch (error) { } catch (error) {
next(error); next(error);
} }
......
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