1
0

2 Коммитууд 3cdec61592 ... c1f88d59a3

Эзэн SHA1 Мессеж Огноо
  Yi c1f88d59a3 system: userDepth update 4 өдөр өмнө
  Yi 3cdec61592 system: userDepth update 4 өдөр өмнө

+ 2 - 0
module/crontab/cow_cron.go

@@ -83,6 +83,8 @@ func (e *Entry) Indicators() error {
 			pastureIndicatorList = e.FindSalesVolume(pastureList, startTime, endTime)
 		case model.CalvingNumber:
 			pastureIndicatorList = e.FindCalvingNumber(pastureList, startTime, endTime)
+		case model.FattenCattleNumber:
+			pastureIndicatorList = e.FattenCattleNumber(pastureList, startTime, endTime)
 		case model.AdultAbortionRate:
 			pastureIndicatorList = e.FindAdultAbortionRate(pastureList, "adult", startTime, endTime)
 		case model.YouthAbortionRate:

+ 15 - 0
module/crontab/cow_indicators_base.go

@@ -143,6 +143,21 @@ func (e *Entry) FindSalesVolume(pastureList []*model.AppPastureList, startTime,
 	return res
 }
 
+func (e *Entry) FattenCattleNumber(pastureList []*model.AppPastureList, startTime, endTime int64) map[int64]string {
+	res := make(map[int64]string)
+	for _, pasture := range pastureList {
+		var fattenCattleNumber int64
+		if err := e.DB.Model(new(model.Cow)).
+			Select("COUNT(id) as fatten_cattle_number").
+			Where("pasture_id = ?", pasture.Id).
+			Where("purpose_kind = ?", pasturePb.Purpose_Fatten).
+			Count(&fattenCattleNumber).Error; err != nil {
+			zaplog.Error("FindFattenCattleNumber", zap.Any("err", err), zap.Any("pasture", pasture))
+		}
+	}
+	return res
+}
+
 // UpdatePastureIndicators 指标收集,不存在时创建,存在时更新
 func (e *Entry) UpdatePastureIndicators(pastureId int64, indicatorsDetails *model.IndicatorsDetails, dateTime int64, value string) {
 	date := time.Unix(dateTime, 0).Local().Format(model.LayoutMonth)