event: update

model/neck_active_habit.go

@@ -150,6 +150,7 @@ func (n NeckActiveHabitSlice) ToPB(curveName string) *CowBehaviorCurveData {
 						res.OriginalDateList = append(res.OriginalDateList, 0)
 						res.ChangeDateList = append(res.ChangeDateList, 0)
 						res.SumDateList = append(res.SumDateList, 0)
+						res.RuminaChange = append(res.RuminaChange, 0)
 					}
 				}
 			}

module/backend/cow.go

@@ -206,6 +206,7 @@ func (s *StoreEntry) BehaviorCurve(ctx context.Context, req *pasturePb.CowBehavi
 	if err = s.DB.Table(new(model.NeckActiveHabit).TableName()).
 		Where("neck_ring_number = ?", cowInfo.NeckRingNumber).
 		Where("pasture_id = ?", userModel.AppPasture.Id).
+		Where("is_show = ?", pasturePb.IsShow_Ok).
 		Where("heat_date BETWEEN ? AND ?", startDataTime, endDataTime).
 		Order("heat_date, frameid").
 		Find(&neckActiveHabitList).Error; err != nil {

module/backend/event_cow_log.go

@@ -34,7 +34,8 @@ func (s *StoreEntry) SubmitEventLog(ctx context.Context, pastureId int64, cow *m
 		if data.Sex == pasturePb.Genders_Female {
 			sex = "母"
 		}
-		desc = fmt.Sprintf("性别: %s; 栏舍: %s; 体重: %s kg; price: %s; 来源: %s;", sex, penMap[cow.PenId].Name, strconv.FormatFloat(float64(data.Weight), 'f', 2, 64),
+		desc = fmt.Sprintf("性别: %s; 栏舍: %s; 体重: %s kg; 价格: %s; 来源: %s;", sex, penMap[cow.PenId].Name,
+			strconv.FormatFloat(float64(data.Weight), 'f', 2, 64),
 			strconv.FormatFloat(float64(data.Price), 'f', 2, 64), sourceMap[cow.SourceId])
 	case pasturePb.EventType_Transfer_Ben:
 		data := req.(*model.EventTransferGroup)