router: update

http/route/pasture_api.go

@@ -49,12 +49,12 @@ func PastureManageAPI(opts ...func(engine *gin.Engine)) func(s *gin.Engine) {
 		// 同期相关
 		pastureRoute.POST("/same/time/createOrUpdate", pasture.SameTimeCreatedOrUpdate)
 		pastureRoute.POST("/same/time/list", pasture.SameTimeList)
-		pastureRoute.PUT("/same/time/is_show/:id", pasture.SameTimeIsShow)
+		pastureRoute.PUT("/same/time/isShow/:id", pasture.SameTimeIsShow)
 
 		// 经销商相关
 		pastureRoute.POST("/dealer/createOrUpdate", pasture.SaleDealerCreateOrUpdate)
 		pastureRoute.POST("/dealer/list", pasture.SaleDealerList)
-		pastureRoute.PUT("/dealer/is_show/:id", pasture.SaleDealerIsShow)
+		pastureRoute.PUT("/dealer/isShow/:id", pasture.SaleDealerIsShow)
 
 		// 基础参数
 		pastureRoute.POST("/system/basic/list", pasture.SystemBasicList)

module/backend/calendar.go

@@ -44,7 +44,7 @@ func (s *StoreEntry) CalendarToDoHistoryList(ctx context.Context, pastureId int6
 	sql := `SELECT a.cow_id,b.pen_name,a.calendar_type_name,a.calendar_type_kind as calendar_type,
 		DATE_FORMAT(FROM_UNIXTIME(a.plan_day), '%Y-%m-%d') AS plan_day,
 		DATE_FORMAT(FROM_UNIXTIME(a.end_day), '%Y-%m-%d') AS end_day,
-		DATE_FORMAT(FROM_UNIXTIME(a.reality_day), '%Y-%m-%d') AS reality_day,
+		IF(a.reality_day <= 0, '', DATE_FORMAT(FROM_UNIXTIME(a.reality_day), '%Y-%m-%d')) AS reality_day
 		a.remaining_days,b.lact,b.ear_number,a.status as is_finish,a.remarks
 		FROM (
 			SELECT cow_id,plan_day,end_day,reality_day,status,remarks,'免疫' as calendar_type_name,1 as calendar_type_kind,TIMESTAMPDIFF(DAY, NOW(), FROM_UNIXTIME(end_day)) AS remaining_days 

util/util_test.go

@@ -536,15 +536,15 @@ type WeeklyActiveModel struct {
 
 func Test_demo(t *testing.T) {
 	str := "insert into system_pasture_menu (pasture_id,menu_id,created_at,updated_at) values"
-	for i := 36; i <= 134; i++ {
-		str += fmt.Sprintf("(4,%d,1748922530,1748922530),", i)
+	for i := 36; i <= 135; i++ {
+		str += fmt.Sprintf("(11,%d,1748922530,1748922530),", i)
 	}
 
 	fmt.Println(strings.TrimRight(str, ","))
 
 	str1 := "insert into system_role_menu (role_id,menu_id,created_at,updated_at) values"
-	for i := 36; i <= 134; i++ {
-		str1 += fmt.Sprintf("(10,%d,1748922530,1748922530),", i)
+	for i := 36; i <= 135; i++ {
+		str1 += fmt.Sprintf("(11,%d,1748922530,1748922530),", i)
 	}
 
 	fmt.Println(strings.TrimRight(str1, ","))