aps/SRM.git - Gitblit

parent: f2223806 | 补丁 | 提交 | ignore whitespace

wangpengfei

2023-08-29 d2be142f7b42b20b3125d9ffb398e5b295155327

fix

add contract name to supplier return results

6个文件已修改

	docs/docs.go	68 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	docs/swagger.json	68 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	docs/swagger.yaml	44 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	model/test/contract.go	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	model/test/supplier.go	31 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	service/test/supplier.go	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 docs/docs.go

@@ -1924,22 +1924,8 @@
                        "in": "query"
                    },
                    {
                        "type": "array",
                        "items": {
                            "type": "integer"
                        },
                        "collectionFormat": "csv",
                        "name": "fileContent",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "fileName",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "fileType",
                        "in": "query"
                    },
                    {
@@ -1989,22 +1975,8 @@
                        "in": "query"
                    },
                    {
                        "type": "array",
                        "items": {
                            "type": "integer"
                        },
                        "collectionFormat": "csv",
                        "name": "fileContent",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "fileName",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "fileType",
                        "in": "query"
                    },
                    {
@@ -2059,22 +2031,8 @@
                        "in": "query"
                    },
                    {
                        "type": "array",
                        "items": {
                            "type": "integer"
                        },
                        "collectionFormat": "csv",
                        "name": "fileContent",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "fileName",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "fileType",
                        "in": "query"
                    },
                    {
@@ -2147,22 +2105,8 @@
                        "in": "query"
                    },
                    {
                        "type": "array",
                        "items": {
                            "type": "integer"
                        },
                        "collectionFormat": "csv",
                        "name": "fileContent",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "fileName",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "fileType",
                        "in": "query"
                    },
                    {
@@ -9720,16 +9664,7 @@
                    "description": "创建时间",
                    "type": "string"
                },
                "fileContent": {
                    "type": "array",
                    "items": {
                        "type": "integer"
                    }
                },
                "fileName": {
                    "type": "string"
                },
                "fileType": {
                    "type": "string"
                },
                "id": {
@@ -9849,6 +9784,9 @@
                "contact": {
                    "type": "string"
                },
                "contract": {
                    "$ref": "#/definitions/test.Contract"
                },
                "created_at": {
                    "description": "创建时间",
                    "type": "string"

 docs/swagger.json

@@ -1915,22 +1915,8 @@
                        "in": "query"
                    },
                    {
                        "type": "array",
                        "items": {
                            "type": "integer"
                        },
                        "collectionFormat": "csv",
                        "name": "fileContent",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "fileName",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "fileType",
                        "in": "query"
                    },
                    {
@@ -1980,22 +1966,8 @@
                        "in": "query"
                    },
                    {
                        "type": "array",
                        "items": {
                            "type": "integer"
                        },
                        "collectionFormat": "csv",
                        "name": "fileContent",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "fileName",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "fileType",
                        "in": "query"
                    },
                    {
@@ -2050,22 +2022,8 @@
                        "in": "query"
                    },
                    {
                        "type": "array",
                        "items": {
                            "type": "integer"
                        },
                        "collectionFormat": "csv",
                        "name": "fileContent",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "fileName",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "fileType",
                        "in": "query"
                    },
                    {
@@ -2138,22 +2096,8 @@
                        "in": "query"
                    },
                    {
                        "type": "array",
                        "items": {
                            "type": "integer"
                        },
                        "collectionFormat": "csv",
                        "name": "fileContent",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "fileName",
                        "in": "query"
                    },
                    {
                        "type": "string",
                        "name": "fileType",
                        "in": "query"
                    },
                    {
@@ -9711,16 +9655,7 @@
                    "description": "创建时间",
                    "type": "string"
                },
                "fileContent": {
                    "type": "array",
                    "items": {
                        "type": "integer"
                    }
                },
                "fileName": {
                    "type": "string"
                },
                "fileType": {
                    "type": "string"
                },
                "id": {
@@ -9840,6 +9775,9 @@
                "contact": {
                    "type": "string"
                },
                "contract": {
                    "$ref": "#/definitions/test.Contract"
                },
                "created_at": {
                    "description": "创建时间",
                    "type": "string"

 docs/swagger.yaml

@@ -1628,13 +1628,7 @@
      created_at:
        description: 创建时间
        type: string
      fileContent:
        items:
          type: integer
        type: array
      fileName:
        type: string
      fileType:
        type: string
      id:
        description: 主键ID
@@ -1715,6 +1709,8 @@
        type: string
      contact:
        type: string
      contract:
        $ref: '#/definitions/test.Contract'
      created_at:
        description: 创建时间
        type: string
@@ -2839,17 +2835,8 @@
        in: query
        name: created_at
        type: string
      - collectionFormat: csv
        in: query
        items:
          type: integer
        name: fileContent
        type: array
      - in: query
        name: fileName
        type: string
      - in: query
        name: fileType
        type: string
      - description: 主键ID
        in: query
@@ -2879,17 +2866,8 @@
        in: query
        name: created_at
        type: string
      - collectionFormat: csv
        in: query
        items:
          type: integer
        name: fileContent
        type: array
      - in: query
        name: fileName
        type: string
      - in: query
        name: fileType
        type: string
      - description: 主键ID
        in: query
@@ -2922,17 +2900,8 @@
      - in: query
        name: endCreatedAt
        type: string
      - collectionFormat: csv
        in: query
        items:
          type: integer
        name: fileContent
        type: array
      - in: query
        name: fileName
        type: string
      - in: query
        name: fileType
        type: string
      - description: 主键ID
        in: query
@@ -2977,17 +2946,8 @@
        in: query
        name: created_at
        type: string
      - collectionFormat: csv
        in: query
        items:
          type: integer
        name: fileContent
        type: array
      - in: query
        name: fileName
        type: string
      - in: query
        name: fileType
        type: string
      - description: 主键ID
        in: query

 model/test/contract.go

@@ -10,8 +10,8 @@
    global.GVA_MODEL
    SupplierID  *int   `json:"supplierID" form:"supplierID" gorm:"column:supplier_id;comment:供应商id;"`
    FileName    string `json:"fileName" form:"fileName" gorm:"column:file_name;comment:文件名称;size:255;"`
    FileContent []byte `json:"fileContent" form:"fileContent" gorm:"type:mediumblob;column:file_content;comment:文件内容;"`
    FileType    string `json:"fileType" form:"fileType" gorm:"column:file_type;comment:文件类型;size:255;"`
    FileContent []byte `json:"-" form:"fileContent" gorm:"type:mediumblob;column:file_content;comment:文件内容;"`
    FileType    string `json:"-" form:"fileType" gorm:"column:file_type;comment:文件类型;size:255;"`
}

// TableName Contract 表名

 model/test/supplier.go

@@ -8,21 +8,22 @@
// Supplier 结构体
type Supplier struct {
    global.GVA_MODEL
    Number                string `json:"number" form:"number" gorm:"column:number;comment:供应商编号;size:255;"`
    Name                  string `json:"name" form:"name" gorm:"column:name;comment:名称;size:255;"`
    SupplierType          string `json:"supplierType" form:"supplierType" gorm:"column:supplier_type;comment:供应商类型;size:255;"`
    Industry              string `json:"industry" form:"industry" gorm:"column:industry;comment:所属行业;size:255;"`
    Contact               string `json:"contact" form:"contact" gorm:"column:contact;comment:联系人;size:255;"`
    Phone                 string `json:"phone" form:"phone" gorm:"column:phone;comment:电话;size:255;"`
    ResponsiblePersonName string `json:"responsiblePersonName" form:"responsiblePersonName" gorm:"column:responsible_person_name;comment:负责人;size:255;"`
    Email                 string `json:"email" form:"email" gorm:"column:email;comment:邮箱;size:255;"`
    DetailAddress         string `json:"detailAddress" form:"detailAddress" gorm:"column:detail_address;comment:详细地址;type:text;"`
    Url                   string `json:"url" form:"url" gorm:"column:url;comment:网址;size:255;"`
    AccountName           string `json:"accountName" form:"accountName" gorm:"column:account_name;comment:户名;size:255;"`
    Account               string `json:"account" form:"account" gorm:"column:account;comment:账号;size:255;"`
    Bank                  string `json:"bank" form:"bank" gorm:"column:bank;comment:开户行;size:255;"`
    FileId                *int   `json:"fileId" form:"fileId" gorm:"column:file_id;comment:附件id;size:11;"`
    Status                int    `json:"status" form:"status" gorm:"column:status;comment:状态;size:11;"`
    Number                string   `json:"number" form:"number" gorm:"column:number;comment:供应商编号;size:255;"`
    Name                  string   `json:"name" form:"name" gorm:"column:name;comment:名称;size:255;"`
    SupplierType          string   `json:"supplierType" form:"supplierType" gorm:"column:supplier_type;comment:供应商类型;size:255;"`
    Industry              string   `json:"industry" form:"industry" gorm:"column:industry;comment:所属行业;size:255;"`
    Contact               string   `json:"contact" form:"contact" gorm:"column:contact;comment:联系人;size:255;"`
    Phone                 string   `json:"phone" form:"phone" gorm:"column:phone;comment:电话;size:255;"`
    ResponsiblePersonName string   `json:"responsiblePersonName" form:"responsiblePersonName" gorm:"column:responsible_person_name;comment:负责人;size:255;"`
    Email                 string   `json:"email" form:"email" gorm:"column:email;comment:邮箱;size:255;"`
    DetailAddress         string   `json:"detailAddress" form:"detailAddress" gorm:"column:detail_address;comment:详细地址;type:text;"`
    Url                   string   `json:"url" form:"url" gorm:"column:url;comment:网址;size:255;"`
    AccountName           string   `json:"accountName" form:"accountName" gorm:"column:account_name;comment:户名;size:255;"`
    Account               string   `json:"account" form:"account" gorm:"column:account;comment:账号;size:255;"`
    Bank                  string   `json:"bank" form:"bank" gorm:"column:bank;comment:开户行;size:255;"`
    FileId                *int     `json:"fileId" form:"fileId" gorm:"column:file_id;comment:附件id;size:11;"`
    Contract              Contract `json:"contract" form:"contract" gorm:"foreignKey:FileId;comment:合同;"`
    Status                int      `json:"status" form:"status" gorm:"column:status;comment:状态;size:11;"`
}

// TableName Supplier 表名

 service/test/supplier.go

@@ -65,7 +65,7 @@
        return
    }

    err = db.Limit(limit).Offset(offset).Find(&ss).Error
    err = db.Limit(limit).Offset(offset).Preload("Contract").Find(&ss).Error
    return ss, total, err
}

			@@ -1924,22 +1924,8 @@
			"in": "query"
			},
			{
			"type": "array",
			"items": {
			"type": "integer"
			},
			"collectionFormat": "csv",
			"name": "fileContent",
			"in": "query"
			},
			{
			"type": "string",
			"name": "fileName",
			"in": "query"
			},
			{
			"type": "string",
			"name": "fileType",
			"in": "query"
			},
			{
			@@ -1989,22 +1975,8 @@
			"in": "query"
			},
			{
			"type": "array",
			"items": {
			"type": "integer"
			},
			"collectionFormat": "csv",
			"name": "fileContent",
			"in": "query"
			},
			{
			"type": "string",
			"name": "fileName",
			"in": "query"
			},
			{
			"type": "string",
			"name": "fileType",
			"in": "query"
			},
			{
			@@ -2059,22 +2031,8 @@
			"in": "query"
			},
			{
			"type": "array",
			"items": {
			"type": "integer"
			},
			"collectionFormat": "csv",
			"name": "fileContent",
			"in": "query"
			},
			{
			"type": "string",
			"name": "fileName",
			"in": "query"
			},
			{
			"type": "string",
			"name": "fileType",
			"in": "query"
			},
			{
			@@ -2147,22 +2105,8 @@
			"in": "query"
			},
			{
			"type": "array",
			"items": {
			"type": "integer"
			},
			"collectionFormat": "csv",
			"name": "fileContent",
			"in": "query"
			},
			{
			"type": "string",
			"name": "fileName",
			"in": "query"
			},
			{
			"type": "string",
			"name": "fileType",
			"in": "query"
			},
			{
			@@ -9720,16 +9664,7 @@
			"description": "创建时间",
			"type": "string"
			},
			"fileContent": {
			"type": "array",
			"items": {
			"type": "integer"
			}
			},
			"fileName": {
			"type": "string"
			},
			"fileType": {
			"type": "string"
			},
			"id": {
			@@ -9849,6 +9784,9 @@
			"contact": {
			"type": "string"
			},
			"contract": {
			"$ref": "#/definitions/test.Contract"
			},
			"created_at": {
			"description": "创建时间",
			"type": "string"

			@@ -1915,22 +1915,8 @@
			"in": "query"
			},
			{
			"type": "array",
			"items": {
			"type": "integer"
			},
			"collectionFormat": "csv",
			"name": "fileContent",
			"in": "query"
			},
			{
			"type": "string",
			"name": "fileName",
			"in": "query"
			},
			{
			"type": "string",
			"name": "fileType",
			"in": "query"
			},
			{
			@@ -1980,22 +1966,8 @@
			"in": "query"
			},
			{
			"type": "array",
			"items": {
			"type": "integer"
			},
			"collectionFormat": "csv",
			"name": "fileContent",
			"in": "query"
			},
			{
			"type": "string",
			"name": "fileName",
			"in": "query"
			},
			{
			"type": "string",
			"name": "fileType",
			"in": "query"
			},
			{
			@@ -2050,22 +2022,8 @@
			"in": "query"
			},
			{
			"type": "array",
			"items": {
			"type": "integer"
			},
			"collectionFormat": "csv",
			"name": "fileContent",
			"in": "query"
			},
			{
			"type": "string",
			"name": "fileName",
			"in": "query"
			},
			{
			"type": "string",
			"name": "fileType",
			"in": "query"
			},
			{
			@@ -2138,22 +2096,8 @@
			"in": "query"
			},
			{
			"type": "array",
			"items": {
			"type": "integer"
			},
			"collectionFormat": "csv",
			"name": "fileContent",
			"in": "query"
			},
			{
			"type": "string",
			"name": "fileName",
			"in": "query"
			},
			{
			"type": "string",
			"name": "fileType",
			"in": "query"
			},
			{
			@@ -9711,16 +9655,7 @@
			"description": "创建时间",
			"type": "string"
			},
			"fileContent": {
			"type": "array",
			"items": {
			"type": "integer"
			}
			},
			"fileName": {
			"type": "string"
			},
			"fileType": {
			"type": "string"
			},
			"id": {
			@@ -9840,6 +9775,9 @@
			"contact": {
			"type": "string"
			},
			"contract": {
			"$ref": "#/definitions/test.Contract"
			},
			"created_at": {
			"description": "创建时间",
			"type": "string"

			@@ -1628,13 +1628,7 @@
			created_at:
			description: 创建时间
			type: string
			fileContent:
			items:
			type: integer
			type: array
			fileName:
			type: string
			fileType:
			type: string
			id:
			description: 主键ID
			@@ -1715,6 +1709,8 @@
			type: string
			contact:
			type: string
			contract:
			$ref: '#/definitions/test.Contract'
			created_at:
			description: 创建时间
			type: string
			@@ -2839,17 +2835,8 @@
			in: query
			name: created_at
			type: string
			- collectionFormat: csv
			in: query
			items:
			type: integer
			name: fileContent
			type: array
			- in: query
			name: fileName
			type: string
			- in: query
			name: fileType
			type: string
			- description: 主键ID
			in: query
			@@ -2879,17 +2866,8 @@
			in: query
			name: created_at
			type: string
			- collectionFormat: csv
			in: query
			items:
			type: integer
			name: fileContent
			type: array
			- in: query
			name: fileName
			type: string
			- in: query
			name: fileType
			type: string
			- description: 主键ID
			in: query
			@@ -2922,17 +2900,8 @@
			- in: query
			name: endCreatedAt
			type: string
			- collectionFormat: csv
			in: query
			items:
			type: integer
			name: fileContent
			type: array
			- in: query
			name: fileName
			type: string
			- in: query
			name: fileType
			type: string
			- description: 主键ID
			in: query
			@@ -2977,17 +2946,8 @@
			in: query
			name: created_at
			type: string
			- collectionFormat: csv
			in: query
			items:
			type: integer
			name: fileContent
			type: array
			- in: query
			name: fileName
			type: string
			- in: query
			name: fileType
			type: string
			- description: 主键ID
			in: query

			@@ -10,8 +10,8 @@
			global.GVA_MODEL
			SupplierID *int `json:"supplierID" form:"supplierID" gorm:"column:supplier_id;comment:供应商id;"`
			FileName string `json:"fileName" form:"fileName" gorm:"column:file_name;comment:文件名称;size:255;"`
			FileContent []byte `json:"fileContent" form:"fileContent" gorm:"type:mediumblob;column:file_content;comment:文件内容;"`
			FileType string `json:"fileType" form:"fileType" gorm:"column:file_type;comment:文件类型;size:255;"`
			FileContent []byte `json:"-" form:"fileContent" gorm:"type:mediumblob;column:file_content;comment:文件内容;"`
			FileType string `json:"-" form:"fileType" gorm:"column:file_type;comment:文件类型;size:255;"`
			}

			// TableName Contract 表名

			@@ -8,21 +8,22 @@
			// Supplier 结构体
			type Supplier struct {
			global.GVA_MODEL
			Number string `json:"number" form:"number" gorm:"column:number;comment:供应商编号;size:255;"`
			Name string `json:"name" form:"name" gorm:"column:name;comment:名称;size:255;"`
			SupplierType string `json:"supplierType" form:"supplierType" gorm:"column:supplier_type;comment:供应商类型;size:255;"`
			Industry string `json:"industry" form:"industry" gorm:"column:industry;comment:所属行业;size:255;"`
			Contact string `json:"contact" form:"contact" gorm:"column:contact;comment:联系人;size:255;"`
			Phone string `json:"phone" form:"phone" gorm:"column:phone;comment:电话;size:255;"`
			ResponsiblePersonName string `json:"responsiblePersonName" form:"responsiblePersonName" gorm:"column:responsible_person_name;comment:负责人;size:255;"`
			Email string `json:"email" form:"email" gorm:"column:email;comment:邮箱;size:255;"`
			DetailAddress string `json:"detailAddress" form:"detailAddress" gorm:"column:detail_address;comment:详细地址;type:text;"`
			Url string `json:"url" form:"url" gorm:"column:url;comment:网址;size:255;"`
			AccountName string `json:"accountName" form:"accountName" gorm:"column:account_name;comment:户名;size:255;"`
			Account string `json:"account" form:"account" gorm:"column:account;comment:账号;size:255;"`
			Bank string `json:"bank" form:"bank" gorm:"column:bank;comment:开户行;size:255;"`
			FileId *int `json:"fileId" form:"fileId" gorm:"column:file_id;comment:附件id;size:11;"`
			Status int `json:"status" form:"status" gorm:"column:status;comment:状态;size:11;"`
			Number string `json:"number" form:"number" gorm:"column:number;comment:供应商编号;size:255;"`
			Name string `json:"name" form:"name" gorm:"column:name;comment:名称;size:255;"`
			SupplierType string `json:"supplierType" form:"supplierType" gorm:"column:supplier_type;comment:供应商类型;size:255;"`
			Industry string `json:"industry" form:"industry" gorm:"column:industry;comment:所属行业;size:255;"`
			Contact string `json:"contact" form:"contact" gorm:"column:contact;comment:联系人;size:255;"`
			Phone string `json:"phone" form:"phone" gorm:"column:phone;comment:电话;size:255;"`
			ResponsiblePersonName string `json:"responsiblePersonName" form:"responsiblePersonName" gorm:"column:responsible_person_name;comment:负责人;size:255;"`
			Email string `json:"email" form:"email" gorm:"column:email;comment:邮箱;size:255;"`
			DetailAddress string `json:"detailAddress" form:"detailAddress" gorm:"column:detail_address;comment:详细地址;type:text;"`
			Url string `json:"url" form:"url" gorm:"column:url;comment:网址;size:255;"`
			AccountName string `json:"accountName" form:"accountName" gorm:"column:account_name;comment:户名;size:255;"`
			Account string `json:"account" form:"account" gorm:"column:account;comment:账号;size:255;"`
			Bank string `json:"bank" form:"bank" gorm:"column:bank;comment:开户行;size:255;"`
			FileId *int `json:"fileId" form:"fileId" gorm:"column:file_id;comment:附件id;size:11;"`
			Contract Contract `json:"contract" form:"contract" gorm:"foreignKey:FileId;comment:合同;"`
			Status int `json:"status" form:"status" gorm:"column:status;comment:状态;size:11;"`
			}

			// TableName Supplier 表名

			@@ -65,7 +65,7 @@
			return
			}

			err = db.Limit(limit).Offset(offset).Find(&ss).Error
			err = db.Limit(limit).Offset(offset).Preload("Contract").Find(&ss).Error
			return ss, total, err
			}