开发

controllers/new_mobile_api_controllers/common_api_controller.go

@@ -92,14 +92,17 @@ func (this *CommonApiController) SaveConfiguration() {
 }
 
 func (this *CommonApiController) GetConfigurationlist() {
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
 	adminUser := this.GetAdminUserInfo()
 	orgid := adminUser.CurrentOrgId
-	configurationlist, err := service.GetConfigurationlist(orgid)
+	configurationlist, total, err := service.GetConfigurationlist(orgid, limit, page)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
 		"configurationlist": configurationlist,
+		"total":             total,
 	})
 }

service/common_service.go

@@ -29,7 +29,7 @@ func SaveInspection(standard *models.XtQualityControlStandard) error {
 	return err
 }
 
-func GetConfigurationlist(orgid int64) (standard []*models.QualityControlStandard, err error) {
+func GetConfigurationlist(orgid int64, limit int64, page int64) (standard []*models.QualityControlStandard, total int64, err error) {
 
 	//err = XTReadDB().Model(&standard).Where("user_org_id = ? and status =1", orgid).Order("sort asc,created_time desc").Find(&standard).Error
 	//return standard,err
@@ -40,7 +40,8 @@ func GetConfigurationlist(orgid int64) (standard []*models.QualityControlStandar
 	}
 	table := XTReadDB().Table("xt_inspection_reference as s")
 	fmt.Println(table)
-	err = db.Group("x.id").Select("x.id,x.inspection_major,x.inspection_minor,x.min_range,x.large_range,x.sort,x.user_org_id,s.unit,s.project_name,s.item_name").
-		Joins("left join xt_inspection_reference as s on s.id = x.inspection_minor").Order("x.sort asc,x.created_time desc").Scan(&standard).Error
-	return standard, err
+	offset := (page - 1) * limit
+	err = db.Order("x.sort asc").Group("x.id").Select("x.id,x.inspection_major,x.inspection_minor,x.min_range,x.large_range,x.sort,x.user_org_id,s.unit,s.project_name,s.item_name").Count(&total).
+		Joins("left join xt_inspection_reference as s on s.id = x.inspection_minor").Offset(offset).Limit(limit).Scan(&standard).Error
+	return standard, total, err
 }