|
|
@@ -2,9 +2,9 @@ package backend
|
|
|
|
|
|
import (
|
|
|
"context"
|
|
|
- "errors"
|
|
|
"fmt"
|
|
|
"kpt-pasture/model"
|
|
|
+ "kpt-pasture/util"
|
|
|
"net/http"
|
|
|
"strings"
|
|
|
"time"
|
|
|
@@ -227,7 +227,12 @@ func (s *StoreEntry) PregnantCheckCreate(ctx context.Context, req *pasturePb.Eve
|
|
|
}
|
|
|
|
|
|
// 抽象公共方法来更新牛只状态
|
|
|
-func (s *StoreEntry) updateCowStatus(tx *gorm.DB, cowIds []int64, breedStatus pasturePb.BreedStatus_Kind, matingResult pasturePb.MatingResult_Kind) error {
|
|
|
+func (s *StoreEntry) updateCowStatus(
|
|
|
+ tx *gorm.DB,
|
|
|
+ cowIds []int64,
|
|
|
+ breedStatus pasturePb.BreedStatus_Kind,
|
|
|
+ matingResult pasturePb.MatingResult_Kind,
|
|
|
+) error {
|
|
|
if len(cowIds) > 0 {
|
|
|
if err := tx.Model(&model.Cow{}).Where("cow_id IN ?", cowIds).
|
|
|
Updates(map[string]interface{}{"breed_status": breedStatus}).Error; err != nil {
|
|
|
@@ -246,7 +251,9 @@ func (s *StoreEntry) updateCowStatus(tx *gorm.DB, cowIds []int64, breedStatus pa
|
|
|
func (s *StoreEntry) MatingList(ctx context.Context, req *pasturePb.SearchEventRequest, pagination *pasturePb.PaginationModel) (*pasturePb.MatingEventResponse, error) {
|
|
|
matingList := make([]*model.EventMating, 0)
|
|
|
var count int64 = 0
|
|
|
- pref := s.DB.Table(new(model.EventMating).TableName())
|
|
|
+ pref := s.DB.Model(new(model.EventMating)).
|
|
|
+ Where("mating_result > ?", pasturePb.MatingResult_Invalid).
|
|
|
+ Where("status = ?", pasturePb.IsShow_No)
|
|
|
if len(req.CowId) > 0 {
|
|
|
cowIds := strings.Split(req.CowId, ",")
|
|
|
pref.Where("cow_id IN ?", cowIds)
|
|
|
@@ -259,13 +266,12 @@ func (s *StoreEntry) MatingList(ctx context.Context, req *pasturePb.SearchEventR
|
|
|
return nil, xerr.WithStack(err)
|
|
|
}
|
|
|
|
|
|
- systemUserList, _ := s.SystemUserList(ctx)
|
|
|
exposeEstrusTypeMap := s.ExposeEstrusTypeMap()
|
|
|
return &pasturePb.MatingEventResponse{
|
|
|
Code: http.StatusOK,
|
|
|
Message: "ok",
|
|
|
Data: &pasturePb.SearchMatingData{
|
|
|
- List: model.EventMatingSlice(matingList).ToPB(systemUserList, exposeEstrusTypeMap),
|
|
|
+ List: model.EventMatingSlice(matingList).ToPB(exposeEstrusTypeMap),
|
|
|
Total: int32(count),
|
|
|
PageSize: pagination.PageSize,
|
|
|
Page: pagination.Page,
|
|
|
@@ -282,15 +288,13 @@ func (s *StoreEntry) MatingCreate(ctx context.Context, req *pasturePb.EventMatin
|
|
|
return xerr.WithStack(err)
|
|
|
}
|
|
|
|
|
|
+ systemUser, _ := s.GetSystemUserById(ctx, int64(req.StaffMemberId))
|
|
|
eventFrozenSemenLogList := make([]*model.FrozenSemenLog, 0)
|
|
|
- currentUser, _ := s.GetCurrentSystemUser(ctx)
|
|
|
frozenSemen := &model.FrozenSemen{}
|
|
|
- if err = s.DB.Where("bull_id = ?", req.BullId).First(frozenSemen).Error; err != nil {
|
|
|
+ if err = s.DB.Where("bull_id = ?", req.FrozenSemenNumber).First(frozenSemen).Error; err != nil {
|
|
|
return xerr.WithStack(err)
|
|
|
}
|
|
|
|
|
|
- sameTimeCowIds := make([]int64, 0)
|
|
|
- matingInsertList := make([]*model.EventMating, 0)
|
|
|
matingUpdateIds := make([]int64, 0)
|
|
|
cowIds := make([]int64, 0)
|
|
|
nowTime := time.Now()
|
|
|
@@ -305,38 +309,40 @@ func (s *StoreEntry) MatingCreate(ctx context.Context, req *pasturePb.EventMatin
|
|
|
}
|
|
|
|
|
|
// 判断当前输精时间距离上次输精时间是否超过2天，如果超过则更新为复配状态
|
|
|
- itemBeforeTwoDays := nowTime.Sub(time.Unix(itemEventMating.MatingAt, 0)).Hours()
|
|
|
+ itemBeforeTwoDays := nowTime.Sub(time.Unix(util.TimeParseLocalUnix(itemEventMating.RealityDay), 0)).Hours()
|
|
|
if count > 0 && itemBeforeTwoDays > 48 {
|
|
|
matingUpdateIds = append(matingUpdateIds, itemEventMating.Id)
|
|
|
- } else {
|
|
|
- matingInsertList = append(matingInsertList, model.NewEventMating(cow, currentUser, req))
|
|
|
}
|
|
|
|
|
|
eventFrozenSemenLogList = append(
|
|
|
eventFrozenSemenLogList,
|
|
|
- model.NewEventFrozenSemenLog(req.BullId, cow, int64(req.StaffMemberId)),
|
|
|
+ model.NewEventFrozenSemenLog(req.FrozenSemenNumber, cow, int64(req.StaffMemberId)),
|
|
|
)
|
|
|
- sameTimeCow := &model.CowSameTime{}
|
|
|
- if err = s.DB.Where("lact = ?", cow.Lact).
|
|
|
- Where("cow_id = ?", cow.Id).
|
|
|
- Where("status = ?", pasturePb.SameTimeStatus_In_Progress).
|
|
|
- First(sameTimeCow).Error; err != nil {
|
|
|
- if !errors.Is(err, gorm.ErrRecordNotFound) {
|
|
|
- return xerr.WithStack(err)
|
|
|
- }
|
|
|
- }
|
|
|
- if sameTimeCow.Id > 0 {
|
|
|
- sameTimeCowIds = append(sameTimeCowIds, sameTimeCow.Id)
|
|
|
- }
|
|
|
|
|
|
cowIds = append(cowIds, cow.Id)
|
|
|
}
|
|
|
|
|
|
if err = s.DB.Transaction(func(tx *gorm.DB) error {
|
|
|
+ if len(cowIds) > 0 {
|
|
|
+ // 如果有同期牛只，则修改为已结束状态
|
|
|
+ if err = tx.Table(new(model.CowSameTime).TableName()).
|
|
|
+ Where("cow_id IN ?", cowIds).
|
|
|
+ UpdateColumn("status", pasturePb.SameTimeStatus_End).Error; err != nil {
|
|
|
+ }
|
|
|
|
|
|
- // 创建配种事件数据
|
|
|
- if len(matingInsertList) > 0 {
|
|
|
- if err = tx.Create(matingInsertList).Error; err != nil {
|
|
|
+ // 创建配种事件数据
|
|
|
+ if err = tx.Model(new(model.EventMating)).
|
|
|
+ Where("cow_id IN ?", cowIds).
|
|
|
+ Updates(map[string]interface{}{
|
|
|
+ "mating_result": pasturePb.MatingResult_Unknown,
|
|
|
+ "status": pasturePb.IsShow_Ok,
|
|
|
+ "reality_day": time.Unix(int64(req.MatingAt), 0).Format(model.LayoutTime),
|
|
|
+ "mating_number": 1,
|
|
|
+ "frozen_semen_number": req.FrozenSemenCount,
|
|
|
+ "operation_id": req.StaffMemberId,
|
|
|
+ "operation_name": systemUser.Name,
|
|
|
+ }).
|
|
|
+ Error; err != nil {
|
|
|
return xerr.WithStack(err)
|
|
|
}
|
|
|
}
|
|
|
@@ -346,7 +352,11 @@ func (s *StoreEntry) MatingCreate(ctx context.Context, req *pasturePb.EventMatin
|
|
|
if err = tx.Model(new(model.EventMating)).
|
|
|
Where("id IN ?", matingUpdateIds).
|
|
|
Where("mating_result = ?", pasturePb.MatingResult_Unknown).
|
|
|
- Update("mating_result", pasturePb.MatingResult_ReMatch).
|
|
|
+ Updates(map[string]interface{}{
|
|
|
+ "mating_result": pasturePb.MatingResult_ReMatch,
|
|
|
+ "mating_number": 2,
|
|
|
+ "frozen_semen_number": req.FrozenSemenCount,
|
|
|
+ }).
|
|
|
Error; err != nil {
|
|
|
return xerr.WithStack(err)
|
|
|
}
|
|
|
@@ -357,20 +367,12 @@ func (s *StoreEntry) MatingCreate(ctx context.Context, req *pasturePb.EventMatin
|
|
|
return xerr.WithStack(err)
|
|
|
}
|
|
|
|
|
|
- // 如果有同期牛只，则修改为已结束状态
|
|
|
- if len(sameTimeCowIds) > 0 {
|
|
|
- if err = tx.Table(new(model.CowSameTime).TableName()).
|
|
|
- Where("id IN ?", sameTimeCowIds).
|
|
|
- UpdateColumn("status", pasturePb.SameTimeStatus_End).Error; err != nil {
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
// 减去精液的数量
|
|
|
- if err = tx.Table(new(model.FrozenSemen).TableName()).
|
|
|
- Where("bull_id = ?", req.BullId).
|
|
|
+ if err = tx.Model(new(model.FrozenSemen)).
|
|
|
+ Where("id = ?", frozenSemen.Id).
|
|
|
Where("quantity > 0").
|
|
|
UpdateColumn("quantity",
|
|
|
- gorm.Expr("quantity - ?", len(matingUpdateIds)+len(matingInsertList)),
|
|
|
+ gorm.Expr("quantity - ?", len(matingUpdateIds)),
|
|
|
).Error; err != nil {
|
|
|
return xerr.WithStack(err)
|
|
|
}
|
|
|
@@ -484,8 +486,7 @@ func (s *StoreEntry) FrozenSemenCreate(ctx context.Context, req *pasturePb.Searc
|
|
|
}
|
|
|
|
|
|
func (s *StoreEntry) SameTimeCreate(ctx context.Context, req *pasturePb.EventSameTime) error {
|
|
|
- /*sameTime, err := s.GetSameTimeById(ctx, int64(req.SameTimeId))
|
|
|
- if err != nil {
|
|
|
+ if _, err := s.GetSameTimeById(ctx, int64(req.SameTimeId)); err != nil {
|
|
|
return xerr.WithStack(err)
|
|
|
}
|
|
|
|
|
|
@@ -493,6 +494,10 @@ func (s *StoreEntry) SameTimeCreate(ctx context.Context, req *pasturePb.EventSam
|
|
|
if err != nil {
|
|
|
return xerr.WithStack(err)
|
|
|
}
|
|
|
+ cowIds := make([]int64, 0)
|
|
|
+ for _, v := range cowList {
|
|
|
+ cowIds = append(cowIds, v.Id)
|
|
|
+ }
|
|
|
|
|
|
drugs := &model.Drugs{}
|
|
|
if req.DrugsId > 0 {
|
|
|
@@ -500,14 +505,115 @@ func (s *StoreEntry) SameTimeCreate(ctx context.Context, req *pasturePb.EventSam
|
|
|
return xerr.WithStack(err)
|
|
|
}
|
|
|
}
|
|
|
- newSameTimeCowList := model.NewSameTimeCowList(cowList, sameTime)
|
|
|
+ systemUser, _ := s.GetSystemUserById(ctx, int64(req.StaffMemberId))
|
|
|
+
|
|
|
+ if err = s.DB.Transaction(func(tx *gorm.DB) error {
|
|
|
+ if err = tx.Model(new(model.CowSameTime)).
|
|
|
+ Where("cow_id IN ?", cowIds).
|
|
|
+ Where("same_time_id = ?", req.SameTimeId).
|
|
|
+ Update("same_time_status", pasturePb.SameTimeStatus_In_Progress).Error; err != nil {
|
|
|
+ return xerr.WithStack(err)
|
|
|
+ }
|
|
|
+
|
|
|
+ if err = tx.Model(new(model.EventCowSameTime)).
|
|
|
+ Where("cow_id IN ?", cowIds).
|
|
|
+ Where("same_time_id = ?", req.SameTimeId).
|
|
|
+ Where("same_time_type = ?", req.SameTimeType).
|
|
|
+ Updates(map[string]interface{}{
|
|
|
+ "status": pasturePb.IsShow_Ok,
|
|
|
+ "drug_id": drugs.Id,
|
|
|
+ "unit": drugs.Unit,
|
|
|
+ "usage": req.Usage,
|
|
|
+ "remarks": req.Remarks,
|
|
|
+ "operation_id": req.StaffMemberId,
|
|
|
+ "operation_name": systemUser.Name,
|
|
|
+ }).Error; err != nil {
|
|
|
+ return xerr.WithStack(err)
|
|
|
+ }
|
|
|
+
|
|
|
+ return nil
|
|
|
+ }); err != nil {
|
|
|
+ return xerr.WithStack(err)
|
|
|
+ }
|
|
|
+ return nil
|
|
|
+}
|
|
|
+
|
|
|
+func (s *StoreEntry) AbortionCreate(ctx context.Context, req *pasturePb.EventAbortionRequest) error {
|
|
|
+ cow, err := s.GetCowInfoByCowId(ctx, int64(req.CowId))
|
|
|
+ if err != nil {
|
|
|
+ return xerr.WithStack(err)
|
|
|
+ }
|
|
|
+
|
|
|
+ systemUser, err := s.GetSystemUserById(ctx, int64(req.OperationId))
|
|
|
+ if err != nil {
|
|
|
+ return xerr.WithStack(err)
|
|
|
+ }
|
|
|
+
|
|
|
+ req.OperationName = systemUser.Name
|
|
|
+ abortionReasonsMap := s.AbortionReasonsMap()
|
|
|
+ newEventAbortion := model.NewEventAbortion(cow, req, abortionReasonsMap)
|
|
|
+
|
|
|
+ lastCowMating := &model.EventMating{}
|
|
|
+ if err = s.DB.Where("cow_id = ?", cow.Id).Order("id desc").First(lastCowMating).Error; err != nil {
|
|
|
+ return xerr.WithStack(err)
|
|
|
+ }
|
|
|
if err = s.DB.Transaction(func(tx *gorm.DB) error {
|
|
|
- if err = tx.Create(eventSameTimeList).Error; err != nil {
|
|
|
+ // 创建牛只流产事件数据
|
|
|
+ if err = tx.Create(newEventAbortion).Error; err != nil {
|
|
|
return xerr.WithStack(err)
|
|
|
}
|
|
|
+ // 更新牛只状态
|
|
|
+ if err = tx.Model(new(model.Cow)).Where("id = ?", req.CowId).
|
|
|
+ Updates(map[string]interface{}{
|
|
|
+ "is_pregnant": pasturePb.IsShow_No,
|
|
|
+ "last_abortion_at": req.AbortionAt,
|
|
|
+ "breed_status": pasturePb.BreedStatus_Abort,
|
|
|
+ }).Error; err != nil {
|
|
|
+ return xerr.WithStack(err)
|
|
|
+ }
|
|
|
+
|
|
|
+ // 更新最近一次配种结果为流产
|
|
|
+ if err = tx.Model(new(model.EventMating)).Where("id = ?", lastCowMating.Id).
|
|
|
+ Updates(map[string]interface{}{
|
|
|
+ "mating_result": pasturePb.MatingResult_Abort,
|
|
|
+ }).Error; err != nil {
|
|
|
+ }
|
|
|
return nil
|
|
|
}); err != nil {
|
|
|
return xerr.WithStack(err)
|
|
|
- }*/
|
|
|
+ }
|
|
|
+
|
|
|
return nil
|
|
|
}
|
|
|
+
|
|
|
+func (s *StoreEntry) AbortionList(
|
|
|
+ ctx context.Context,
|
|
|
+ req *pasturePb.SearchEventRequest,
|
|
|
+ pagination *pasturePb.PaginationModel,
|
|
|
+) (*pasturePb.EventAbortionResponse, error) {
|
|
|
+ abortionList := make([]*model.EventAbortion, 0)
|
|
|
+ var count int64 = 0
|
|
|
+ pref := s.DB.Model(new(model.EventAbortion))
|
|
|
+ if len(req.CowId) > 0 {
|
|
|
+ cowIds := strings.Split(req.CowId, ",")
|
|
|
+ pref.Where("cow_id IN ?", cowIds)
|
|
|
+ }
|
|
|
+
|
|
|
+ if err := pref.Order("id desc").
|
|
|
+ Count(&count).Limit(int(pagination.PageSize)).
|
|
|
+ Offset(int(pagination.PageOffset)).
|
|
|
+ Find(&abortionList).Error; err != nil {
|
|
|
+ return nil, xerr.WithStack(err)
|
|
|
+ }
|
|
|
+
|
|
|
+ return &pasturePb.EventAbortionResponse{
|
|
|
+ Code: http.StatusOK,
|
|
|
+ Message: "ok",
|
|
|
+ Data: &pasturePb.EventAbortionData{
|
|
|
+ List: model.AbortionSlice(abortionList).ToPB(),
|
|
|
+ Total: int32(count),
|
|
|
+ PageSize: pagination.PageSize,
|
|
|
+ Page: pagination.Page,
|
|
|
+ },
|
|
|
+ }, nil
|
|
|
+}
|
Yi