event: bug修复

http/handler/event/event_base.go

@@ -48,9 +48,9 @@ func EnterEventCreate(c *gin.Context) {
 		valid.Field(&req.CowType, valid.Required),
 		valid.Field(&req.CowKind, valid.Required),
 		valid.Field(&req.CowSource, valid.Required),
-		valid.Field(&req.Lact, valid.Required),
+		valid.Field(&req.Price, valid.Required),
 		valid.Field(&req.EnterAt, valid.Required),
-		valid.Field(&req.CowSource, valid.Required),
+		valid.Field(&req.PenId, valid.Required),
 		valid.Field(&req.OperationId, valid.Required),
 		valid.Field(&req.Weight, valid.Required),
 	); err != nil {

model/event_transfer_group.go

@@ -3,21 +3,22 @@ package model
 import pasturePb "gitee.com/xuyiping_admin/go_proto/proto/go/backend/cow"
 
 type EventTransferGroup struct {
-	Id               int64  `json:"id"`
-	CowId            int64  `json:"cowId"`
-	PenInId          int32  `json:"penInId"`
-	PenOutId         int32  `json:"penOutId"`
-	DayAge           int32  `json:"dayAge"`
-	Lact             int32  `json:"lact"`
-	TransferDate     string `json:"transferDate"`
-	TransferReasonId int64  `json:"transferReasonId"`
-	Remarks          string `json:"remarks"`
-	MessageId        int64  `json:"messageId"`
-	MessageName      string `json:"messageName"`
-	OperationId      int64  `json:"operationId"`
-	OperationName    string `json:"operationName"`
-	CreatedAt        int64  `json:"createdAt"`
-	UpdatedAt        int64  `json:"updatedAt"`
+	Id                 int64  `json:"id"`
+	CowId              int64  `json:"cowId"`
+	PenInId            int32  `json:"penInId"`
+	PenOutId           int32  `json:"penOutId"`
+	DayAge             int32  `json:"dayAge"`
+	Lact               int32  `json:"lact"`
+	TransferDate       string `json:"transferDate"`
+	TransferReasonId   int64  `json:"transferReasonId"`
+	TransferReasonName string `json:"TransferReasonName"`
+	Remarks            string `json:"remarks"`
+	MessageId          int64  `json:"messageId"`
+	MessageName        string `json:"messageName"`
+	OperationId        int64  `json:"operationId"`
+	OperationName      string `json:"operationName"`
+	CreatedAt          int64  `json:"createdAt"`
+	UpdatedAt          int64  `json:"updatedAt"`
 }
 
 func (e *EventTransferGroup) TableName() string {
@@ -29,19 +30,20 @@ type EventTransferGroupModel struct {
 	EventTransferGroup *EventTransferGroup
 }
 
-func NewEventTransferGroup(cow *Cow, req *pasturePb.TransferGroupEventData, currentUser *SystemUser, operationUser *SystemUser) *EventTransferGroup {
+func NewEventTransferGroup(cow *Cow, req *pasturePb.TransferGroupEventData, transferPenMap map[int32]string, currentUser *SystemUser, operationUser *SystemUser) *EventTransferGroup {
 	return &EventTransferGroup{
-		CowId:            int64(req.CowId),
-		PenInId:          req.TransferInPenId,
-		PenOutId:         cow.PenId,
-		Lact:             cow.Lact,
-		DayAge:           cow.GetDayAge(),
-		TransferDate:     req.TransferDate,
-		TransferReasonId: int64(req.TransferReasonId),
-		Remarks:          req.Remarks,
-		MessageId:        currentUser.Id,
-		MessageName:      currentUser.Name,
-		OperationId:      operationUser.Id,
-		OperationName:    operationUser.Name,
+		CowId:              int64(req.CowId),
+		PenInId:            req.TransferInPenId,
+		PenOutId:           cow.PenId,
+		Lact:               cow.Lact,
+		DayAge:             cow.GetDayAge(),
+		TransferDate:       req.TransferDate,
+		TransferReasonId:   int64(req.TransferReasonId),
+		TransferReasonName: transferPenMap[req.TransferReasonId],
+		Remarks:            req.Remarks,
+		MessageId:          currentUser.Id,
+		MessageName:        currentUser.Name,
+		OperationId:        operationUser.Id,
+		OperationName:      operationUser.Name,
 	}
 }

module/backend/enum_map.go

@@ -286,3 +286,11 @@ func (s *StoreEntry) EventCategoryMap() map[pasturePb.EventCategory_Kind]string
 	}
 	return res
 }
+
+func (s *StoreEntry) TransferPenMap() map[int32]string {
+	res := make(map[int32]string)
+	for _, v := range s.TransferPenEnumList("") {
+		res[v.Value] = v.Label
+	}
+	return res
+}

module/backend/event_base.go

@@ -156,6 +156,7 @@ func (s *StoreEntry) CreateGroupTransfer(ctx context.Context, req *pasturePb.Tra
 	}
 
 	newEventTransferGroupModelList := make([]*model.EventTransferGroupModel, 0)
+	transferPenMap := s.TransferPenMap()
 	for _, v := range req.Body {
 		cow, err := s.GetCowInfoByCowId(ctx, currentUser.PastureId, int64(v.CowId))
 		if err != nil {
@@ -169,7 +170,7 @@ func (s *StoreEntry) CreateGroupTransfer(ctx context.Context, req *pasturePb.Tra
 		if err != nil {
 			return xerr.WithStack(err)
 		}
-		newEventTransferGroup := model.NewEventTransferGroup(cow, v, currentUser, operationUser)
+		newEventTransferGroup := model.NewEventTransferGroup(cow, v, transferPenMap, currentUser, operationUser)
 		newEventTransferGroupModelList = append(newEventTransferGroupModelList, &model.EventTransferGroupModel{
 			Cow:                cow,
 			EventTransferGroup: newEventTransferGroup,