|
|
@@ -550,41 +550,44 @@ func NewSearchFeedTemplateList(ctx context.Context, req *pasturePb.SearchFeedTem
|
|
|
|
|
|
res := make([]*models.FeedTemplate, 0)
|
|
|
|
|
|
+ if req.PastureId > 0 {
|
|
|
+ DBSession.And("pastureid = ?", req.PastureId)
|
|
|
+ }
|
|
|
+
|
|
|
if req.Name != "" {
|
|
|
- DBSession.Where("name like ?", "%"+req.Name+"%")
|
|
|
+ DBSession.And("tname like ?", "%"+req.Name+"%")
|
|
|
}
|
|
|
|
|
|
if req.CattleCategoryId > 0 {
|
|
|
- DBSession.Where("ccid = ?", req.CattleCategoryId)
|
|
|
+ DBSession.And("ccid = ?", req.CattleCategoryId)
|
|
|
}
|
|
|
|
|
|
if req.FormulaTypeId > 0 {
|
|
|
- DBSession.Where("fttypeid = ?", req.FormulaTypeId)
|
|
|
+ DBSession.And("fttypeid = ?", req.FormulaTypeId)
|
|
|
}
|
|
|
|
|
|
switch req.SourceId {
|
|
|
case 0:
|
|
|
- DBSession.Where("source = '自定义'")
|
|
|
+ DBSession.And("source = '自定义'")
|
|
|
case 1:
|
|
|
- DBSession.Where("source = '集团下发未调整'")
|
|
|
+ DBSession.And("source = '集团下发未调整'")
|
|
|
case 2:
|
|
|
- DBSession.Where("source = '集团下发有调整'")
|
|
|
+ DBSession.And("source = '集团下发有调整'")
|
|
|
case 3:
|
|
|
- DBSession.Where("source = '导入'")
|
|
|
+ DBSession.And("source = '导入'")
|
|
|
}
|
|
|
|
|
|
if req.Enable > 0 {
|
|
|
- DBSession.Where("enable = ?", req.Enable)
|
|
|
+ DBSession.And("enable = ?", req.Enable)
|
|
|
}
|
|
|
if req.Remark != "" {
|
|
|
- DBSession.Where("remark = ?", req.Remark)
|
|
|
+ DBSession.And("remark = ?", req.Remark)
|
|
|
}
|
|
|
|
|
|
- DBSession.Desc("id")
|
|
|
- if total, err := DBSession.Count(&res); err != nil {
|
|
|
+ if err := DBSession.Desc("id").Find(&res); err != nil {
|
|
|
return nil, 0, err
|
|
|
} else {
|
|
|
- return res, total, nil
|
|
|
+ return res, int64(len(res)), nil
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -622,7 +625,7 @@ func GetFeedDetailVersionByDesc(ctx context.Context, pastureId, feedTemplateId i
|
|
|
func SearchFeedDetailVersionLogById(ctx context.Context, pastureId, feedTemplateId, versionId int64) ([]*models.FeedDetailVersionLog, error) {
|
|
|
res := make([]*models.FeedDetailVersionLog, 0)
|
|
|
if err := restful.Engine.NewSession().Table(new(models.FeedDetailVersionLog).TableName()).Where("pasture_id = ?", pastureId).
|
|
|
- And("feed_formula_id = ?", feedTemplateId).And("version = ?", versionId).Find(&res); err != nil {
|
|
|
+ And("feed_template_id = ?", feedTemplateId).And("version_id = ?", versionId).Find(&res); err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
|
return res, nil
|
