Merge branch 'master' into fly

wangpengfei

2023-08-16 1b8811fe5024ad4e2d744a98dc9a49d65bb87a3b

Merge branch 'master' into fly

 api/v1/file.go

@@ -188,7 +188,7 @@
    service.NewFileService().UpdateFile(file)

    data, err := io.ReadAll(f)
    c.Writer.Header().Set("Content-Type", "application/octect-stream")
    c.Writer.Header().Set("Content-Type", "application/octet-stream")
    c.Writer.Header().Set("Content-Disposition", "attachment;filename="+file.Name)
    c.Writer.Write(data)
}

 api/v1/salesDetails.go

@@ -66,6 +66,29 @@
    ctx.Ok()
}

// BatchDelete
// @Tags    SalesDetails 销售明细
// @Summary    批量删除销售明细
// @Produce    application/json
// @Param    object    body request.CommonIds    true "参数"
// @Success    200    {object}    contextx.Response{}
// @Router        /api/salesDetails/delete [delete]
func (s *SalesDetailsApi) BatchDelete(c *gin.Context) {
    var params request.CommonIds
    ctx, ok := contextx.NewContext(c, &params)
    if !ok {
        return
    }

    errCode := salesDetailsService.BatchDeleteSalesDetails(params.Ids)
    if errCode != ecode.OK {
        ctx.Fail(errCode)
        return
    }

    ctx.Ok()
}

// Update
//
//    @Tags        SalesDetails

 api/v1/serviceContract.go

@@ -42,22 +42,45 @@
    ctx.Ok()
}

// Delete
//// Delete
////
////    @Tags        ServiceContract
////    @Summary    删除服务合同
////    @Produce    application/json
////    @Param        object    body        request.DeleteServiceContract true    "查询参数"
////    @Success    200    {object}    contextx.Response{}
////    @Router        /api/serviceContract/delete [delete]
//func (s *ServiceContractApi) Delete(c *gin.Context) {
//    var params request.DeleteServiceContract
//    ctx, ok := contextx.NewContext(c, &params)
//    if !ok {
//        return
//    }
//
//    @Tags        ServiceContract
//    @Summary    删除服务合同
//    @Produce    application/json
//    @Param        object    body        request.DeleteServiceContract true    "查询参数"
//    @Success    200    {object}    contextx.Response{}
//    @Router        /api/serviceContract/delete [delete]
func (s *ServiceContractApi) Delete(c *gin.Context) {
    var params request.DeleteServiceContract
//    errCode := serviceContractService.DeleteServiceContract(params.Ids)
//    if errCode != ecode.OK {
//        ctx.Fail(errCode)
//        return
//    }
//
//    ctx.Ok()
//}

// BatchDelete
// @Tags    ServiceContract
// @Summary    批量删除服务合同
// @Produce    application/json
// @Param    object    body request.CommonIds    true "参数"
// @Success    200    {object}    contextx.Response{}
// @Router        /api/serviceContract/delete [delete]
func (s *ServiceContractApi) BatchDelete(c *gin.Context) {
    var params request.CommonIds
    ctx, ok := contextx.NewContext(c, &params)
    if !ok {
        return
    }

    errCode := serviceContractService.DeleteServiceContract(params.Ids)
    errCode := serviceContractService.BatchDeleteServiceContract(params.Ids)
    if errCode != ecode.OK {
        ctx.Fail(errCode)
        return

 api/v1/serviceOrder.go

@@ -66,6 +66,29 @@
    ctx.Ok()
}

// BatchDelete
// @Tags        服务单
// @Summary    批量删除服务单
// @Produce    application/json
// @Param    object    body request.CommonIds    true "参数"
// @Success    200    {object}    contextx.Response{}
// @Router        /api/serviceOrder/delete [delete]
func (s *ServiceOrderApi) BatchDelete(c *gin.Context) {
    var params request.CommonIds
    ctx, ok := contextx.NewContext(c, &params)
    if !ok {
        return
    }

    errCode := service.NewServiceOrderService().BatchDeleteServiceOrder(params.Ids)
    if errCode != ecode.OK {
        ctx.Fail(errCode)
        return
    }

    ctx.Ok()
}

// Update
// @Tags        服务单管理
// @Summary    更新服务单

 docs/docs.go

@@ -6777,6 +6777,36 @@
                }
            }
        },
        "/api/salesDetails/delete": {
            "delete": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "SalesDetails 销售明细"
                ],
                "summary": "批量删除销售明细",
                "parameters": [
                    {
                        "description": "参数",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.CommonIds"
                        }
                    }
                ],
                "responses": {
                    "200": {
                        "description": "OK",
                        "schema": {
                            "$ref": "#/definitions/contextx.Response"
                        }
                    }
                }
            }
        },
        "/api/salesDetails/delete/{id}": {
            "delete": {
                "produces": [
@@ -7824,15 +7854,15 @@
                "tags": [
                    "ServiceContract"
                ],
                "summary": "删除服务合同",
                "summary": "批量删除服务合同",
                "parameters": [
                    {
                        "description": "查询参数",
                        "description": "参数",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.DeleteServiceContract"
                            "$ref": "#/definitions/request.CommonIds"
                        }
                    }
                ],
@@ -8437,6 +8467,36 @@
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.AddServiceOrder"
                        }
                    }
                ],
                "responses": {
                    "200": {
                        "description": "OK",
                        "schema": {
                            "$ref": "#/definitions/contextx.Response"
                        }
                    }
                }
            }
        },
        "/api/serviceOrder/delete": {
            "delete": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "服务单"
                ],
                "summary": "批量删除服务单",
                "parameters": [
                    {
                        "description": "参数",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.CommonIds"
                        }
                    }
                ],
@@ -14634,6 +14694,20 @@
                }
            }
        },
        "request.CommonIds": {
            "type": "object",
            "required": [
                "ids"
            ],
            "properties": {
                "ids": {
                    "type": "array",
                    "items": {
                        "type": "integer"
                    }
                }
            }
        },
        "request.Contact": {
            "type": "object",
            "properties": {
@@ -14754,17 +14828,6 @@
            }
        },
        "request.DeleteSalesLeads": {
            "type": "object",
            "properties": {
                "ids": {
                    "type": "array",
                    "items": {
                        "type": "integer"
                    }
                }
            }
        },
        "request.DeleteServiceContract": {
            "type": "object",
            "properties": {
                "ids": {

 docs/swagger.json

@@ -6765,6 +6765,36 @@
                }
            }
        },
        "/api/salesDetails/delete": {
            "delete": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "SalesDetails 销售明细"
                ],
                "summary": "批量删除销售明细",
                "parameters": [
                    {
                        "description": "参数",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.CommonIds"
                        }
                    }
                ],
                "responses": {
                    "200": {
                        "description": "OK",
                        "schema": {
                            "$ref": "#/definitions/contextx.Response"
                        }
                    }
                }
            }
        },
        "/api/salesDetails/delete/{id}": {
            "delete": {
                "produces": [
@@ -7812,15 +7842,15 @@
                "tags": [
                    "ServiceContract"
                ],
                "summary": "删除服务合同",
                "summary": "批量删除服务合同",
                "parameters": [
                    {
                        "description": "查询参数",
                        "description": "参数",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.DeleteServiceContract"
                            "$ref": "#/definitions/request.CommonIds"
                        }
                    }
                ],
@@ -8425,6 +8455,36 @@
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.AddServiceOrder"
                        }
                    }
                ],
                "responses": {
                    "200": {
                        "description": "OK",
                        "schema": {
                            "$ref": "#/definitions/contextx.Response"
                        }
                    }
                }
            }
        },
        "/api/serviceOrder/delete": {
            "delete": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "服务单"
                ],
                "summary": "批量删除服务单",
                "parameters": [
                    {
                        "description": "参数",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.CommonIds"
                        }
                    }
                ],
@@ -14622,6 +14682,20 @@
                }
            }
        },
        "request.CommonIds": {
            "type": "object",
            "required": [
                "ids"
            ],
            "properties": {
                "ids": {
                    "type": "array",
                    "items": {
                        "type": "integer"
                    }
                }
            }
        },
        "request.Contact": {
            "type": "object",
            "properties": {
@@ -14742,17 +14816,6 @@
            }
        },
        "request.DeleteSalesLeads": {
            "type": "object",
            "properties": {
                "ids": {
                    "type": "array",
                    "items": {
                        "type": "integer"
                    }
                }
            }
        },
        "request.DeleteServiceContract": {
            "type": "object",
            "properties": {
                "ids": {

 docs/swagger.yaml

@@ -3147,6 +3147,15 @@
      name:
        type: string
    type: object
  request.CommonIds:
    properties:
      ids:
        items:
          type: integer
        type: array
    required:
    - ids
    type: object
  request.Contact:
    properties:
      birthday:
@@ -3231,13 +3240,6 @@
        type: array
    type: object
  request.DeleteSalesLeads:
    properties:
      ids:
        items:
          type: integer
        type: array
    type: object
  request.DeleteServiceContract:
    properties:
      ids:
        items:
@@ -10107,6 +10109,25 @@
      summary: 添加销售明细
      tags:
      - SalesDetails
  /api/salesDetails/delete:
    delete:
      parameters:
      - description: 参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.CommonIds'
      produces:
      - application/json
      responses:
        "200":
          description: OK
          schema:
            $ref: '#/definitions/contextx.Response'
      summary: 批量删除销售明细
      tags:
      - SalesDetails 销售明细
  /api/salesDetails/delete/{id}:
    delete:
      parameters:
@@ -10749,12 +10770,12 @@
  /api/serviceContract/delete:
    delete:
      parameters:
      - description: 查询参数
      - description: 参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.DeleteServiceContract'
          $ref: '#/definitions/request.CommonIds'
      produces:
      - application/json
      responses:
@@ -10762,7 +10783,7 @@
          description: OK
          schema:
            $ref: '#/definitions/contextx.Response'
      summary: 删除服务合同
      summary: 批量删除服务合同
      tags:
      - ServiceContract
  /api/serviceContract/list:
@@ -11135,6 +11156,25 @@
      summary: 添加服务单
      tags:
      - 服务单管理
  /api/serviceOrder/delete:
    delete:
      parameters:
      - description: 参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.CommonIds'
      produces:
      - application/json
      responses:
        "200":
          description: OK
          schema:
            $ref: '#/definitions/contextx.Response'
      summary: 批量删除服务单
      tags:
      - 服务单
  /api/serviceOrder/delete/{id}:
    delete:
      parameters:

 model/request/common.go

@@ -22,3 +22,7 @@
    }
    return true
}

type CommonIds struct {
    Ids []int `json:"ids,omitempty" binding:"required"`
}

 model/salesDetails.go

@@ -104,6 +104,12 @@
    return db.Delete(&SalesDetails{}).Error
}

func (slf *SalesDetailsSearch) DeleteByIds(ids []int) error {
    var db = slf.build()
    db = db.Where("id in ?", ids)
    return db.Delete(&SalesDetails{}).Error
}

func (slf *SalesDetailsSearch) Update(record *SalesDetails) error {
    var db = slf.build()
    return db.Updates(record).Error

 model/serviceContract.go

@@ -143,6 +143,12 @@
    return db.Delete(&ServiceContract{}).Error
}

func (slf *ServiceContractSearch) DeleteByIds(ids []int) error {
    var db = slf.build()
    db = db.Where("id in ?", ids)
    return db.Delete(&ServiceContract{}).Error
}

func (slf *ServiceContractSearch) Find() ([]*ServiceContract, int64, error) {
    var db = slf.build()
    var records = make([]*ServiceContract, 0)

 model/serviceOrder.go

@@ -136,6 +136,12 @@
    return db.Delete(&ServiceOrder{}).Error
}

func (slf *ServiceOrderSearch) DeleteByIds(ids []int) error {
    var db = slf.build()
    db = db.Where("id in ?", ids)
    return db.Delete(&ServiceOrder{}).Error
}

func (slf *ServiceOrderSearch) Update(record *ServiceOrder) error {
    var db = slf.build()
    return db.Updates(record).Error

 router/salesDetails.go

@@ -11,9 +11,10 @@
    salesDetailsRouter := router.Group("salesDetails")
    salesDetailsApi := v1.ApiGroup.SalesDetailsApi
    {
        salesDetailsRouter.POST("add", salesDetailsApi.Add)             // 添加销售明细
        salesDetailsRouter.DELETE("delete/:id", salesDetailsApi.Delete) // 删除销售明细
        salesDetailsRouter.PUT("update", salesDetailsApi.Update)        // 更新销售明细
        salesDetailsRouter.POST("add", salesDetailsApi.Add)              // 添加销售明细
        salesDetailsRouter.DELETE("delete/:id", salesDetailsApi.Delete)  // 删除销售明细
        salesDetailsRouter.DELETE("delete", salesDetailsApi.BatchDelete) // 批量删除销售明细
        salesDetailsRouter.PUT("update", salesDetailsApi.Update)         // 更新销售明细
        salesDetailsRouter.POST("list", salesDetailsApi.List)            // 获取销售明细单列表
    }
}
}

 router/serviceContract.go

@@ -1,19 +1,19 @@
package router



import (

    v1 "aps_crm/api/v1"

    "github.com/gin-gonic/gin"

)



type ServiceContractRouter struct{}



func (s *ServiceContractRouter) InitServiceContractRouter(router *gin.RouterGroup) {

    serviceContractRouter := router.Group("serviceContract")

    serviceContractApi := v1.ApiGroup.ServiceContractApi

    {

        serviceContractRouter.POST("add", serviceContractApi.Add)             // 添加服务合同

        serviceContractRouter.DELETE("delete", serviceContractApi.Delete)     // 删除服务合同

        serviceContractRouter.PUT("update", serviceContractApi.Update)        // 更新服务合同

        serviceContractRouter.POST("list", serviceContractApi.List)           // 获取服务合同列表

    }

}
package router

import (
    v1 "aps_crm/api/v1"
    "github.com/gin-gonic/gin"
)

type ServiceContractRouter struct{}

func (s *ServiceContractRouter) InitServiceContractRouter(router *gin.RouterGroup) {
    serviceContractRouter := router.Group("serviceContract")
    serviceContractApi := v1.ApiGroup.ServiceContractApi
    {
        serviceContractRouter.POST("add", serviceContractApi.Add)              // 添加服务合同
        serviceContractRouter.DELETE("delete", serviceContractApi.BatchDelete) // 删除服务合同
        serviceContractRouter.PUT("update", serviceContractApi.Update)         // 更新服务合同
        serviceContractRouter.POST("list", serviceContractApi.List)            // 获取服务合同列表
    }
}

 router/serviceOrder.go

@@ -9,9 +9,10 @@
    ServiceOrderRouter := router.Group("serviceOrder")
    ServiceOrderApi := v1.ServiceOrderApi{}
    {
        ServiceOrderRouter.POST("add", ServiceOrderApi.Add)             // 添加服务单
        ServiceOrderRouter.DELETE("delete/:id", ServiceOrderApi.Delete) // 删除服务单
        ServiceOrderRouter.PUT("update", ServiceOrderApi.Update)        // 更新服务单
        ServiceOrderRouter.POST("list", ServiceOrderApi.List)           // 获取服务单列表
        ServiceOrderRouter.POST("add", ServiceOrderApi.Add)              // 添加服务单
        ServiceOrderRouter.DELETE("delete/:id", ServiceOrderApi.Delete)  // 删除服务单
        ServiceOrderRouter.DELETE("delete", ServiceOrderApi.BatchDelete) // 批量删除服务单
        ServiceOrderRouter.PUT("update", ServiceOrderApi.Update)         // 更新服务单
        ServiceOrderRouter.POST("list", ServiceOrderApi.List)            // 获取服务单列表
    }
}

 service/salesDetails.go

@@ -42,6 +42,14 @@
    return ecode.OK
}

func (SalesDetailsService) BatchDeleteSalesDetails(ids []int) int {
    err := model.NewSalesDetailsSearch().DeleteByIds(ids)
    if err != nil {
        return ecode.DBErr
    }
    return ecode.OK
}

func (SalesDetailsService) UpdateSalesDetails(salesDetails *model.SalesDetails) int {
    // check salesDetails exist
    old, err := model.NewSalesDetailsSearch().SetId(salesDetails.Id).First()

 service/serviceContract.go

@@ -77,6 +77,14 @@
    return ecode.OK
}

func (SContractService) BatchDeleteServiceContract(ids []int) int {
    err := model.NewServiceContractSearch().DeleteByIds(ids)
    if err != nil {
        return ecode.DBErr
    }
    return ecode.OK
}

func (SContractService) GetServiceContractList(page, pageSize int, queryClass constvar.ServiceContractQueryClass, keywordType constvar.ServiceContractKeywordType, keyword string) ([]*model.ServiceContract, int64, int) {
    // get contact list
    contacts, total, err := model.NewServiceContractSearch().

 service/serviceOrder.go

@@ -30,6 +30,14 @@
    return ecode.OK
}

func (ServiceOrderService) BatchDeleteServiceOrder(ids []int) int {
    err := model.NewServiceOrderSearch().DeleteByIds(ids)
    if err != nil {
        return ecode.DBErr
    }
    return ecode.OK
}

func (ServiceOrderService) GetServiceOrderList(page, pageSize int, queryClass constvar.ServiceOrderQueryClass, keywordType constvar.ServiceOrderKeywordType, keyword string, serviceContractId, salesDetailsId int) ([]*model.ServiceOrder, int64, int) {
    list, total, err := model.NewServiceOrderSearch().
        SetPage(page, pageSize).