diff --git a/src/service/control.service.js b/src/service/control.service.js index 31c6ad5..0818742 100644 --- a/src/service/control.service.js +++ b/src/service/control.service.js @@ -1,6 +1,7 @@ const Control = require("../model/control.model"); const Chicken = require("../model/chicken.model"); const Device = require("../model/device.model"); +const { getDayLife } = require("../utils/common"); const Coop = require("../model/coop.model"); const { Op, Sequelize } = require("sequelize"); const { getCoopListById } = require("./coop.service"); @@ -50,7 +51,17 @@ class ControlService { item.dataValues?.coop_id?.split(",").includes(coop_id + "") ); if (singleArr && singleArr.length > 0) { - item.chickenInfo = singleArr[0]; + const s = singleArr[0]; + s.dataValues.day_life = getDayLife( + new Date(), + s.dataValues.real_life_init_time + ); + item.chickenInfo = s; + } + if (batch_number) { + item.showCard = false; + } else { + item.showCard = true; } return item; });