crontab: neckRingMerge 优化chang_filter字段数据

module/crontab/model.go

@@ -65,6 +65,7 @@ type FilterData struct {
 	ChangeFilter   int32
 	RuminaFilter   int32
 	ChewFilter     int32
+	ChangeHigh     int32
 }
 
 type SumHabit struct {

module/crontab/neck_ring_calculate.go

@@ -265,18 +265,6 @@ func (e *Entry) SecondUpdateChangeFilter(pastureId int64, processIds []int64, xT
 			chewFilter = 50
 		}
 
-		zaplog.Info("SecondUpdateChangeFilter",
-			zap.Any("NeckActiveHabit", v),
-			zap.Any("discount", discount),
-			zap.Any("xChangeDiscount", xChangeDiscount),
-			zap.Any("xRuminaDisc", xRuminaDisc),
-			zap.Any("chewFilterDiscount", chewFilterDiscount),
-			zap.Any("secondFilterData", secondFilterData),
-			zap.Any("changeFilter", changeFilter),
-			zap.Any("ruminaFilter", ruminaFilter),
-			zap.Any("chewFilter", chewFilter),
-		)
-
 		if err := e.DB.Model(new(model.NeckActiveHabit)).
 			Select("change_filter", "rumina_filter", "chew_filter").
 			Where("id = ?", v.Id).

module/crontab/sql.go

@@ -247,7 +247,8 @@ func (e *Entry) GetMinIdByHeatDate(heatDate string, defaultId int64) (int64, err
 func (e *Entry) FindFilterData(pastureId int64, neckRingNumber, heatDate string, frameId int32) *FilterData {
 	firstFilterData := &FilterData{}
 	if err := e.DB.Model(new(model.NeckActiveHabit)).
-		Select("neck_ring_number", "filter_high", "filter_rumina", "filter_chew", "change_filter", "rumina_filter", "chew_filter").
+		Select("neck_ring_number", "filter_high", "filter_rumina", "filter_chew",
+			"change_filter", "rumina_filter", "chew_filter", "change_high").
 		Where("neck_ring_number = ?", neckRingNumber).
 		Where("heat_date = ?", heatDate).
 		Where("frameid = ?", frameId).

util/util_test.go

@@ -557,8 +557,6 @@ func Test_demo(t *testing.T) {
 		fmt.Println("2")
 	}*/
 
-	realityDay, _ := TimeParseLocal("2006-01-02", "2025-07-10")
-	endDay, _ := TimeParseLocal("2006-01-02", "2025-07-05")
-	overdueDay := int32(DaysBetween(realityDay.Unix(), endDay.Unix()))
-	fmt.Println(overdueDay)
+	a := float64(3) / 10
+	fmt.Println(a)
 }