Merge branch 'master' into fly

wangpengfei

2023-08-10 724674c54da32406a16264850c3719b2553aada6

 docs/swagger.yaml

@@ -238,6 +238,32 @@
    - ServiceFollowupKeywordCustomerServiceNo
    - ServiceFollowupKeywordVisitor
    - ServiceFollowupKeywordSatisfactionDegree
  constvar.ServiceOrderKeywordType:
    enum:
    - 服务单编号
    - 主题
    - 客户名称
    - 实际处理时间
    - 服务人员
    - 服务方式
    - 产品类别
    - 故障类别
    type: string
    x-enum-varnames:
    - ServiceOrderKeywordOrderNumber
    - ServiceOrderKeywordSubject
    - ServiceOrderKeywordClientName
    - ServiceOrderKeywordRealProcessTime
    - ServiceOrderKeywordServiceMan
    - ServiceOrderKeywordServiceType
    - ServiceOrderKeywordProductType
    - ServiceOrderKeywordFaultType
  constvar.ServiceOrderQueryClass:
    enum:
    - ""
    type: string
    x-enum-varnames:
    - ServiceOrderQueryClassExpireLessThen60Days
  constvar.UserType:
    enum:
    - 1
@@ -1410,8 +1436,14 @@
    type: object
  model.ServiceFollowup:
    properties:
      Member:
        $ref: '#/definitions/model.User'
      client:
        $ref: '#/definitions/model.Client'
      clientId:
        type: integer
      contact:
        $ref: '#/definitions/model.Contact'
      contactId:
        type: integer
      customerServiceSheet:
@@ -1420,26 +1452,36 @@
        type: string
      id:
        type: integer
      isVisit:
        $ref: '#/definitions/model.IsVisit'
      isVisitId:
        type: integer
      memberId:
        type: integer
      number:
        type: string
      oldMember:
        $ref: '#/definitions/model.User'
      oldMemberId:
        type: integer
      planId:
        type: integer
      remark:
        type: string
      satisfaction:
        $ref: '#/definitions/model.Satisfaction'
      satisfactionId:
        type: integer
      serviceId:
        type: integer
      serviceOrder:
        $ref: '#/definitions/model.ServiceOrder'
      solveRate:
        $ref: '#/definitions/model.SolveRate'
      solveRateId:
        type: integer
      timelyRate:
        $ref: '#/definitions/model.TimelyRate'
      timelyRateId:
        type: integer
    type: object
@@ -3171,6 +3213,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:
@@ -10614,7 +10671,14 @@
      tags:
      - 服务单管理
  /api/serviceOrder/list:
    get:
    post:
      parameters:
      - description: 参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.GetServiceOrderList'
      produces:
      - application/json
      responses: