update

controller/collectIPSController.js

@@ -37,7 +37,14 @@ async function list(req, res, next) {
         let skip = (page - 1) * pageSize;
         let count = await collectIPSModule.count(search);
         let data = await collectIPSModule.findList(search, {skip, limit: pageSize});
-        res.sendData({list: data, count});
+        let list = [];
+        for (let index = 0; index < data.length; index++) {
+            let element = data[index].toJSON();
+            let collectIPSResults = await DB.CollectIPSResult.find({data: element._id}).select('deviceNumber name count time _id').populate({path: "plan", select: 'name controlPlan'});
+            element.collectIPSResults = collectIPSResults;
+            list.push(element)
+        }
+        res.sendData({list, count});
     } catch (error) {
         next(error);
     }

db/models/collectIPSResult.js

@@ -45,14 +45,18 @@ const collectIPSResultSchema = new Schema({
         type: mongoose.Types.ObjectId,
         ref: "CollectIPSType",
         comment: "虫子种类表id",
+        ref: "CollectIPSType"
+
     },
     plan: {
         type: mongoose.Types.ObjectId,
         comment: "防治建议表id",
+        ref: "CollectIPSPlan"
     },
     data: {
         type: mongoose.Types.ObjectId,
         comment: "硬件采集数据的id",
+        ref: "CollectIPS"
     },