diff --git a/src/service/chicken.service.js b/src/service/chicken.service.js index f4817fb..273989d 100644 --- a/src/service/chicken.service.js +++ b/src/service/chicken.service.js @@ -1,4 +1,5 @@ const Chicken = require("../model/chicken.model"); +const Market = require("../model/market.model"); const { generateSerialNumber, haveSame, @@ -84,7 +85,7 @@ class ChickenService { const res = await Chicken.findAll({ where: { house_id, - is_marketed: 0, + // is_marketed: 0, }, }); const arr = res.map((item) => item.dataValues); @@ -99,7 +100,6 @@ class ChickenService { const res = await Chicken.findOne({ where: { id, - is_marketed: 0, }, }); if (res) { @@ -113,7 +113,23 @@ class ChickenService { someId.factoryName = factoryName; someId.varietyName = varietyName; someId.allCoops = allCoops; - someId.day_life = getDayLife(new Date(), someId.real_life_init_time); + // 已经出栏的日龄为出栏时间 - real_life + // 未出栏的为当前时间 - real_life + if (someId.is_marketed) { + // 查询出栏时间 + const marketInfo = await Market.findOne({ + where: { + batch_id: someId.batch_number, + }, + }); + someId.day_life = getDayLife( + marketInfo.out_time, + someId.real_life_init_time + ); + } else { + someId.day_life = getDayLife(new Date(), someId.real_life_init_time); + } + return someId; } return null; @@ -138,6 +154,7 @@ class ChickenService { return res ? res.dataValues : null; } + // 仅查询未出栏的 async getAllChickenInfo( batch_number = "", coop_ids = [], @@ -145,7 +162,6 @@ class ChickenService { house_id ) { let selectObj = { - is_marketed: 0, batch_number: { [Op.like]: `%${batch_number}%`, }, diff --git a/src/service/die.service.js b/src/service/die.service.js index e554b22..2b73dc2 100644 --- a/src/service/die.service.js +++ b/src/service/die.service.js @@ -66,14 +66,13 @@ class DieService { } }); const p = temp.map(async (item) => { - console.log(item.coop_id); const chickenInfo = await getChickenByCoopIdAndHouseId( item.coop_id, item.house_id ); - console.log(chickenInfo); const coopInfo = await getCoopById(item.coop_id); item.batch_number = chickenInfo?.batch_number; + item.is_marketed = chickenInfo.is_marketed; item.coop_name = coopInfo?.coop_name; return item; }); @@ -136,6 +135,7 @@ class DieService { xData: Object.keys(obj), yData: Object.values(obj), batch_number: chickenInfo.batch_number, + is_marketed: chickenInfo.is_marketed, coop_name: coopInfo.coop_name, }; } @@ -217,8 +217,9 @@ class DieService { const factoryInfo = await getFactoryById(chickenInfo.factory_id); res.dataValues.die_rate = res.dataValues.die_number / chickenInfo.chicken_number; + // 死淘时间 - real_time res.dataValues.day_life = getDayLife( - new Date(), + res.put_time, chickenInfo.real_life_init_time ); res.dataValues.factoryInfo = factoryInfo;