查仓库信息增加状态条件

controllers/ermcp/qryWarehouse.go

@@ -14,7 +14,8 @@ import (
 
 // QryWarehouseReq 仓库查询请求参数
 type QryWarehouseReq struct {
-	UserId    int64  `form:"userid" binding:"required"`    //用户ID
+	UserId int64  `form:"userid" binding:"required"` //用户ID
+	Status string `form:"status"`                    // 仓库状态(可多项,逗号隔开) 1:正常 2:注销 3:待审核 4:审核拒绝
 }
 
 // QryWarehouseRsp 仓库查询响应
@@ -25,6 +26,7 @@ type QryWarehouseRsp models.ErmcpWareHouseInfo
 // @Produce json
 // @Security ApiKeyAuth
 // @Param userid query int true "用户ID"
+// @Param status query int false "仓库状态(可多项,逗号隔开) 1:正常 2:注销 3:待审核 4:审核拒绝"
 // @Success 200 {array} QryWarehouseRsp
 // @Failure 500 {object} app.Response
 // @Router /Ermcp/QueryWarehouseInfo [get]
@@ -33,6 +35,6 @@ func QueryWarehouseInfo(c *gin.Context) {
 	a := app.NewGinUtils(c)
 	req := QryWarehouseReq{}
 	a.DoBindReq(&req)
-	m := models.ErmcpWareHouseInfo{AREAUSERID: req.UserId}
+	m := models.ErmcpWareHouseInfo{AREAUSERID: req.UserId, FilterStatus: req.Status}
 	a.DoGetDataEx(&m)
-}
+}

docs/docs.go

@@ -2806,6 +2806,12 @@ var doc = `{
                         "name": "userid",
                         "in": "query",
                         "required": true
+                    },
+                    {
+                        "type": "integer",
+                        "description": "仓库状态(可多项,逗号隔开) 1:正常 2:注销 3:待审核 4:审核拒绝",
+                        "name": "status",
+                        "in": "query"
                     }
                 ],
                 "responses": {

docs/swagger.json

@@ -2790,6 +2790,12 @@
                         "name": "userid",
                         "in": "query",
                         "required": true
+                    },
+                    {
+                        "type": "integer",
+                        "description": "仓库状态(可多项,逗号隔开) 1:正常 2:注销 3:待审核 4:审核拒绝",
+                        "name": "status",
+                        "in": "query"
                     }
                 ],
                 "responses": {

docs/swagger.yaml

@@ -11108,6 +11108,10 @@ paths:
         name: userid
         required: true
         type: integer
+      - description: 仓库状态(可多项,逗号隔开) 1:正常 2:注销 3:待审核 4:审核拒绝
+        in: query
+        name: status
+        type: integer
       produces:
       - application/json
       responses:

models/ermcpWarehouseInfo.go

@@ -7,6 +7,7 @@
 package models
 
 import (
+	"fmt"
 	"mtp2_if/db"
 	"mtp2_if/utils"
 )
@@ -30,6 +31,8 @@ type ErmcpWareHouseInfo struct {
 	VIDEOURL        string `json:"videourl"  xorm:"'VIDEOURL'"`               // 视频地址
 	CONTACTNAME     string `json:"contactname"  xorm:"'CONTACTNAME'"`         // 联系人
 	CONTACTNUM      string `json:"contactnum"  xorm:"'CONTACTNUM'"`           // 联系电话
+
+	FilterStatus string `json:"-"` // 查询条件 状态
 }
 
 func (r *ErmcpWareHouseInfo) buildSql() string {
@@ -55,6 +58,9 @@ func (r *ErmcpWareHouseInfo) buildSql() string {
 	if r.AREAUSERID > 0 {
 		sqlId.And("t.AREAUSERID", r.AREAUSERID)
 	}
+	if len(r.FilterStatus) > 0 {
+		sqlId.Join(fmt.Sprintf(" and t.WAREHOUSESTATUS in(%v)", r.FilterStatus))
+	}
 	return sqlId.String()
 }