From d80428a19673e819440a34f2565b6dbbbe6ac567 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 18 七月 2024 22:32:08 +0800
Subject: [PATCH] fix

---
 controllers/attribute.go |   42 +++++++++++++++++++++++++++++++-----------
 1 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/controllers/attribute.go b/controllers/attribute.go
index 5f94874..6949c1f 100644
--- a/controllers/attribute.go
+++ b/controllers/attribute.go
@@ -6,6 +6,7 @@
 	"github.com/gin-gonic/gin"
 	"github.com/spf13/cast"
 	"gorm.io/gorm"
+	"strconv"
 	"wms/extend/code"
 	"wms/extend/util"
 	"wms/models"
@@ -23,7 +24,7 @@
 // @Param     Authorization	header string true "token"
 // @Success   200 {object} util.Response "鎴愬姛"
 // @Router    /api-wms/v1/attribute/attribute [post]
-func (slf *AttributeController) Add(c *gin.Context) {
+func (slf AttributeController) Add(c *gin.Context) {
 	var reqParams request.AddAttribute
 	var params models.Attribute
 	if err := c.BindJSON(&reqParams); err != nil {
@@ -141,21 +142,20 @@
 	util.ResponseFormat(c, code.UpdateSuccess, "鍒犻櫎鎴愬姛")
 }
 
-// List
-// @Tags      灞炴��
-// @Summary   鏌ヨ灞炴�у垪琛�
+// ListAttribute
+// @Tags      灞炴�у�煎拰瀵硅薄
+// @Summary   娣诲姞灞炴�у�煎拰瀵硅薄
 // @Produce   application/json
-// @Param     object  query    request.GetAttributeList true  "鏌ヨ鍙傛暟"
-// @Param     Authorization	header string true "token"
-// @Success   200   {object}  util.ResponseList{data=[]models.Attribute}  "鎴愬姛"
+// @Param     object  body  request.AttributeList true  "灞炴�у�煎拰瀵硅薄淇℃伅"
+// @Success   200 {object} util.Response "鎴愬姛"
 // @Router    /api-wms/v1/attribute/attribute [get]
-func (slf AttributeController) List(c *gin.Context) {
-	var params request.GetAttributeList
-	if err := c.ShouldBindQuery(&params); err != nil {
+func (slf AttributeController) ListAttribute(c *gin.Context) {
+	var params request.AttributeList
+	if err := c.ShouldBind(&params); err != nil {
 		util.ResponseFormat(c, code.RequestParamError, err.Error())
 		return
 	}
-	list, count, err := models.NewAttributeSearch().SetPage(params.Page, params.PageSize).SetOrder("id desc").Find()
+	list, count, err := models.NewAttributeSearch().SetEntityType(params.EntityType).SetPage(params.Page, params.PageSize).SetOrder("id desc").Find()
 	if err != nil {
 		util.ResponseFormat(c, code.RequestParamError, "鏌ヨ澶辫触")
 		return
@@ -184,3 +184,23 @@
 //
 //	util.ResponseFormat(c, code.UpdateSuccess, first)
 //}
+
+// PrimaryAttribute
+// @Tags      灞炴�у�煎拰瀵硅薄
+// @Summary   鏌ヨ灞炴�у�煎拰瀵硅薄 閫氳繃涓婚敭ID鏌ヨ
+// object  body  request.OperationList true  "鏌ヨ鍙傛暟"
+// @Success   200 {object} util.Response "鎴愬姛"
+// @Router    /api-wms/v1/attribute/primary/{id}  [get]
+func (slf AttributeController) PrimaryAttribute(c *gin.Context) {
+	id, _ := strconv.ParseUint(c.Param("id"), 10, 64)
+	if id == 0 {
+		util.ResponseFormat(c, code.RequestParamError, "鏃犳晥id")
+		return
+	}
+	attribute, err := models.NewAttributeSearch().SetID(uint(id)).First()
+	if err != nil {
+		util.ResponseFormat(c, code.RequestParamError, "鏌ヨ澶辫触")
+		return
+	}
+	util.ResponseFormat(c, code.Success, attribute)
+}

--
Gitblit v1.8.0