fix

wangpengfei

2023-07-25 869d20008718d26fcf6d85f4bfe9f7fdbe9db3c5

fix

add the pageInfo, keyword to salesLeads list

 api/v1/salesLeads.go

@@ -99,29 +99,6 @@
    ctx.Ok()
}

// List
//
//    @Tags        SalesLeads
//    @Summary    获取销售线索列表
//    @Produce    application/json
//    @Success    200    {object}    contextx.Response{data=response.SalesLeadsResponse}
//    @Router        /api/salesLeads/list [post]
func (s *SalesLeadsApi) List(c *gin.Context) {
    ctx, ok := contextx.NewContext(c, nil)
    if !ok {
        return
    }

    errCode, salesLeadsList := salesLeadsService.GetSalesLeadsList()
    if errCode != ecode.OK {
        ctx.Fail(errCode)
        return
    }

    ctx.OkWithDetailed(response.SalesLeadsResponse{
        List: salesLeadsList,
    })
}

func checkSalesLeadsParams(params request.SalesLeads) (errCode int, salesLeads model.SalesLeads) {
    //if params.Name == "" {
@@ -160,3 +137,30 @@

    return ecode.OK, salesLeads
}

// List
//
//    @Tags        SalesLeads
//    @Summary    销售线索列表
//    @Produce    application/json
//    @Param        object    body        request.GetSalesLeadsList    true    "参数"
//    @Success    200        {object}    contextx.Response{data=response.SalesLeadsResponse}
//    @Router        /api/salesLeads/list [post]
func (con *SalesLeadsApi) List(c *gin.Context) {
    var params request.GetSalesLeadsList
    ctx, ok := contextx.NewContext(c, &params)
    if !ok {
        return
    }

    salesLeadss, errCode := salesLeadsService.GetSalesLeadsList(params.Page, params.PageSize, params.Keyword)
    if errCode != ecode.OK {
        ctx.Fail(errCode)
        return
    }

    ctx.OkWithDetailed(response.SalesLeadsResponse{
        List: salesLeadss,
        Count: len(salesLeadss),
    })
}

 docs/docs.go

@@ -4834,7 +4834,18 @@
                "tags": [
                    "SalesLeads"
                ],
                "summary": "获取销售线索列表",
                "summary": "销售线索列表",
                "parameters": [
                    {
                        "description": "参数",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.GetSalesLeadsList"
                        }
                    }
                ],
                "responses": {
                    "200": {
                        "description": "OK",
@@ -9730,6 +9741,22 @@
                }
            }
        },
        "request.GetSalesLeadsList": {
            "type": "object",
            "properties": {
                "keyword": {
                    "type": "string"
                },
                "page": {
                    "description": "页码",
                    "type": "integer"
                },
                "pageSize": {
                    "description": "每页大小",
                    "type": "integer"
                }
            }
        },
        "request.GetUserList": {
            "type": "object",
            "properties": {
@@ -12430,6 +12457,9 @@
        "response.SalesLeadsResponse": {
            "type": "object",
            "properties": {
                "count": {
                    "type": "integer"
                },
                "list": {
                    "type": "array",
                    "items": {

 docs/swagger.json

@@ -4822,7 +4822,18 @@
                "tags": [
                    "SalesLeads"
                ],
                "summary": "获取销售线索列表",
                "summary": "销售线索列表",
                "parameters": [
                    {
                        "description": "参数",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.GetSalesLeadsList"
                        }
                    }
                ],
                "responses": {
                    "200": {
                        "description": "OK",
@@ -9718,6 +9729,22 @@
                }
            }
        },
        "request.GetSalesLeadsList": {
            "type": "object",
            "properties": {
                "keyword": {
                    "type": "string"
                },
                "page": {
                    "description": "页码",
                    "type": "integer"
                },
                "pageSize": {
                    "description": "每页大小",
                    "type": "integer"
                }
            }
        },
        "request.GetUserList": {
            "type": "object",
            "properties": {
@@ -12418,6 +12445,9 @@
        "response.SalesLeadsResponse": {
            "type": "object",
            "properties": {
                "count": {
                    "type": "integer"
                },
                "list": {
                    "type": "array",
                    "items": {

 docs/swagger.yaml

@@ -1918,6 +1918,17 @@
        description: 每页大小
        type: integer
    type: object
  request.GetSalesLeadsList:
    properties:
      keyword:
        type: string
      page:
        description: 页码
        type: integer
      pageSize:
        description: 每页大小
        type: integer
    type: object
  request.GetUserList:
    properties:
      keyword:
@@ -3724,6 +3735,8 @@
    type: object
  response.SalesLeadsResponse:
    properties:
      count:
        type: integer
      list:
        items:
          $ref: '#/definitions/model.SalesLeads'
@@ -6781,6 +6794,13 @@
      - SalesLeads
  /api/salesLeads/list:
    post:
      parameters:
      - description: 参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.GetSalesLeadsList'
      produces:
      - application/json
      responses:
@@ -6793,7 +6813,7 @@
                data:
                  $ref: '#/definitions/response.SalesLeadsResponse'
              type: object
      summary: 获取销售线索列表
      summary: 销售线索列表
      tags:
      - SalesLeads
  /api/salesLeads/update:

 model/request/salesLeads.go

@@ -20,3 +20,8 @@
    Id int `json:"id"`
    SalesLeads
}

type GetSalesLeadsList struct {
    PageInfo
    Keyword string `json:"keyword"`
}

 model/response/response.go

@@ -88,7 +88,8 @@
    }

    SalesLeadsResponse struct {
        List []*model.SalesLeads `json:"list"`
        List  []*model.SalesLeads `json:"list"`
        Count int                 `json:"count"`
    }

    SalesSourceResponse struct {

 model/salesLeads.go

@@ -25,7 +25,13 @@

    SalesLeadsSearch struct {
        SalesLeads
        Orm *gorm.DB

                Orm      *gorm.DB
        Keyword  string
        OrderBy  string
        PageNum  int
        PageSize int

    }
)

@@ -41,6 +47,9 @@

func (slf *SalesLeadsSearch) build() *gorm.DB {
    var db = slf.Orm.Model(&SalesLeads{})
    if slf.Keyword != "" {
        db = db.Where("name LIKE ?", "%"+slf.Keyword+"%")
    }
    if slf.Id != 0 {
        db = db.Where("id = ?", slf.Id)
    }
@@ -123,3 +132,18 @@
    err = db.First(&result).Error
    return
}

func (slf *SalesLeadsSearch) SetKeyword(keyword string) *SalesLeadsSearch {
    slf.Keyword = keyword
    return slf
}

func (slf *SalesLeadsSearch) SetPage(page, size int) *SalesLeadsSearch {
    slf.PageNum, slf.PageSize = page, size
    return slf
}

func (slf *SalesLeadsSearch) SetOrder(order string) *SalesLeadsSearch {
    slf.OrderBy = order
    return slf
}

 router/salesLeads.go

@@ -14,6 +14,6 @@
        salesLeadsRouter.POST("add", salesLeadsApi.Add)             // 添加销售线索
        salesLeadsRouter.DELETE("delete/:id", salesLeadsApi.Delete) // 删除销售线索
        salesLeadsRouter.PUT("update", salesLeadsApi.Update)        // 更新销售线索
        salesLeadsRouter.GET("list", salesLeadsApi.List)            // 获取销售线索列表
        salesLeadsRouter.POST("list", salesLeadsApi.List)            // 获取销售线索列表
    }
}
}

 service/salesLeads.go

@@ -30,16 +30,6 @@
    return ecode.OK
}

func (SalesLeadsService) GetSalesLeadsList() (int, []*model.SalesLeads) {
    // get salesLeads list
    salesLeadss, err := model.NewSalesLeadsSearch().FindAll()
    if err != nil {
        return ecode.SalesLeadsListErr, nil
    }

    return ecode.OK, salesLeadss
}

func (SalesLeadsService) UpdateSalesLeads(salesLeads *model.SalesLeads) int {
    // update salesLeads
    err := model.NewSalesLeadsSearch().SetId(salesLeads.Id).Update(salesLeads)
@@ -63,3 +53,12 @@

    return ecode.OK
}

func (SalesLeadsService) GetSalesLeadsList(page, pageSize int, keyword string) ([]*model.SalesLeads, int) {
    // get contact list
    contacts, err := model.NewSalesLeadsSearch().SetKeyword(keyword).SetPage(page, pageSize).FindAll()
    if err != nil {
        return nil, ecode.SalesLeadsListErr
    }
    return contacts, ecode.OK
}