Merge branch 'feature/bug-list' of xuyiping/kpt-tmr-group into develop

http/handler/feed/feed_formula.go

@@ -150,17 +150,11 @@ func DetailBySort(c *gin.Context) {
 		return
 	}
 
-	for _, v := range req.List {
-		if err := valid.ValidateStruct(&req,
-			valid.Field(&req.FeedFormulaId, valid.Required, valid.Min(1)),
-			valid.Field(&v.ForageId, valid.Required, valid.Min(1)),
-			valid.Field(&v.ForageName, valid.Required, valid.Length(1, 30)),
-			valid.Field(&v.Weight, valid.Required, valid.Min(1)),
-			valid.Field(&v.Sort, valid.Required, valid.Min(1)),
-		); err != nil {
-			apierr.AbortBadRequest(c, http.StatusBadRequest, err)
-			return
-		}
+	if err := valid.ValidateStruct(&req,
+		valid.Field(&req.FeedFormulaId, valid.Required, valid.Min(1)),
+	); err != nil {
+		apierr.AbortBadRequest(c, http.StatusBadRequest, err)
+		return
 	}
 
 	if err := middleware.BackendOperation(c).OpsService.FeedFormulaDetailBySort(c, &req); err != nil {
@@ -205,17 +199,12 @@ func DeleteFeedDetail(c *gin.Context) {
 		return
 	}
 
-	for _, v := range req.List {
-		if err := valid.ValidateStruct(&req,
-			valid.Field(&req.FeedFormulaId, valid.Required, valid.Min(1)),
-			valid.Field(&v.ForageId, valid.Required, valid.Min(1)),
-			valid.Field(&v.ForageName, valid.Required, valid.Length(1, 30)),
-			valid.Field(&v.Weight, valid.Required, valid.Min(1)),
-			valid.Field(&v.Sort, valid.Required, valid.Min(1)),
-		); err != nil {
-			apierr.AbortBadRequest(c, http.StatusBadRequest, err)
-			return
-		}
+	if err := valid.ValidateStruct(&req,
+		valid.Field(&req.FeedFormulaId, valid.Required, valid.Min(1)),
+
+	); err != nil {
+		apierr.AbortBadRequest(c, http.StatusBadRequest, err)
+		return
 	}
 
 	if err := middleware.BackendOperation(c).OpsService.DeleteFeedFormulaDetail(c, &req); err != nil {

module/backend/mock/kptservice.go

@@ -52,6 +52,20 @@ func (mr *MockKptServiceMockRecorder) AddCattleCategory(arg0, arg1 interface{})
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddCattleCategory", reflect.TypeOf((*MockKptService)(nil).AddCattleCategory), arg0, arg1)
 }
 
+// AddFeedByFeedFormula mocks base method.
+func (m *MockKptService) AddFeedByFeedFormula(arg0 context.Context, arg1 *operationPb.GroupAddFeedFormulaDetail) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "AddFeedByFeedFormula", arg0, arg1)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// AddFeedByFeedFormula indicates an expected call of AddFeedByFeedFormula.
+func (mr *MockKptServiceMockRecorder) AddFeedByFeedFormula(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddFeedByFeedFormula", reflect.TypeOf((*MockKptService)(nil).AddFeedByFeedFormula), arg0, arg1)
+}
+
 // AddForageCategory mocks base method.
 func (m *MockKptService) AddForageCategory(arg0 context.Context, arg1 *operationPb.AddForageCategoryRequest) error {
 	m.ctrl.T.Helper()
@@ -265,6 +279,20 @@ func (mr *MockKptServiceMockRecorder) DeleteFeedFormula(arg0, arg1 interface{})
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteFeedFormula", reflect.TypeOf((*MockKptService)(nil).DeleteFeedFormula), arg0, arg1)
 }
 
+// DeleteFeedFormulaDetail mocks base method.
+func (m *MockKptService) DeleteFeedFormulaDetail(arg0 context.Context, arg1 *operationPb.GroupAddFeedFormulaDetail) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "DeleteFeedFormulaDetail", arg0, arg1)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// DeleteFeedFormulaDetail indicates an expected call of DeleteFeedFormulaDetail.
+func (mr *MockKptServiceMockRecorder) DeleteFeedFormulaDetail(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteFeedFormulaDetail", reflect.TypeOf((*MockKptService)(nil).DeleteFeedFormulaDetail), arg0, arg1)
+}
+
 // DeleteForageCategory mocks base method.
 func (m *MockKptService) DeleteForageCategory(arg0 context.Context, arg1 int64) error {
 	m.ctrl.T.Helper()
@@ -392,6 +420,20 @@ func (mr *MockKptServiceMockRecorder) EditCattleCategory(arg0, arg1 interface{})
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EditCattleCategory", reflect.TypeOf((*MockKptService)(nil).EditCattleCategory), arg0, arg1)
 }
 
+// EditFeedByFeedFormula mocks base method.
+func (m *MockKptService) EditFeedByFeedFormula(arg0 context.Context, arg1 *operationPb.AddFeedFormulaDetail) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "EditFeedByFeedFormula", arg0, arg1)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// EditFeedByFeedFormula indicates an expected call of EditFeedByFeedFormula.
+func (mr *MockKptServiceMockRecorder) EditFeedByFeedFormula(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EditFeedByFeedFormula", reflect.TypeOf((*MockKptService)(nil).EditFeedByFeedFormula), arg0, arg1)
+}
+
 // EditFeedFormula mocks base method.
 func (m *MockKptService) EditFeedFormula(arg0 context.Context, arg1 *operationPb.AddFeedFormulaRequest) error {
 	m.ctrl.T.Helper()
@@ -637,6 +679,35 @@ func (mr *MockKptServiceMockRecorder) FeedChartStatistics(arg0, arg1 interface{}
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FeedChartStatistics", reflect.TypeOf((*MockKptService)(nil).FeedChartStatistics), arg0, arg1)
 }
 
+// FeedFormulaDetailBySort mocks base method.
+func (m *MockKptService) FeedFormulaDetailBySort(arg0 context.Context, arg1 *operationPb.GroupAddFeedFormulaDetail) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "FeedFormulaDetailBySort", arg0, arg1)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// FeedFormulaDetailBySort indicates an expected call of FeedFormulaDetailBySort.
+func (mr *MockKptServiceMockRecorder) FeedFormulaDetailBySort(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FeedFormulaDetailBySort", reflect.TypeOf((*MockKptService)(nil).FeedFormulaDetailBySort), arg0, arg1)
+}
+
+// FeedFormulaDetailList mocks base method.
+func (m *MockKptService) FeedFormulaDetailList(arg0 context.Context, arg1 *operationPb.FeedFormulaDetailRequest) (*operationPb.FeedFormulaDetailResponse, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "FeedFormulaDetailList", arg0, arg1)
+	ret0, _ := ret[0].(*operationPb.FeedFormulaDetailResponse)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// FeedFormulaDetailList indicates an expected call of FeedFormulaDetailList.
+func (mr *MockKptServiceMockRecorder) FeedFormulaDetailList(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FeedFormulaDetailList", reflect.TypeOf((*MockKptService)(nil).FeedFormulaDetailList), arg0, arg1)
+}
+
 // FeedFormulaDetailListSyncData mocks base method.
 func (m *MockKptService) FeedFormulaDetailListSyncData(arg0 context.Context, arg1 *operationPb.FeedFormulaSyncRequest) error {
 	m.ctrl.T.Helper()
@@ -737,6 +808,21 @@ func (mr *MockKptServiceMockRecorder) ForageListSort(arg0, arg1 interface{}) *go
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ForageListSort", reflect.TypeOf((*MockKptService)(nil).ForageListSort), arg0, arg1)
 }
 
+// GetCurrentUserName mocks base method.
+func (m *MockKptService) GetCurrentUserName(arg0 context.Context) (string, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetCurrentUserName", arg0)
+	ret0, _ := ret[0].(string)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// GetCurrentUserName indicates an expected call of GetCurrentUserName.
+func (mr *MockKptServiceMockRecorder) GetCurrentUserName(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCurrentUserName", reflect.TypeOf((*MockKptService)(nil).GetCurrentUserName), arg0)
+}
+
 // GetDataByName mocks base method.
 func (m *MockKptService) GetDataByName(arg0 context.Context, arg1 *operationPb.GetDataByNameRequest) (*model.PastureCommonResponse, error) {
 	m.ctrl.T.Helper()
@@ -827,21 +913,6 @@ func (mr *MockKptServiceMockRecorder) GetUserInfo(arg0, arg1 interface{}) *gomoc
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUserInfo", reflect.TypeOf((*MockKptService)(nil).GetUserInfo), arg0, arg1)
 }
 
-// GetUserName mocks base method.
-func (m *MockKptService) GetUserName(arg0 context.Context) (string, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "GetUserName", arg0)
-	ret0, _ := ret[0].(string)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// GetUserName indicates an expected call of GetUserName.
-func (mr *MockKptServiceMockRecorder) GetUserName(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUserName", reflect.TypeOf((*MockKptService)(nil).GetUserName), arg0)
-}
-
 // InventoryStatisticsExcelExport mocks base method.
 func (m *MockKptService) InventoryStatisticsExcelExport(arg0 context.Context, arg1 *operationPb.SearchInventoryStatisticsRequest) (*bytes.Buffer, error) {
 	m.ctrl.T.Helper()
@@ -955,6 +1026,20 @@ func (mr *MockKptServiceMockRecorder) IsShowSystemUser(arg0, arg1 interface{}) *
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsShowSystemUser", reflect.TypeOf((*MockKptService)(nil).IsShowSystemUser), arg0, arg1)
 }
 
+// MixedFeedFormula mocks base method.
+func (m *MockKptService) MixedFeedFormula(arg0 context.Context, arg1 *operationPb.MixedFeedFormulaRequest) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "MixedFeedFormula", arg0, arg1)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// MixedFeedFormula indicates an expected call of MixedFeedFormula.
+func (mr *MockKptServiceMockRecorder) MixedFeedFormula(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MixedFeedFormula", reflect.TypeOf((*MockKptService)(nil).MixedFeedFormula), arg0, arg1)
+}
+
 // ResetPasswordGroupPasture mocks base method.
 func (m *MockKptService) ResetPasswordGroupPasture(arg0 context.Context, arg1 int64) error {
 	m.ctrl.T.Helper()
@@ -1028,6 +1113,21 @@ func (mr *MockKptServiceMockRecorder) SearchCattleCategoryList(arg0, arg1 interf
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SearchCattleCategoryList", reflect.TypeOf((*MockKptService)(nil).SearchCattleCategoryList), arg0, arg1)
 }
 
+// SearchFeedFormulaDetail mocks base method.
+func (m *MockKptService) SearchFeedFormulaDetail(arg0 context.Context, arg1 *operationPb.AddFeedFormulaDetail) (*operationPb.FeedFormulaDetailResponse, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "SearchFeedFormulaDetail", arg0, arg1)
+	ret0, _ := ret[0].(*operationPb.FeedFormulaDetailResponse)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// SearchFeedFormulaDetail indicates an expected call of SearchFeedFormulaDetail.
+func (mr *MockKptServiceMockRecorder) SearchFeedFormulaDetail(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SearchFeedFormulaDetail", reflect.TypeOf((*MockKptService)(nil).SearchFeedFormulaDetail), arg0, arg1)
+}
+
 // SearchFeedFormulaList mocks base method.
 func (m *MockKptService) SearchFeedFormulaList(arg0 context.Context, arg1 *operationPb.SearchFeedFormulaRequest) (*operationPb.SearchFeedFormulaListResponse, error) {
 	m.ctrl.T.Helper()