add

wangpengfei

2023-07-25 74f698acff298c45e436824e15c0da3c93b7926e

add

add the pageInfo, keyword to follow list

 api/v1/followRecord.go

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

// List
//
//    @Tags        FollowRecord
//    @Summary    获取跟进记录列表
//    @Produce    application/json
//    @Success    200    {object}    contextx.Response{data=response.FollowRecordResponse}
//    @Router        /api/followRecord/list [get]
func (fr *FollowRecordApi) List(c *gin.Context) {
    ctx, ok := contextx.NewContext(c, nil)
    if !ok {
        return
    }

    errCode, followRecordList := followRecordService.GetFollowRecordList()
    if errCode != ecode.OK {
        ctx.Fail(errCode)
        return
    }

    ctx.OkWithDetailed(response.FollowRecordResponse{
        List: followRecordList,
    })
}

// Delete
//
@@ -219,3 +196,30 @@

    return time.Time{}, err
}

// List
//
//    @Tags        FollowRecord
//    @Summary    跟进记录列表
//    @Produce    application/json
//    @Param        object    body        request.GetFollowRecordList    true    "参数"
//    @Success    200        {object}    contextx.Response{data=response.FollowRecordResponse}
//    @Router        /api/followRecord/list [post]
func (con *FollowRecordApi) List(c *gin.Context) {
    var params request.GetFollowRecordList
    ctx, ok := contextx.NewContext(c, &params)
    if !ok {
        return
    }

    followRecords, errCode := followRecordService.GetFollowRecordList(params.Page, params.PageSize, params.Keyword)
    if errCode != ecode.OK {
        ctx.Fail(errCode)
        return
    }

    ctx.OkWithDetailed(response.FollowRecordResponse{
        List: followRecords,
        Count: len(followRecords),
    })
}

 api/v1/salesLeads.go

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


func checkSalesLeadsParams(params request.SalesLeads) (errCode int, salesLeads model.SalesLeads) {
    //if params.Name == "" {
    //    return ecode.InvalidParams, salesLeads
@@ -146,7 +145,7 @@
//    @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) {
func (s *SalesLeadsApi) List(c *gin.Context) {
    var params request.GetSalesLeadsList
    ctx, ok := contextx.NewContext(c, &params)
    if !ok {
@@ -160,7 +159,7 @@
    }

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

 docs/docs.go

@@ -2090,14 +2090,25 @@
            }
        },
        "/api/followRecord/list": {
            "get": {
            "post": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "FollowRecord"
                ],
                "summary": "获取跟进记录列表",
                "summary": "跟进记录列表",
                "parameters": [
                    {
                        "description": "参数",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.GetFollowRecordList"
                        }
                    }
                ],
                "responses": {
                    "200": {
                        "description": "OK",
@@ -9768,6 +9779,22 @@
                }
            }
        },
        "request.GetFollowRecordList": {
            "type": "object",
            "properties": {
                "keyword": {
                    "type": "string"
                },
                "page": {
                    "description": "页码",
                    "type": "integer"
                },
                "pageSize": {
                    "description": "每页大小",
                    "type": "integer"
                }
            }
        },
        "request.GetSalesLeadsList": {
            "type": "object",
            "properties": {
@@ -12227,6 +12254,9 @@
        "response.FollowRecordResponse": {
            "type": "object",
            "properties": {
                "count": {
                    "type": "integer"
                },
                "list": {
                    "type": "array",
                    "items": {

 docs/swagger.json

@@ -2078,14 +2078,25 @@
            }
        },
        "/api/followRecord/list": {
            "get": {
            "post": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "FollowRecord"
                ],
                "summary": "获取跟进记录列表",
                "summary": "跟进记录列表",
                "parameters": [
                    {
                        "description": "参数",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.GetFollowRecordList"
                        }
                    }
                ],
                "responses": {
                    "200": {
                        "description": "OK",
@@ -9756,6 +9767,22 @@
                }
            }
        },
        "request.GetFollowRecordList": {
            "type": "object",
            "properties": {
                "keyword": {
                    "type": "string"
                },
                "page": {
                    "description": "页码",
                    "type": "integer"
                },
                "pageSize": {
                    "description": "每页大小",
                    "type": "integer"
                }
            }
        },
        "request.GetSalesLeadsList": {
            "type": "object",
            "properties": {
@@ -12215,6 +12242,9 @@
        "response.FollowRecordResponse": {
            "type": "object",
            "properties": {
                "count": {
                    "type": "integer"
                },
                "list": {
                    "type": "array",
                    "items": {

 docs/swagger.yaml

@@ -1929,6 +1929,17 @@
        description: 每页大小
        type: integer
    type: object
  request.GetFollowRecordList:
    properties:
      keyword:
        type: string
      page:
        description: 页码
        type: integer
      pageSize:
        description: 每页大小
        type: integer
    type: object
  request.GetSalesLeadsList:
    properties:
      keyword:
@@ -3582,6 +3593,8 @@
    type: object
  response.FollowRecordResponse:
    properties:
      count:
        type: integer
      list:
        items:
          $ref: '#/definitions/model.FollowRecord'
@@ -5125,7 +5138,14 @@
      tags:
      - FollowRecord
  /api/followRecord/list:
    get:
    post:
      parameters:
      - description: 参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.GetFollowRecordList'
      produces:
      - application/json
      responses:
@@ -5138,7 +5158,7 @@
                data:
                  $ref: '#/definitions/response.FollowRecordResponse'
              type: object
      summary: 获取跟进记录列表
      summary: 跟进记录列表
      tags:
      - FollowRecord
  /api/followRecord/update:

 model/followRecord.go

@@ -30,7 +30,12 @@

    FollowRecordSearch struct {
        FollowRecord
        Orm *gorm.DB

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

@@ -46,6 +51,9 @@

func (slf *FollowRecordSearch) build() *gorm.DB {
    var db = slf.Orm.Model(&FollowRecord{})
    if slf.Keyword != "" {
        db = db.Where("topic LIKE ?", "%"+slf.Keyword+"%")
    }
    if slf.Id != 0 {
        db = db.Where("id = ?", slf.Id)
    }
@@ -148,3 +156,18 @@
    slf.ClientId = clientId
    return slf
}

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

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

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

 model/request/followRecord.go

@@ -25,3 +25,8 @@
    Id           int          `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
    FollowRecord FollowRecord `json:"follow_record" binding:"required"`
}

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

 model/response/response.go

@@ -98,7 +98,8 @@
    }

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

    SaleChanceResponse struct {

 router/followRecord.go

@@ -14,6 +14,6 @@
        followRecordRouter.POST("add", followRecordApi.Add)             // 添加跟进记录
        followRecordRouter.DELETE("delete/:id", followRecordApi.Delete) // 删除跟进记录
        followRecordRouter.PUT("update", followRecordApi.Update)        // 更新跟进记录
        followRecordRouter.GET("list", followRecordApi.List)            // 获取跟进记录列表
        followRecordRouter.POST("list", followRecordApi.List)            // 获取跟进记录列表
    }
}
}

 service/followRecord.go

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

func (FollowRecordService) GetFollowRecordList() (int, []*model.FollowRecord) {
    // get followRecord list
    followRecords, err := model.NewFollowRecordSearch().Find()
    if err != nil {
        return ecode.FollowRecordListErr, nil
    }

    return ecode.OK, followRecords
}

// check followRecord exist
func checkFollowRecordExist(id int) int {
    _, err := model.NewFollowRecordSearch().SetId(id).First()
@@ -64,3 +54,12 @@
    }
    return ecode.OK
}

func (FollowRecordService) GetFollowRecordList(page, pageSize int, keyword string) ([]*model.FollowRecord, int) {
    // get contact list
    contacts, err := model.NewFollowRecordSearch().SetKeyword(keyword).SetPage(page, pageSize).Find()
    if err != nil {
        return nil, ecode.FollowRecordListErr
    }
    return contacts, ecode.OK
}