fix

zhangqian

2023-08-10 8fab255a4509a7ec5bfc7439b6e352054d677e29

fix

 api/v1/serviceOrder.go

@@ -99,9 +99,9 @@
// @Tags        服务单管理
// @Summary    获取服务单列表
// @Produce    application/json
// @Param        object    query        request.GetServiceOrderList    true    "参数"
// @Param        object    body        request.GetServiceOrderList    true    "参数"
// @Success    200    {object}    response.ListResponse{data=[]model.ServiceOrder}
// @Router        /api/serviceOrder/list [get]
// @Router        /api/serviceOrder/list [post]
func (s *ServiceOrderApi) List(c *gin.Context) {
    var params request.GetServiceOrderList
    ctx, ok := contextx.NewContext(c, &params)

 docs/docs.go

@@ -8267,7 +8267,7 @@
            }
        },
        "/api/serviceOrder/list": {
            "get": {
            "post": {
                "produces": [
                    "application/json"
                ],
@@ -8277,57 +8277,13 @@
                "summary": "获取服务单列表",
                "parameters": [
                    {
                        "type": "string",
                        "name": "keyword",
                        "in": "query"
                    },
                    {
                        "enum": [
                            "服务单编号",
                            "主题",
                            "客户名称",
                            "实际处理时间",
                            "服务人员",
                            "服务方式",
                            "产品类别",
                            "故障类别"
                        ],
                        "type": "string",
                        "x-enum-varnames": [
                            "ServiceOrderKeywordOrderNumber",
                            "ServiceOrderKeywordSubject",
                            "ServiceOrderKeywordClientName",
                            "ServiceOrderKeywordRealProcessTime",
                            "ServiceOrderKeywordServiceMan",
                            "ServiceOrderKeywordServiceType",
                            "ServiceOrderKeywordProductType",
                            "ServiceOrderKeywordFaultType"
                        ],
                        "name": "keywordType",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "description": "页码",
                        "name": "page",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "description": "每页大小",
                        "name": "pageSize",
                        "in": "query"
                    },
                    {
                        "enum": [
                            ""
                        ],
                        "type": "string",
                        "x-enum-varnames": [
                            "ServiceOrderQueryClassExpireLessThen60Days"
                        ],
                        "name": "queryClass",
                        "in": "query"
                        "description": "参数",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.GetServiceOrderList"
                        }
                    }
                ],
                "responses": {
@@ -11820,8 +11776,14 @@
        "model.ServiceFollowup": {
            "type": "object",
            "properties": {
                "client": {
                    "$ref": "#/definitions/model.Client"
                },
                "clientId": {
                    "type": "integer"
                },
                "contact": {
                    "$ref": "#/definitions/model.Contact"
                },
                "contactId": {
                    "type": "integer"
@@ -14374,6 +14336,28 @@
                }
            }
        },
        "request.GetServiceOrderList": {
            "type": "object",
            "properties": {
                "keyword": {
                    "type": "string"
                },
                "keywordType": {
                    "$ref": "#/definitions/constvar.ServiceOrderKeywordType"
                },
                "page": {
                    "description": "页码",
                    "type": "integer"
                },
                "pageSize": {
                    "description": "每页大小",
                    "type": "integer"
                },
                "queryClass": {
                    "$ref": "#/definitions/constvar.ServiceOrderQueryClass"
                }
            }
        },
        "request.GetSubOrderList": {
            "type": "object",
            "properties": {

 docs/swagger.json

@@ -8255,7 +8255,7 @@
            }
        },
        "/api/serviceOrder/list": {
            "get": {
            "post": {
                "produces": [
                    "application/json"
                ],
@@ -8265,57 +8265,13 @@
                "summary": "获取服务单列表",
                "parameters": [
                    {
                        "type": "string",
                        "name": "keyword",
                        "in": "query"
                    },
                    {
                        "enum": [
                            "服务单编号",
                            "主题",
                            "客户名称",
                            "实际处理时间",
                            "服务人员",
                            "服务方式",
                            "产品类别",
                            "故障类别"
                        ],
                        "type": "string",
                        "x-enum-varnames": [
                            "ServiceOrderKeywordOrderNumber",
                            "ServiceOrderKeywordSubject",
                            "ServiceOrderKeywordClientName",
                            "ServiceOrderKeywordRealProcessTime",
                            "ServiceOrderKeywordServiceMan",
                            "ServiceOrderKeywordServiceType",
                            "ServiceOrderKeywordProductType",
                            "ServiceOrderKeywordFaultType"
                        ],
                        "name": "keywordType",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "description": "页码",
                        "name": "page",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "description": "每页大小",
                        "name": "pageSize",
                        "in": "query"
                    },
                    {
                        "enum": [
                            ""
                        ],
                        "type": "string",
                        "x-enum-varnames": [
                            "ServiceOrderQueryClassExpireLessThen60Days"
                        ],
                        "name": "queryClass",
                        "in": "query"
                        "description": "参数",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.GetServiceOrderList"
                        }
                    }
                ],
                "responses": {
@@ -11808,8 +11764,14 @@
        "model.ServiceFollowup": {
            "type": "object",
            "properties": {
                "client": {
                    "$ref": "#/definitions/model.Client"
                },
                "clientId": {
                    "type": "integer"
                },
                "contact": {
                    "$ref": "#/definitions/model.Contact"
                },
                "contactId": {
                    "type": "integer"
@@ -14362,6 +14324,28 @@
                }
            }
        },
        "request.GetServiceOrderList": {
            "type": "object",
            "properties": {
                "keyword": {
                    "type": "string"
                },
                "keywordType": {
                    "$ref": "#/definitions/constvar.ServiceOrderKeywordType"
                },
                "page": {
                    "description": "页码",
                    "type": "integer"
                },
                "pageSize": {
                    "description": "每页大小",
                    "type": "integer"
                },
                "queryClass": {
                    "$ref": "#/definitions/constvar.ServiceOrderQueryClass"
                }
            }
        },
        "request.GetSubOrderList": {
            "type": "object",
            "properties": {

 docs/swagger.yaml

@@ -1436,8 +1436,12 @@
    type: object
  model.ServiceFollowup:
    properties:
      client:
        $ref: '#/definitions/model.Client'
      clientId:
        type: integer
      contact:
        $ref: '#/definitions/model.Contact'
      contactId:
        type: integer
      customerServiceSheet:
@@ -3185,6 +3189,21 @@
      pageSize:
        description: 每页大小
        type: integer
    type: object
  request.GetServiceOrderList:
    properties:
      keyword:
        type: string
      keywordType:
        $ref: '#/definitions/constvar.ServiceOrderKeywordType'
      page:
        description: 页码
        type: integer
      pageSize:
        description: 每页大小
        type: integer
      queryClass:
        $ref: '#/definitions/constvar.ServiceOrderQueryClass'
    type: object
  request.GetSubOrderList:
    properties:
@@ -10540,47 +10559,14 @@
      tags:
      - 服务单管理
  /api/serviceOrder/list:
    get:
    post:
      parameters:
      - in: query
        name: keyword
        type: string
      - enum:
        - 服务单编号
        - 主题
        - 客户名称
        - 实际处理时间
        - 服务人员
        - 服务方式
        - 产品类别
        - 故障类别
        in: query
        name: keywordType
        type: string
        x-enum-varnames:
        - ServiceOrderKeywordOrderNumber
        - ServiceOrderKeywordSubject
        - ServiceOrderKeywordClientName
        - ServiceOrderKeywordRealProcessTime
        - ServiceOrderKeywordServiceMan
        - ServiceOrderKeywordServiceType
        - ServiceOrderKeywordProductType
        - ServiceOrderKeywordFaultType
      - description: 页码
        in: query
        name: page
        type: integer
      - description: 每页大小
        in: query
        name: pageSize
        type: integer
      - enum:
        - ""
        in: query
        name: queryClass
        type: string
        x-enum-varnames:
        - ServiceOrderQueryClassExpireLessThen60Days
      - description: 参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.GetServiceOrderList'
      produces:
      - application/json
      responses:

 model/serviceFollowup.go

@@ -10,8 +10,10 @@
    ServiceFollowup struct {

        Id                   int                  `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`

        ClientId             int                  `json:"clientId" gorm:"column:client_id;type:int;comment:客户id"`

        Client               Client               `json:"client" gorm:"foreignKey:ClientId"`
        Number               string               `json:"number" gorm:"column:number;type:varchar(255);comment:合同编号"`

        ContactId            int                  `json:"contactId" gorm:"column:contact_id;type:int;comment:联系人id"`

        Contact              Contact              `json:"contact"  gorm:"foreignKey:ContactId"`
        ServiceId            int                  `json:"serviceId" gorm:"column:service_id;type:int;comment:客户服务单id"`

        ServiceOrder         ServiceOrder         `gorm:"foreignKey:ServiceId"`

        CustomerServiceSheet CustomerServiceSheet `json:"customerServiceSheet" gorm:"foreignKey:ServiceId"`

@@ -36,6 +38,7 @@
        OrderBy     string

        PageNum     int

        PageSize    int

        Preload     bool
    }

)



@@ -69,6 +72,13 @@
    case constvar.ServiceFollowupKeywordSatisfactionDegree:

        db = db.Where("satisfaction_id = ?", slf.Keyword)



    }

    if slf.Preload {
        db = db.Preload("CustomerServiceSheet").
            Preload("ServiceOrder").
            Preload("Client").
            Preload("Contact")
    }



    return db

@@ -111,7 +121,7 @@
        db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)

    }



    err := db.Preload("CustomerServiceSheet").Preload("ServiceOrder").Find(&records).Error

    err := db.Find(&records).Error
    return records, total, err

}



@@ -120,6 +130,11 @@
    return slf

}



func (slf *ServiceFollowupSearch) SetPreload(preload bool) *ServiceFollowupSearch {
    slf.Preload = preload
    return slf
}

func (slf *ServiceFollowupSearch) SetKeywordType(keyword constvar.ServiceFollowupKeywordType) *ServiceFollowupSearch {

    slf.KeywordType = keyword

    return slf


 router/serviceOrder.go

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

 service/serviceFollowup.go

@@ -46,7 +46,9 @@
    contacts, total, err := model.NewServiceFollowupSearch().
        SetKeywordType(keywordType).
        SetKeyword(keyword).
        SetPage(page, pageSize).FindAll()
        SetPage(page, pageSize).
        SetPreload(true).
        FindAll()
    if err != nil {
        return nil, 0, ecode.ServiceFollowupListErr
    }