fix

wangpengfei

2023-08-11 0f15e7b48d064fa6faf99832ca5f4be9bc54e199

fix

add homemade orm model

 docs/docs.go

@@ -8462,6 +8462,169 @@
                }
            }
        },
        "/api/serviceOrderStatus/add": {
            "post": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "服务单状态"
                ],
                "summary": "添加服务单状态",
                "parameters": [
                    {
                        "description": "查询参数",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.AddServiceOrderStatus"
                        }
                    }
                ],
                "responses": {
                    "200": {
                        "description": "OK",
                        "schema": {
                            "$ref": "#/definitions/contextx.Response"
                        }
                    }
                }
            }
        },
        "/api/serviceOrderStatus/delete/{id}": {
            "delete": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "服务单状态"
                ],
                "summary": "删除服务单状态",
                "parameters": [
                    {
                        "type": "integer",
                        "description": "查询参数",
                        "name": "id",
                        "in": "path",
                        "required": true
                    }
                ],
                "responses": {
                    "200": {
                        "description": "OK",
                        "schema": {
                            "$ref": "#/definitions/contextx.Response"
                        }
                    }
                }
            }
        },
        "/api/serviceOrderStatus/list": {
            "get": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "服务单状态"
                ],
                "summary": "获取服务单状态列表",
                "parameters": [
                    {
                        "type": "string",
                        "name": "keyword",
                        "in": "query"
                    },
                    {
                        "enum": [
                            ""
                        ],
                        "type": "string",
                        "x-enum-varnames": [
                            "ServiceOrderStatusKeywordCustomerName"
                        ],
                        "name": "keywordType",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "description": "页码",
                        "name": "page",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "description": "每页大小",
                        "name": "pageSize",
                        "in": "query"
                    },
                    {
                        "enum": [
                            ""
                        ],
                        "type": "string",
                        "x-enum-varnames": [
                            "ServiceOrderStatusQueryClassExpireLessThen60Days"
                        ],
                        "name": "queryClass",
                        "in": "query"
                    }
                ],
                "responses": {
                    "200": {
                        "description": "OK",
                        "schema": {
                            "allOf": [
                                {
                                    "$ref": "#/definitions/response.ListResponse"
                                },
                                {
                                    "type": "object",
                                    "properties": {
                                        "data": {
                                            "type": "array",
                                            "items": {
                                                "$ref": "#/definitions/model.ServiceOrderStatus"
                                            }
                                        }
                                    }
                                }
                            ]
                        }
                    }
                }
            }
        },
        "/api/serviceOrderStatus/update": {
            "put": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "服务单状态"
                ],
                "summary": "更新服务单状态",
                "parameters": [
                    {
                        "description": "查询参数",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.UpdateServiceOrderStatus"
                        }
                    }
                ],
                "responses": {
                    "200": {
                        "description": "OK",
                        "schema": {
                            "$ref": "#/definitions/contextx.Response"
                        }
                    }
                }
            }
        },
        "/api/serviceType/add": {
            "post": {
                "produces": [
@@ -10129,6 +10292,24 @@
                "ServiceOrderQueryClassExpireLessThen60Days"
            ]
        },
        "constvar.ServiceOrderStatusKeywordType": {
            "type": "string",
            "enum": [
                ""
            ],
            "x-enum-varnames": [
                "ServiceOrderStatusKeywordCustomerName"
            ]
        },
        "constvar.ServiceOrderStatusQueryClass": {
            "type": "string",
            "enum": [
                ""
            ],
            "x-enum-varnames": [
                "ServiceOrderStatusQueryClassExpireLessThen60Days"
            ]
        },
        "constvar.UserType": {
            "type": "integer",
            "enum": [
@@ -10407,6 +10588,42 @@
                    "type": "integer"
                },
                "name": {
                    "type": "string"
                }
            }
        },
        "model.CollectionProjection": {
            "type": "object",
            "properties": {
                "created_at": {
                    "description": "The date when the item was created\nexample: 2023-08-10 15:48:25",
                    "type": "string"
                },
                "creator": {
                    "type": "integer"
                },
                "deleted_at": {
                    "description": "The date when the item was deleted\nexample: 2023-08-10 15:48:25",
                    "type": "string"
                },
                "estimated_collection_amount": {
                    "type": "number"
                },
                "estimated_collection_date": {
                    "type": "string"
                },
                "id": {
                    "description": "The ID of the item\nexample: 1",
                    "type": "integer"
                },
                "modifier": {
                    "type": "integer"
                },
                "sale_chance_id": {
                    "type": "integer"
                },
                "updated_at": {
                    "description": "The date when the item was last updated\nexample: 2023-08-10 15:48:25",
                    "type": "string"
                }
            }
@@ -11143,6 +11360,12 @@
                "number": {
                    "type": "string"
                },
                "products": {
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/model.Product"
                    }
                },
                "quotation_status_id": {
                    "type": "integer"
                },
@@ -11305,6 +11528,12 @@
                },
                "client_id": {
                    "type": "integer"
                },
                "collection_projections": {
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/model.CollectionProjection"
                    }
                },
                "competitors": {
                    "type": "string"
@@ -11781,6 +12010,9 @@
                "clientId": {
                    "type": "integer"
                },
                "contact": {
                    "$ref": "#/definitions/model.Contact"
                },
                "contactId": {
                    "type": "integer"
                },
@@ -11983,11 +12215,11 @@
                    "type": "string"
                },
                "carFare": {
                    "description": "交通费",
                    "description": "交通费                                                                 // 交通费",
                    "type": "number"
                },
                "chargeAmount": {
                    "description": "收费金额",
                    "description": "收费金额                                                       // 收费金额",
                    "type": "number"
                },
                "client": {
@@ -12080,6 +12312,9 @@
                    "description": "服务单编号",
                    "type": "string"
                },
                "serviceOrderStatus": {
                    "$ref": "#/definitions/model.ServiceOrderStatus"
                },
                "serviceType": {
                    "$ref": "#/definitions/model.ServiceType"
                },
@@ -12112,6 +12347,17 @@
                "timeSpentId": {
                    "description": "花费时间",
                    "type": "integer"
                }
            }
        },
        "model.ServiceOrderStatus": {
            "type": "object",
            "properties": {
                "id": {
                    "type": "integer"
                },
                "name": {
                    "type": "string"
                }
            }
        },
@@ -12971,6 +13217,12 @@
                "number": {
                    "type": "string"
                },
                "products": {
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/model.Product"
                    }
                },
                "quotation_status_id": {
                    "type": "integer"
                },
@@ -13739,6 +13991,17 @@
                "timeSpentId": {
                    "description": "花费时间",
                    "type": "integer"
                }
            }
        },
        "request.AddServiceOrderStatus": {
            "type": "object",
            "properties": {
                "id": {
                    "type": "integer"
                },
                "name": {
                    "type": "string"
                }
            }
        },
@@ -15814,6 +16077,12 @@
                "number": {
                    "type": "string"
                },
                "products": {
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/model.Product"
                    }
                },
                "quotation_status_id": {
                    "type": "integer"
                },
@@ -16852,6 +17121,17 @@
                }
            }
        },
        "request.UpdateServiceOrderStatus": {
            "type": "object",
            "properties": {
                "id": {
                    "type": "integer"
                },
                "name": {
                    "type": "string"
                }
            }
        },
        "request.UpdateServiceType": {
            "type": "object",
            "properties": {

 docs/swagger.json

@@ -8450,6 +8450,169 @@
                }
            }
        },
        "/api/serviceOrderStatus/add": {
            "post": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "服务单状态"
                ],
                "summary": "添加服务单状态",
                "parameters": [
                    {
                        "description": "查询参数",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.AddServiceOrderStatus"
                        }
                    }
                ],
                "responses": {
                    "200": {
                        "description": "OK",
                        "schema": {
                            "$ref": "#/definitions/contextx.Response"
                        }
                    }
                }
            }
        },
        "/api/serviceOrderStatus/delete/{id}": {
            "delete": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "服务单状态"
                ],
                "summary": "删除服务单状态",
                "parameters": [
                    {
                        "type": "integer",
                        "description": "查询参数",
                        "name": "id",
                        "in": "path",
                        "required": true
                    }
                ],
                "responses": {
                    "200": {
                        "description": "OK",
                        "schema": {
                            "$ref": "#/definitions/contextx.Response"
                        }
                    }
                }
            }
        },
        "/api/serviceOrderStatus/list": {
            "get": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "服务单状态"
                ],
                "summary": "获取服务单状态列表",
                "parameters": [
                    {
                        "type": "string",
                        "name": "keyword",
                        "in": "query"
                    },
                    {
                        "enum": [
                            ""
                        ],
                        "type": "string",
                        "x-enum-varnames": [
                            "ServiceOrderStatusKeywordCustomerName"
                        ],
                        "name": "keywordType",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "description": "页码",
                        "name": "page",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "description": "每页大小",
                        "name": "pageSize",
                        "in": "query"
                    },
                    {
                        "enum": [
                            ""
                        ],
                        "type": "string",
                        "x-enum-varnames": [
                            "ServiceOrderStatusQueryClassExpireLessThen60Days"
                        ],
                        "name": "queryClass",
                        "in": "query"
                    }
                ],
                "responses": {
                    "200": {
                        "description": "OK",
                        "schema": {
                            "allOf": [
                                {
                                    "$ref": "#/definitions/response.ListResponse"
                                },
                                {
                                    "type": "object",
                                    "properties": {
                                        "data": {
                                            "type": "array",
                                            "items": {
                                                "$ref": "#/definitions/model.ServiceOrderStatus"
                                            }
                                        }
                                    }
                                }
                            ]
                        }
                    }
                }
            }
        },
        "/api/serviceOrderStatus/update": {
            "put": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "服务单状态"
                ],
                "summary": "更新服务单状态",
                "parameters": [
                    {
                        "description": "查询参数",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.UpdateServiceOrderStatus"
                        }
                    }
                ],
                "responses": {
                    "200": {
                        "description": "OK",
                        "schema": {
                            "$ref": "#/definitions/contextx.Response"
                        }
                    }
                }
            }
        },
        "/api/serviceType/add": {
            "post": {
                "produces": [
@@ -10117,6 +10280,24 @@
                "ServiceOrderQueryClassExpireLessThen60Days"
            ]
        },
        "constvar.ServiceOrderStatusKeywordType": {
            "type": "string",
            "enum": [
                ""
            ],
            "x-enum-varnames": [
                "ServiceOrderStatusKeywordCustomerName"
            ]
        },
        "constvar.ServiceOrderStatusQueryClass": {
            "type": "string",
            "enum": [
                ""
            ],
            "x-enum-varnames": [
                "ServiceOrderStatusQueryClassExpireLessThen60Days"
            ]
        },
        "constvar.UserType": {
            "type": "integer",
            "enum": [
@@ -10395,6 +10576,42 @@
                    "type": "integer"
                },
                "name": {
                    "type": "string"
                }
            }
        },
        "model.CollectionProjection": {
            "type": "object",
            "properties": {
                "created_at": {
                    "description": "The date when the item was created\nexample: 2023-08-10 15:48:25",
                    "type": "string"
                },
                "creator": {
                    "type": "integer"
                },
                "deleted_at": {
                    "description": "The date when the item was deleted\nexample: 2023-08-10 15:48:25",
                    "type": "string"
                },
                "estimated_collection_amount": {
                    "type": "number"
                },
                "estimated_collection_date": {
                    "type": "string"
                },
                "id": {
                    "description": "The ID of the item\nexample: 1",
                    "type": "integer"
                },
                "modifier": {
                    "type": "integer"
                },
                "sale_chance_id": {
                    "type": "integer"
                },
                "updated_at": {
                    "description": "The date when the item was last updated\nexample: 2023-08-10 15:48:25",
                    "type": "string"
                }
            }
@@ -11131,6 +11348,12 @@
                "number": {
                    "type": "string"
                },
                "products": {
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/model.Product"
                    }
                },
                "quotation_status_id": {
                    "type": "integer"
                },
@@ -11293,6 +11516,12 @@
                },
                "client_id": {
                    "type": "integer"
                },
                "collection_projections": {
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/model.CollectionProjection"
                    }
                },
                "competitors": {
                    "type": "string"
@@ -11769,6 +11998,9 @@
                "clientId": {
                    "type": "integer"
                },
                "contact": {
                    "$ref": "#/definitions/model.Contact"
                },
                "contactId": {
                    "type": "integer"
                },
@@ -11971,11 +12203,11 @@
                    "type": "string"
                },
                "carFare": {
                    "description": "交通费",
                    "description": "交通费                                                                 // 交通费",
                    "type": "number"
                },
                "chargeAmount": {
                    "description": "收费金额",
                    "description": "收费金额                                                       // 收费金额",
                    "type": "number"
                },
                "client": {
@@ -12068,6 +12300,9 @@
                    "description": "服务单编号",
                    "type": "string"
                },
                "serviceOrderStatus": {
                    "$ref": "#/definitions/model.ServiceOrderStatus"
                },
                "serviceType": {
                    "$ref": "#/definitions/model.ServiceType"
                },
@@ -12100,6 +12335,17 @@
                "timeSpentId": {
                    "description": "花费时间",
                    "type": "integer"
                }
            }
        },
        "model.ServiceOrderStatus": {
            "type": "object",
            "properties": {
                "id": {
                    "type": "integer"
                },
                "name": {
                    "type": "string"
                }
            }
        },
@@ -12959,6 +13205,12 @@
                "number": {
                    "type": "string"
                },
                "products": {
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/model.Product"
                    }
                },
                "quotation_status_id": {
                    "type": "integer"
                },
@@ -13727,6 +13979,17 @@
                "timeSpentId": {
                    "description": "花费时间",
                    "type": "integer"
                }
            }
        },
        "request.AddServiceOrderStatus": {
            "type": "object",
            "properties": {
                "id": {
                    "type": "integer"
                },
                "name": {
                    "type": "string"
                }
            }
        },
@@ -15802,6 +16065,12 @@
                "number": {
                    "type": "string"
                },
                "products": {
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/model.Product"
                    }
                },
                "quotation_status_id": {
                    "type": "integer"
                },
@@ -16840,6 +17109,17 @@
                }
            }
        },
        "request.UpdateServiceOrderStatus": {
            "type": "object",
            "properties": {
                "id": {
                    "type": "integer"
                },
                "name": {
                    "type": "string"
                }
            }
        },
        "request.UpdateServiceType": {
            "type": "object",
            "properties": {

 docs/swagger.yaml

@@ -264,6 +264,18 @@
    type: string
    x-enum-varnames:
    - ServiceOrderQueryClassExpireLessThen60Days
  constvar.ServiceOrderStatusKeywordType:
    enum:
    - ""
    type: string
    x-enum-varnames:
    - ServiceOrderStatusKeywordCustomerName
  constvar.ServiceOrderStatusQueryClass:
    enum:
    - ""
    type: string
    x-enum-varnames:
    - ServiceOrderStatusQueryClassExpireLessThen60Days
  constvar.UserType:
    enum:
    - 1
@@ -450,6 +462,39 @@
      id:
        type: integer
      name:
        type: string
    type: object
  model.CollectionProjection:
    properties:
      created_at:
        description: |-
          The date when the item was created
          example: 2023-08-10 15:48:25
        type: string
      creator:
        type: integer
      deleted_at:
        description: |-
          The date when the item was deleted
          example: 2023-08-10 15:48:25
        type: string
      estimated_collection_amount:
        type: number
      estimated_collection_date:
        type: string
      id:
        description: |-
          The ID of the item
          example: 1
        type: integer
      modifier:
        type: integer
      sale_chance_id:
        type: integer
      updated_at:
        description: |-
          The date when the item was last updated
          example: 2023-08-10 15:48:25
        type: string
    type: object
  model.Contact:
@@ -933,6 +978,10 @@
        type: integer
      number:
        type: string
      products:
        items:
          $ref: '#/definitions/model.Product'
        type: array
      quotation_status_id:
        type: integer
      sale_chance:
@@ -1042,6 +1091,10 @@
        $ref: '#/definitions/model.Client'
      client_id:
        type: integer
      collection_projections:
        items:
          $ref: '#/definitions/model.CollectionProjection'
        type: array
      competitors:
        type: string
      contact:
@@ -1360,6 +1413,8 @@
        $ref: '#/definitions/model.Client'
      clientId:
        type: integer
      contact:
        $ref: '#/definitions/model.Contact'
      contactId:
        type: integer
      endTime:
@@ -1494,10 +1549,12 @@
        description: 预约上门时间
        type: string
      carFare:
        description: 交通费
        description: 交通费                                                                 //
          交通费
        type: number
      chargeAmount:
        description: 收费金额
        description: 收费金额                                                       //
          收费金额
        type: number
      client:
        $ref: '#/definitions/model.Client'
@@ -1564,6 +1621,8 @@
      serviceNumber:
        description: 服务单编号
        type: string
      serviceOrderStatus:
        $ref: '#/definitions/model.ServiceOrderStatus'
      serviceType:
        $ref: '#/definitions/model.ServiceType'
      serviceTypeId:
@@ -1588,6 +1647,13 @@
      timeSpentId:
        description: 花费时间
        type: integer
    type: object
  model.ServiceOrderStatus:
    properties:
      id:
        type: integer
      name:
        type: string
    type: object
  model.ServiceType:
    properties:
@@ -2164,6 +2230,10 @@
        type: integer
      number:
        type: string
      products:
        items:
          $ref: '#/definitions/model.Product'
        type: array
      quotation_status_id:
        type: integer
      sale_chance_id:
@@ -2690,6 +2760,13 @@
      timeSpentId:
        description: 花费时间
        type: integer
    type: object
  request.AddServiceOrderStatus:
    properties:
      id:
        type: integer
      name:
        type: string
    type: object
  request.AddServiceType:
    properties:
@@ -4103,6 +4180,10 @@
        type: integer
      number:
        type: string
      products:
        items:
          $ref: '#/definitions/model.Product'
        type: array
      quotation_status_id:
        type: integer
      sale_chance_id:
@@ -4809,6 +4890,13 @@
      timeSpentId:
        description: 花费时间
        type: integer
    type: object
  request.UpdateServiceOrderStatus:
    properties:
      id:
        type: integer
      name:
        type: string
    type: object
  request.UpdateServiceType:
    properties:
@@ -10715,6 +10803,107 @@
      summary: 更新服务单
      tags:
      - 服务单管理
  /api/serviceOrderStatus/add:
    post:
      parameters:
      - description: 查询参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.AddServiceOrderStatus'
      produces:
      - application/json
      responses:
        "200":
          description: OK
          schema:
            $ref: '#/definitions/contextx.Response'
      summary: 添加服务单状态
      tags:
      - 服务单状态
  /api/serviceOrderStatus/delete/{id}:
    delete:
      parameters:
      - description: 查询参数
        in: path
        name: id
        required: true
        type: integer
      produces:
      - application/json
      responses:
        "200":
          description: OK
          schema:
            $ref: '#/definitions/contextx.Response'
      summary: 删除服务单状态
      tags:
      - 服务单状态
  /api/serviceOrderStatus/list:
    get:
      parameters:
      - in: query
        name: keyword
        type: string
      - enum:
        - ""
        in: query
        name: keywordType
        type: string
        x-enum-varnames:
        - ServiceOrderStatusKeywordCustomerName
      - description: 页码
        in: query
        name: page
        type: integer
      - description: 每页大小
        in: query
        name: pageSize
        type: integer
      - enum:
        - ""
        in: query
        name: queryClass
        type: string
        x-enum-varnames:
        - ServiceOrderStatusQueryClassExpireLessThen60Days
      produces:
      - application/json
      responses:
        "200":
          description: OK
          schema:
            allOf:
            - $ref: '#/definitions/response.ListResponse'
            - properties:
                data:
                  items:
                    $ref: '#/definitions/model.ServiceOrderStatus'
                  type: array
              type: object
      summary: 获取服务单状态列表
      tags:
      - 服务单状态
  /api/serviceOrderStatus/update:
    put:
      parameters:
      - description: 查询参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.UpdateServiceOrderStatus'
      produces:
      - application/json
      responses:
        "200":
          description: OK
          schema:
            $ref: '#/definitions/contextx.Response'
      summary: 更新服务单状态
      tags:
      - 服务单状态
  /api/serviceType/add:
    post:
      parameters:

 model/collectionProjection.go

@@ -13,7 +13,7 @@
        Modifier                  int     `json:"modifier" gorm:"column:modifier;type:int(11);comment:修改人"`
        EstimatedCollectionDate   *string `json:"estimated_collection_date" gorm:"column:estimated_collection_date;type:datetime;comment:预计收款日期"`
        EstimatedCollectionAmount float64 `json:"estimated_collection_amount" gorm:"column:estimated_collection_amount;type:decimal(10,2);comment:预计收款金额"`
        gorm.Model
        gormModel
    }

    CollectionProjectionSearch struct {

 model/model.go

New file
@@ -0,0 +1,21 @@
package model

import "time"

// MyModel definitions from gorm.Model
//
// swagger:model
type gormModel struct {
    // The ID of the item
    // example: 1
    ID uint `json:"id"`
    // The date when the item was created
    // example: 2023-08-10 15:48:25
    CreatedAt time.Time `json:"created_at"`
    // The date when the item was last updated
    // example: 2023-08-10 15:48:25
    UpdatedAt time.Time `json:"updated_at"`
    // The date when the item was deleted
    // example: 2023-08-10 15:48:25
    DeletedAt *time.Time `json:"deleted_at,omitempty"`
}