明树Git Lab

Commit 0fd9bab5 authored by zfp1's avatar zfp1

update

parent 67a8b13d
......@@ -27,7 +27,15 @@ async function listDeepPlant(req, res, next) {
}
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();
res.sendData({ count, list });
let namemap = await getSccjMap();
let ret = [];
for (let index = 0; index < list.length; index++) {
const element = list[index];
element.agrPlantBase = namemap(element.agrPlantBase);
element.workshop = namemap(element.workshop);
ret.push(element);
}
res.sendData({ count, list: ret });
} catch (error) {
next(error);
}
......
/**--------------------------------------------直接种植--------------------------------------------------------- */
async function createDirectPlant(req, res, next) {
try {
//
......@@ -28,7 +30,14 @@ async function listDirectPlant(req, res, next) {
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();
res.sendData({ count, list });
let namemap = await getSccjMap();
let ret = [];
for (let index = 0; index < list.length; index++) {
const element = list[index];
element.agrPlantBase = namemap(element.agrPlantBase);
ret.push(element);
}
res.sendData({ count, list: ret });
} catch (error) {
next(error);
}
......@@ -101,6 +110,13 @@ async function importExcel(req, res, next) {
}
}
async function getSccjMap() {
let list = await DB.Sccj.findAll({ del: 0 });
let namemap = {};
list.map(o => { namemap(o.key) = o.name });
return map;
}
module.exports = {
createDirectPlant,
listDirectPlant,
......
......@@ -28,7 +28,14 @@ async function listPrePlant(req, res, next) {
}
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();
res.sendData({ count, list });
let namemap = await getSccjMap();
let ret = [];
for (let index = 0; index < list.length; index++) {
const element = list[index];
element.agrPlantBase = namemap(element.agrPlantBase);
ret.push(element);
}
res.sendData({ count, list: ret });
} catch (error) {
next(error);
}
......
......@@ -36,7 +36,8 @@ async function listTraceCode(req, res, next) {
search.batchNumber = { $regex: req.body.batchNumber }
}
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 ret = [];
for (let index = 0; index < list.length; index++) {
const element = list[index];
......@@ -49,6 +50,15 @@ async function listTraceCode(req, res, next) {
} else if (element.source && element.type == 4) {
element.source = await DB.ProductLt.findOne({ _id: element.source }).lean();
}
element.workshop = namemap(element.workshop);
element.agrPlantBase = namemap(element.agrPlantBase);
if (element.rawMatCul && element.rawMatCul.proAdr) {
element.rawMatCul.proAdr = namemap(element.rawMatCul.proAdr)
}
if (element.proProcess && element.proProcess.proAdr) {
element.proProcess.proAdr = namemap(element.proProcess.proAdr)
}
ret.push(element);
}
res.sendData({ count, list: ret });
......@@ -135,17 +145,30 @@ async function getTraceCode2(req, res, next) {
console.log(sourceId, "===")
let source = null;
if (traccode.type && traccode.type == 1) {
source = await DB.ProductPlant.findOne({ _id: sourceId }, { productName: 1, productSpec: 1, manufactureDate: 1, agrPlantBase: 1, homepageCarouselImgs: 1 }).populate({ path: "homepageCarouselImgs" }).lean();
source = await DB.ProductPlant.findOne({ _id: sourceId }).populate({ path: "homepageCarouselImgs" }).lean();
} else if (traccode.type && traccode.type == 2) {
source = await DB.ProductPre.findOne({ _id: sourceId }, { preProductName: 1, productSpec: 1, manufactureDate: 1, agrPlantBase: 1, homepageCarouselImgs: 1 }).populate({ path: "homepageCarouselImgs" }).lean();
source = await DB.ProductPre.findOne({ _id: sourceId }).populate({ path: "homepageCarouselImgs" }).lean();
} else if (traccode.type && traccode.type == 3) {
source = await DB.ProductDeep.findOne({ _id: sourceId }, { preProductName: 1, productSpec: 1, manufactureDate: 1, agrPlantBase: 1, homepageCarouselImgs: 1 }).populate({ path: "homepageCarouselImgs" }).lean();
source = await DB.ProductDeep.findOne({ _id: sourceId }).populate({ path: "homepageCarouselImgs" }).lean();
} else if (traccode.type && traccode.type == 4) {
source = await DB.ProductLt.findOne({ _id: sourceId }).populate({ path: "homepageCarouselImgs" }).lean();
}
source.manufactureDate = traccode.manufactureDate || source.manufactureDate;
source.agrPlantBase = traccode.workshop || source.agrPlantBase;
traccode.source = source;
let namemap = await getSccjMap();
source.workshop = namemap(source.workshop);
source.agrPlantBase = namemap(source.agrPlantBase);
traccode.agrPlantBase = namemap(traccode.agrPlantBase);
traccode.agrPlantBase = namemap(traccode.agrPlantBase);
if (traccode.rawMatCul && traccode.rawMatCul.proAdr) {
traccode.rawMatCul.proAdr = namemap(traccode.rawMatCul.proAdr)
}
if (traccode.proProcess && traccode.proProcess.proAdr) {
traccode.proProcess.proAdr = namemap(traccode.proProcess.proAdr)
}
/**
* 查询一次则给这条数据加1
*/
......@@ -162,7 +185,7 @@ async function getsuyuanBase(req, res, next) {
if (!req.body._id) {
return res.sendError(errorMessage.resourceNotFound);
}
let traccode = await DB.ProTraceCode.findOne({ _id: req.body._id }, { type: 1, source: 1, _id: 1, batchNumber: 1, manufactureDate: 1, rawMatCul: 1, proProcess: 1 }).populate({ path: "proProcess.proSteps.img" }).populate({ path: "rawMatCul.proSteps.img" }).lean();
let traccode = await DB.ProTraceCode.findOne({ _id: req.body._id }).populate({ path: "proProcess.proSteps.img" }).populate({ path: "rawMatCul.proSteps.img" }).lean();
if (!(traccode && traccode._id && traccode.source)) {
return res.sendError(errorMessage.resourceNotFound);
}
......@@ -240,7 +263,7 @@ async function getZhijian(req, res, next) {
if (!req.body._id) {
return res.sendError(errorMessage.resourceNotFound);
}
let traccode = await DB.ProTraceCode.findOne({ _id: req.body._id }, { type: 1, source: 1, _id: 1 , pesticidetImgs: 1, qualityInsReportImgs: 1, flourMerchantImgs: 1}).populate({path: "qualityInsReportImgs"}).populate({path: "flourMerchantImgs"}).populate({path: "pesticidetImgs"}).lean();
let traccode = await DB.ProTraceCode.findOne({ _id: req.body._id }, { type: 1, source: 1, _id: 1, pesticidetImgs: 1, qualityInsReportImgs: 1, flourMerchantImgs: 1 }).populate({ path: "qualityInsReportImgs" }).populate({ path: "flourMerchantImgs" }).populate({ path: "pesticidetImgs" }).lean();
if (!(traccode && traccode._id && traccode.source)) {
return res.sendError(errorMessage.resourceNotFound);
}
......@@ -268,7 +291,12 @@ async function batchAgrEnvOnOff(req, res, next) {
}
}
async function getSccjMap() {
let list = await DB.Sccj.findAll({ del: 0 });
let namemap = {};
list.map(o => { namemap(o.key) = o.name });
return map;
}
module.exports = {
createTraceCode,
......
......@@ -28,7 +28,15 @@ async function listlt(req, res, next) {
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();
res.sendData({ count, list });
let namemap = await getSccjMap();
let ret = [];
for (let index = 0; index < list.length; index++) {
const element = list[index];
element.agrPlantBase = namemap(element.agrPlantBase);
element.workshop = namemap(element.workshop);
ret.push(element);
}
res.sendData({ count, list: ret });
} catch (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