fix

wangpengfei

2023-07-26 10465790b3b82cbc10883c5ab16fb982406f8e0c

fix

fix the bug that pageNum, pageInfo doesn't work

 api/v1/serviceContract.go

@@ -98,30 +98,6 @@
    ctx.Ok()
}

// List
//
//    @Tags        ServiceContract
//    @Summary    服务合同列表
//    @Produce    application/json
//    @Success    200    {object}    contextx.Response{data=response.ServiceContractsResponse}
//    @Router        /api/serviceContract/list [get]
func (s *ServiceContractApi) List(c *gin.Context) {
    ctx, ok := contextx.NewContext(c, nil)
    if !ok {
        return
    }

    serviceContracts, errCode := serviceContractService.GetServiceContractList()
    if errCode != ecode.OK {
        ctx.Fail(errCode)
        return
    }

    ctx.OkWithDetailed(response.ServiceContractsResponse{
        List: serviceContracts,
    })
}

// check params
func checkServiceContractParams(serviceContract request.ServiceContract) (errCode int, result model.ServiceContract) {
    //if serviceContract.SignTime == "" {
@@ -172,3 +148,30 @@

    return ecode.OK, result
}

// List
//
//    @Tags        ServiceContract
//    @Summary    生成计划列表
//    @Produce    application/json
//    @Param        object    body        request.GetServiceContractList                    true    "参数"
//    @Success    200    {object}    contextx.Response{data=response.ServiceContractsResponse}
//    @Router        /api/serviceContract/list [post]
func (con *ServiceContractApi) List(c *gin.Context) {
    var params request.GetServiceContractList
    ctx, ok := contextx.NewContext(c, &params)
    if !ok {
        return
    }

    serviceContracts, errCode := serviceContractService.GetServiceContractList(params.Page, params.PageSize, params.Keyword)
    if errCode != ecode.OK {
        ctx.Fail(errCode)
        return
    }

    ctx.OkWithDetailed(response.ServiceContractsResponse{
        List:  serviceContracts,
        Count: len(serviceContracts),
    })
}

 docs/docs.go

@@ -5685,14 +5685,25 @@
            }
        },
        "/api/serviceContract/list": {
            "get": {
            "post": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "ServiceContract"
                ],
                "summary": "服务合同列表",
                "summary": "生成计划列表",
                "parameters": [
                    {
                        "description": "参数",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.GetServiceContractList"
                        }
                    }
                ],
                "responses": {
                    "200": {
                        "description": "OK",
@@ -10137,6 +10148,22 @@
                }
            }
        },
        "request.GetServiceContractList": {
            "type": "object",
            "properties": {
                "keyword": {
                    "type": "string"
                },
                "page": {
                    "description": "页码",
                    "type": "integer"
                },
                "pageSize": {
                    "description": "每页大小",
                    "type": "integer"
                }
            }
        },
        "request.GetServiceFeeManageList": {
            "type": "object",
            "properties": {
@@ -13020,6 +13047,9 @@
        "response.ServiceContractsResponse": {
            "type": "object",
            "properties": {
                "count": {
                    "type": "integer"
                },
                "list": {
                    "type": "array",
                    "items": {

 docs/swagger.json

@@ -5673,14 +5673,25 @@
            }
        },
        "/api/serviceContract/list": {
            "get": {
            "post": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "ServiceContract"
                ],
                "summary": "服务合同列表",
                "summary": "生成计划列表",
                "parameters": [
                    {
                        "description": "参数",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.GetServiceContractList"
                        }
                    }
                ],
                "responses": {
                    "200": {
                        "description": "OK",
@@ -10125,6 +10136,22 @@
                }
            }
        },
        "request.GetServiceContractList": {
            "type": "object",
            "properties": {
                "keyword": {
                    "type": "string"
                },
                "page": {
                    "description": "页码",
                    "type": "integer"
                },
                "pageSize": {
                    "description": "每页大小",
                    "type": "integer"
                }
            }
        },
        "request.GetServiceFeeManageList": {
            "type": "object",
            "properties": {
@@ -13008,6 +13035,9 @@
        "response.ServiceContractsResponse": {
            "type": "object",
            "properties": {
                "count": {
                    "type": "integer"
                },
                "list": {
                    "type": "array",
                    "items": {

 docs/swagger.yaml

@@ -2075,6 +2075,17 @@
        description: 每页大小
        type: integer
    type: object
  request.GetServiceContractList:
    properties:
      keyword:
        type: string
      page:
        description: 页码
        type: integer
      pageSize:
        description: 每页大小
        type: integer
    type: object
  request.GetServiceFeeManageList:
    properties:
      keyword:
@@ -4001,6 +4012,8 @@
    type: object
  response.ServiceContractsResponse:
    properties:
      count:
        type: integer
      list:
        items:
          $ref: '#/definitions/model.ServiceContract'
@@ -7534,7 +7547,14 @@
      tags:
      - ServiceContract
  /api/serviceContract/list:
    get:
    post:
      parameters:
      - description: 参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.GetServiceContractList'
      produces:
      - application/json
      responses:
@@ -7547,7 +7567,7 @@
                data:
                  $ref: '#/definitions/response.ServiceContractsResponse'
              type: object
      summary: 服务合同列表
      summary: 生成计划列表
      tags:
      - ServiceContract
  /api/serviceContract/update:

 model/contract.go

@@ -77,6 +77,10 @@
func (slf *ContractSearch) FindAll() ([]*Contract, error) {
    var db = slf.build()
    var records = make([]*Contract, 0)
    if slf.PageNum > 0 && slf.PageSize > 0 {
        db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
    }

    err := db.Preload("Quotation").Find(&records).Error
    return records, err
}
@@ -99,4 +103,4 @@
func (slf *ContractSearch) SetOrder(order string) *ContractSearch {
    slf.OrderBy = order
    return slf
}
}

 model/masterOrder.go

@@ -80,6 +80,10 @@
func (slf *MasterOrderSearch) FindAll() ([]*MasterOrder, error) {
    var db = slf.build()
    var records = make([]*MasterOrder, 0)
    if slf.PageNum > 0 && slf.PageSize > 0 {
        db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
    }

    err := db.Preload("Client").Find(&records).Error
    return records, err
}
@@ -102,4 +106,4 @@
func (slf *MasterOrderSearch) SetOrder(order string) *MasterOrderSearch {
    slf.OrderBy = order
    return slf
}
}

 model/orderManage.go

@@ -102,4 +102,4 @@
func (slf *OrderManageSearch) SetOrder(order string) *OrderManageSearch {
    slf.OrderBy = order
    return slf
}
}

 model/plan.go

@@ -104,4 +104,4 @@
func (slf *PlanSearch) SetOrder(order string) *PlanSearch {
    slf.OrderBy = order
    return slf
}
}

 model/quotation.go

@@ -112,4 +112,4 @@
func (slf *QuotationSearch) SetOrder(order string) *QuotationSearch {
    slf.OrderBy = order
    return slf
}
}

 model/request/serviceContract.go

@@ -31,3 +31,8 @@
    Id int `json:"id"`
    ServiceContract
}

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

 model/response/response.go

@@ -168,7 +168,8 @@
    }

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

    OrderManageResponse struct {
@@ -343,4 +344,4 @@
    CurrencyResponse struct {
        List []*model.Currency `json:"list"`
    }
)
)

 model/saleChance.go

@@ -132,4 +132,4 @@
func (slf *SaleChanceSearch) SetOrder(order string) *SaleChanceSearch {
    slf.OrderBy = order
    return slf
}
}

 model/salesDetails.go

@@ -94,6 +94,10 @@
func (slf *SalesDetailsSearch) FindAll() ([]*SalesDetails, error) {
    var db = slf.build()
    var records = make([]*SalesDetails, 0)
    if slf.PageNum > 0 && slf.PageSize > 0 {
        db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
    }

    err := db.Preload("Products").Preload("Client").Find(&records).Error
    return records, err
}
@@ -111,4 +115,4 @@
func (slf *SalesDetailsSearch) SetOrder(order string) *SalesDetailsSearch {
    slf.OrderBy = order
    return slf
}
}

 model/salesLeads.go

@@ -148,4 +148,4 @@
func (slf *SalesLeadsSearch) SetOrder(order string) *SalesLeadsSearch {
    slf.OrderBy = order
    return slf
}
}

 model/salesRefund.go

@@ -80,6 +80,10 @@
func (slf *SalesRefundSearch) FindAll() ([]*SalesRefund, error) {
    var db = slf.build()
    var records = make([]*SalesRefund, 0)
    if slf.PageNum > 0 && slf.PageSize > 0 {
        db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
    }

    err := db.Preload("Products").Find(&records).Error
    return records, err
}
@@ -102,4 +106,4 @@
func (slf *SalesRefundSearch) SetOrder(order string) *SalesRefundSearch {
    slf.OrderBy = order
    return slf
}
}

 model/salesReturn.go

@@ -100,4 +100,4 @@
func (slf *SalesReturnSearch) SetOrder(order string) *SalesReturnSearch {
    slf.OrderBy = order
    return slf
}
}

 model/serviceContract.go

File was renamed from model/serverContract.go
@@ -51,6 +51,12 @@

func (slf *ServiceContractSearch) build() *gorm.DB {
    var db = slf.Orm.Model(&ServiceContract{})
    if slf.Keyword != "" {
        db = db.Where("name LIKE ?", "%"+slf.Keyword+"%")
    }
    if slf.Keyword != "" {
        db = db.Where("name LIKE ?", "%"+slf.Keyword+"%")
    }
    if slf.Id != 0 {
        db = db.Where("id = ?", slf.Id)
    }
@@ -83,6 +89,10 @@
func (slf *ServiceContractSearch) FindAll() ([]*ServiceContract, error) {
    var db = slf.build()
    var records = make([]*ServiceContract, 0)
    if slf.PageNum > 0 && slf.PageSize > 0 {
        db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
    }

    err := db.Preload("Products").Find(&records).Error
    return records, err
}

 model/serviceFeeManage.go

@@ -89,6 +89,10 @@
func (slf *ServiceFeeManageSearch) FindAll() ([]*ServiceFeeManage, error) {
    var db = slf.build()
    var records = make([]*ServiceFeeManage, 0)
    if slf.PageNum > 0 && slf.PageSize > 0 {
        db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
    }

    err := db.Preload("Client").Find(&records).Error
    return records, err
}
@@ -106,4 +110,4 @@
func (slf *ServiceFeeManageSearch) SetOrder(order string) *ServiceFeeManageSearch {
    slf.OrderBy = order
    return slf
}
}

 model/serviceFollowup.go

@@ -85,6 +85,10 @@
func (slf *ServiceFollowupSearch) FindAll() ([]*ServiceFollowup, error) {
    var db = slf.build()
    var records = make([]*ServiceFollowup, 0)
    if slf.PageNum > 0 && slf.PageSize > 0 {
        db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
    }

    err := db.Preload("CustomerServiceSheet").Find(&records).Error
    return records, err
}
@@ -109,4 +113,4 @@
func (slf *ServiceFollowupSearch) SetOrder(order string) *ServiceFollowupSearch {
    slf.OrderBy = order
    return slf
}
}

 model/subOrder.go

@@ -96,4 +96,4 @@
func (slf *SubOrderSearch) SetOrder(order string) *SubOrderSearch {
    slf.OrderBy = order
    return slf
}
}

 router/serviceContract.go

@@ -14,6 +14,6 @@
        serviceContractRouter.POST("add", serviceContractApi.Add)             // 添加服务合同
        serviceContractRouter.DELETE("delete/:id", serviceContractApi.Delete) // 删除服务合同
        serviceContractRouter.PUT("update", serviceContractApi.Update)        // 更新服务合同
        serviceContractRouter.GET("list", serviceContractApi.List)            // 获取服务合同列表
        serviceContractRouter.POST("list", serviceContractApi.List)           // 获取服务合同列表
    }
}
}

 service/serviceContract.go

File was renamed from service/serviceContracts.go
@@ -29,15 +29,6 @@
    return ecode.OK
}

func (SContractService) GetServiceContractList() ([]*model.ServiceContract, int) {
    list, err := model.NewServiceContractSearch().FindAll()
    if err != nil {
        return nil, ecode.SContractListErr
    }

    return list, ecode.OK
}

func (SContractService) UpdateServiceContract(serviceContract *model.ServiceContract) int {
    // check serviceContract exist
    _, err := model.NewServiceContractSearch().SetId(serviceContract.Id).Find()
@@ -61,3 +52,12 @@

    return list, ecode.OK
}

func (SContractService) GetServiceContractList(page, pageSize int, keyword string) ([]*model.ServiceContract, int) {
    // get contact list
    contacts, err := model.NewServiceContractSearch().SetKeyword(keyword).SetPage(page, pageSize).FindAll()
    if err != nil {
        return nil, ecode.SContractListErr
    }
    return contacts, ecode.OK
}