明树Git Lab

Commit bdac899a authored by zfp1's avatar zfp1

update

parent 8e50bb6f
...@@ -47,7 +47,7 @@ async function listTraceCode(req, res, next) { ...@@ -47,7 +47,7 @@ async function listTraceCode(req, res, next) {
search.batchNumber = { $regex: req.body.batchNumber } search.batchNumber = { $regex: req.body.batchNumber }
} }
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"}).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"}).lean();
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];
...@@ -189,7 +189,7 @@ async function getJiankong(req, res, next) { ...@@ -189,7 +189,7 @@ async function getJiankong(req, res, next) {
if (!req.body._id) { if (!req.body._id) {
return res.sendError(errorMessage.resourceNotFound); return res.sendError(errorMessage.resourceNotFound);
} }
let traccode = await DB.ProTraceCode.findOne({ _id: req.body._id }, { type: 1, source: 1, _id: 1, agrOnOff: 1, indEnvOnOff: 1 }).lean(); let traccode = await DB.ProTraceCode.findOne({ _id: req.body._id }, { type: 1, source: 1, _id: 1, cjVideo: 1, agrOnOff: 1, indEnvOnOff: 1 }).populate({path: "cjVideo"}).lean();
if (!(traccode && traccode._id && traccode.source)) { if (!(traccode && traccode._id && traccode.source)) {
return res.sendError(errorMessage.resourceNotFound); return res.sendError(errorMessage.resourceNotFound);
} }
......
...@@ -15,6 +15,10 @@ const letianProTraceCodeSchema = new Schema({ ...@@ -15,6 +15,10 @@ const letianProTraceCodeSchema = new Schema({
type: Number, type: Number,
comment: "1 种植农产品 2 轻加工 3 深加工" comment: "1 种植农产品 2 轻加工 3 深加工"
}, },
cjVideo: { // 车间视频
type: mongoose.Types.ObjectId,
ref: 'File',
},
workshop: { workshop: {
type: String, type: String,
comment: "生产车间" comment: "生产车间"
......
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