items: 孕检清单增加字段

go.mod

@@ -3,7 +3,7 @@ module kpt-pasture
 go 1.17
 
 require (
-	gitee.com/xuyiping_admin/go_proto v0.0.0-20250331022421-15889f6c46c3
+	gitee.com/xuyiping_admin/go_proto v0.0.0-20250331025336-cc1744596fab
 	gitee.com/xuyiping_admin/pkg v0.0.0-20241108060137-caea58c59f5b
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/eclipse/paho.mqtt.golang v1.4.3

go.sum

@@ -98,6 +98,8 @@ gitee.com/xuyiping_admin/go_proto v0.0.0-20250326061245-9a4fbec39fb6 h1:mfOzWgdB
 gitee.com/xuyiping_admin/go_proto v0.0.0-20250326061245-9a4fbec39fb6/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
 gitee.com/xuyiping_admin/go_proto v0.0.0-20250331022421-15889f6c46c3 h1:4bIc13fiux6y03FOqptxj8VhHtvHMCltkF4CNuROMKg=
 gitee.com/xuyiping_admin/go_proto v0.0.0-20250331022421-15889f6c46c3/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20250331025336-cc1744596fab h1:Y4tbyz3hLuoyLjixwDK3JMIIWGfLH94UxUuaFXZxEtI=
+gitee.com/xuyiping_admin/go_proto v0.0.0-20250331025336-cc1744596fab/go.mod h1:BKrFW6YLDectlQcQk3FYKBeXvjEiodAKJ5rq7O/QiPE=
 gitee.com/xuyiping_admin/pkg v0.0.0-20241108060137-caea58c59f5b h1:w05MxH7yqveRlaRbxHhbif5YjPrJFodRPfOjYhXn7Zk=
 gitee.com/xuyiping_admin/pkg v0.0.0-20241108060137-caea58c59f5b/go.mod h1:8tF25X6pE9WkFCczlNAC0K2mrjwKvhhp02I7o0HtDxY=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=

module/backend/calendar.go

@@ -339,6 +339,7 @@ func (s *StoreEntry) PregnancyCheckCowList(ctx context.Context, req *pasturePb.I
 	var count int64
 	pref := s.DB.Table(fmt.Sprintf("%s as a", new(model.EventPregnantCheck).TableName())).
 		Select(`a.id,a.cow_id,a.ear_number,a.pen_id,a.status,b.breed_status,b.pen_name,b.cow_type,
+		DATE_FORMAT(FROM_UNIXTIME(b.last_mating_at),'%Y-%m-%d')as mating_at_format,pregnancy_age,DATEDIFF(CURDATE(), FROM_UNIXTIME(last_mating_at)) AS mating_age,
 		CASE a.pregnant_check_name
         WHEN 'pregnant_check_for_first' THEN '初检'
         WHEN 'pregnant_check_for_second' THEN '复检'
@@ -397,6 +398,7 @@ func (s *StoreEntry) PregnancyCheckCowList(ctx context.Context, req *pasturePb.I
 				"matingAtFormat":  "配种日期",
 				"matingAge":       "配后天数",
 				"bullId":          "配种公牛",
+				"pregnancyAge":    "怀孕天数",
 			},
 			List: newPregnancyCheckItems,
 		},

module/backend/event_check.go

@@ -2,9 +2,12 @@ package backend
 
 import (
 	"context"
+	"errors"
 	"kpt-pasture/model"
 	"time"
 
+	"gorm.io/gorm"
+
 	"go.uber.org/zap"
 
 	"gitee.com/xuyiping_admin/pkg/logger/zaplog"
@@ -165,8 +168,8 @@ func (s *StoreEntry) PregnantCheckDataCheck(ctx context.Context, pastureId int64
 		}
 
 		lastEventMating, err := s.FindLastEventMatingByCowId(ctx, pastureId, cowInfo.Id)
-		if err != nil {
-			return nil, xerr.WithStack(err)
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, xerr.Customf("未发现该牛只: %s 配种数据", cowInfo.EarNumber)
 		}
 
 		if lastEventMating == nil || lastEventMating.Status == pasturePb.IsShow_No {