fix

wangpengfei

2023-08-14 7008089d9afcf41b28bb1d27d8923e9dfb031a19

fix

fix search criteria to quotaion

 api/v1/masterOrder.go

@@ -98,7 +98,6 @@
    ctx.Ok()
}


// checkMasterOrderParams
// 检查主订单参数
func checkMasterOrderParams(masterOrder request.MasterOrder) (errCode int, masterOrderModel model.MasterOrder) {
@@ -145,14 +144,14 @@
        return
    }

    masterOrders, total, errCode := masterOrderService.GetMasterOrderList(params.Page, params.PageSize, params.Keyword)
    masterOrders, total, errCode := masterOrderService.GetMasterOrderList(params.Page, params.PageSize, params.SearchMap)
    if errCode != ecode.OK {
        ctx.Fail(errCode)
        return
    }

    ctx.OkWithDetailed(response.MasterOrderResponse{
        List: masterOrders,
        List:  masterOrders,
        Count: int(total),
    })
}
}

 docs/docs.go

@@ -12345,6 +12345,10 @@
                "serviceOrderStatus": {
                    "$ref": "#/definitions/model.ServiceOrderStatus"
                },
                "serviceOrderStatusId": {
                    "description": "处理状态",
                    "type": "integer"
                },
                "serviceType": {
                    "$ref": "#/definitions/model.ServiceType"
                },
@@ -12362,10 +12366,6 @@
                "solutionRemark": {
                    "description": "内部备注",
                    "type": "string"
                },
                "status": {
                    "description": "处理状态",
                    "type": "integer"
                },
                "subject": {
                    "description": "主题",
@@ -13994,6 +13994,10 @@
                    "description": "服务单编号",
                    "type": "string"
                },
                "serviceOrderStatusId": {
                    "description": "处理状态",
                    "type": "integer"
                },
                "serviceTypeId": {
                    "description": "服务方式id",
                    "type": "integer"
@@ -14009,10 +14013,6 @@
                "solutionRemark": {
                    "description": "内部备注",
                    "type": "string"
                },
                "status": {
                    "description": "处理状态",
                    "type": "integer"
                },
                "subject": {
                    "description": "主题",
@@ -14576,9 +14576,6 @@
        "request.GetMasterOrderList": {
            "type": "object",
            "properties": {
                "keyword": {
                    "type": "string"
                },
                "page": {
                    "description": "页码",
                    "type": "integer"
@@ -14586,6 +14583,11 @@
                "pageSize": {
                    "description": "每页大小",
                    "type": "integer"
                },
                "search_map": {
                    "description": "搜索条件: map[string]interface{}{\"name\": \"xxx\"}; {\"number\": \"销售总单号\", \"client_name\": \"客户名称\", \"member_name\": \"销售负责人\", \"start_time\": \"开始时间\", \"end_time\": \"结束时间\", \"money\": \"总金额\", \"member_name\": \"负责人\"}",
                    "type": "object",
                    "additionalProperties": true
                }
            }
        },
@@ -14633,7 +14635,7 @@
                    "type": "integer"
                },
                "searchMap": {
                    "description": "搜索条件: map[string]interface{}{\"name\": \"xxx\"}; {\"sale_chance_id\": 销售线索id}",
                    "description": "搜索条件: map[string]interface{}{\"name\": \"xxx\"}; {\"sale_chance_id\": 销售线索id, \"client_name\": \"客户名称\", \"member_name\": \"销售负责人\", \"contact_name\": \"联系人\", \"validity_date\": \"有效期\"}",
                    "type": "object",
                    "additionalProperties": true
                }
@@ -17140,6 +17142,10 @@
                    "description": "服务单编号",
                    "type": "string"
                },
                "serviceOrderStatusId": {
                    "description": "处理状态",
                    "type": "integer"
                },
                "serviceTypeId": {
                    "description": "服务方式id",
                    "type": "integer"
@@ -17155,10 +17161,6 @@
                "solutionRemark": {
                    "description": "内部备注",
                    "type": "string"
                },
                "status": {
                    "description": "处理状态",
                    "type": "integer"
                },
                "subject": {
                    "description": "主题",

 docs/swagger.json

@@ -12333,6 +12333,10 @@
                "serviceOrderStatus": {
                    "$ref": "#/definitions/model.ServiceOrderStatus"
                },
                "serviceOrderStatusId": {
                    "description": "处理状态",
                    "type": "integer"
                },
                "serviceType": {
                    "$ref": "#/definitions/model.ServiceType"
                },
@@ -12350,10 +12354,6 @@
                "solutionRemark": {
                    "description": "内部备注",
                    "type": "string"
                },
                "status": {
                    "description": "处理状态",
                    "type": "integer"
                },
                "subject": {
                    "description": "主题",
@@ -13982,6 +13982,10 @@
                    "description": "服务单编号",
                    "type": "string"
                },
                "serviceOrderStatusId": {
                    "description": "处理状态",
                    "type": "integer"
                },
                "serviceTypeId": {
                    "description": "服务方式id",
                    "type": "integer"
@@ -13997,10 +14001,6 @@
                "solutionRemark": {
                    "description": "内部备注",
                    "type": "string"
                },
                "status": {
                    "description": "处理状态",
                    "type": "integer"
                },
                "subject": {
                    "description": "主题",
@@ -14564,9 +14564,6 @@
        "request.GetMasterOrderList": {
            "type": "object",
            "properties": {
                "keyword": {
                    "type": "string"
                },
                "page": {
                    "description": "页码",
                    "type": "integer"
@@ -14574,6 +14571,11 @@
                "pageSize": {
                    "description": "每页大小",
                    "type": "integer"
                },
                "search_map": {
                    "description": "搜索条件: map[string]interface{}{\"name\": \"xxx\"}; {\"number\": \"销售总单号\", \"client_name\": \"客户名称\", \"member_name\": \"销售负责人\", \"start_time\": \"开始时间\", \"end_time\": \"结束时间\", \"money\": \"总金额\", \"member_name\": \"负责人\"}",
                    "type": "object",
                    "additionalProperties": true
                }
            }
        },
@@ -14621,7 +14623,7 @@
                    "type": "integer"
                },
                "searchMap": {
                    "description": "搜索条件: map[string]interface{}{\"name\": \"xxx\"}; {\"sale_chance_id\": 销售线索id}",
                    "description": "搜索条件: map[string]interface{}{\"name\": \"xxx\"}; {\"sale_chance_id\": 销售线索id, \"client_name\": \"客户名称\", \"member_name\": \"销售负责人\", \"contact_name\": \"联系人\", \"validity_date\": \"有效期\"}",
                    "type": "object",
                    "additionalProperties": true
                }
@@ -17128,6 +17130,10 @@
                    "description": "服务单编号",
                    "type": "string"
                },
                "serviceOrderStatusId": {
                    "description": "处理状态",
                    "type": "integer"
                },
                "serviceTypeId": {
                    "description": "服务方式id",
                    "type": "integer"
@@ -17143,10 +17149,6 @@
                "solutionRemark": {
                    "description": "内部备注",
                    "type": "string"
                },
                "status": {
                    "description": "处理状态",
                    "type": "integer"
                },
                "subject": {
                    "description": "主题",

 docs/swagger.yaml

@@ -1623,6 +1623,9 @@
        type: string
      serviceOrderStatus:
        $ref: '#/definitions/model.ServiceOrderStatus'
      serviceOrderStatusId:
        description: 处理状态
        type: integer
      serviceType:
        $ref: '#/definitions/model.ServiceType'
      serviceTypeId:
@@ -1636,9 +1639,6 @@
      solutionRemark:
        description: 内部备注
        type: string
      status:
        description: 处理状态
        type: integer
      subject:
        description: 主题
        type: string
@@ -2739,6 +2739,9 @@
      serviceNumber:
        description: 服务单编号
        type: string
      serviceOrderStatusId:
        description: 处理状态
        type: integer
      serviceTypeId:
        description: 服务方式id
        type: integer
@@ -2751,9 +2754,6 @@
      solutionRemark:
        description: 内部备注
        type: string
      status:
        description: 处理状态
        type: integer
      subject:
        description: 主题
        type: string
@@ -3145,14 +3145,18 @@
    type: object
  request.GetMasterOrderList:
    properties:
      keyword:
        type: string
      page:
        description: 页码
        type: integer
      pageSize:
        description: 每页大小
        type: integer
      search_map:
        additionalProperties: true
        description: '搜索条件: map[string]interface{}{"name": "xxx"}; {"number": "销售总单号",
          "client_name": "客户名称", "member_name": "销售负责人", "start_time": "开始时间", "end_time":
          "结束时间", "money": "总金额", "member_name": "负责人"}'
        type: object
    type: object
  request.GetOrderManageList:
    properties:
@@ -3187,7 +3191,8 @@
      searchMap:
        additionalProperties: true
        description: '搜索条件: map[string]interface{}{"name": "xxx"}; {"sale_chance_id":
          销售线索id}'
          销售线索id, "client_name": "客户名称", "member_name": "销售负责人", "contact_name": "联系人",
          "validity_date": "有效期"}'
        type: object
    type: object
  request.GetSaleChanceList:
@@ -4887,6 +4892,9 @@
      serviceNumber:
        description: 服务单编号
        type: string
      serviceOrderStatusId:
        description: 处理状态
        type: integer
      serviceTypeId:
        description: 服务方式id
        type: integer
@@ -4899,9 +4907,6 @@
      solutionRemark:
        description: 内部备注
        type: string
      status:
        description: 处理状态
        type: integer
      subject:
        description: 主题
        type: string

 model/masterOrder.go

@@ -23,11 +23,11 @@
    MasterOrderSearch struct {
        MasterOrder

        Orm      *gorm.DB
        Keyword  string
        OrderBy  string
        PageNum  int
        PageSize int
        Orm       *gorm.DB
        SearchMap map[string]interface{}
        OrderBy   string
        PageNum   int
        PageSize  int
    }
)

@@ -43,11 +43,32 @@

func (slf *MasterOrderSearch) build() *gorm.DB {
    var db = slf.Orm.Model(&MasterOrder{})
    if slf.Keyword != "" {
        db = db.Where("name LIKE ?", "%"+slf.Keyword+"%")
    }
    if slf.Id != 0 {
        db = db.Where("id = ?", slf.Id)
    }

    if len(slf.SearchMap) > 0 {
        for key, value := range slf.SearchMap {
            switch v := value.(type) {
            case string:
                if key == "number" || key == "start_time" || key == "end_time" {
                    db = db.Where(key+" = ?", v)
                }

                if key == "client_name" {
                    db = db.Joins("Client").Where("client.name = ?", v)
                }

                if key == "member_name" {
                    db = db.Joins("User").Where("User.username = ?", v)
                }
            case int:
            case float64:
                if key == "client_id" || key == "member_id" || key == "money" {
                    db = db.Where(key+" = ?", v)
                }
            }
        }
    }

    return db
@@ -99,11 +120,6 @@
    return slf
}

func (slf *MasterOrderSearch) SetKeyword(keyword string) *MasterOrderSearch {
    slf.Keyword = keyword
    return slf
}

func (slf *MasterOrderSearch) SetPage(page, size int) *MasterOrderSearch {
    slf.PageNum, slf.PageSize = page, size
    return slf
@@ -113,3 +129,8 @@
    slf.OrderBy = order
    return slf
}

func (slf *MasterOrderSearch) SetSearchMap(searchMap map[string]interface{}) *MasterOrderSearch {
    slf.SearchMap = searchMap
    return slf
}

 model/quotation.go

@@ -57,9 +57,22 @@
        for key, value := range slf.SearchMap {
            switch v := value.(type) {
            case string:
                if key == "validity_date" || key == "number" {
                    db = db.Where(key+" = ?", v)
                }

                if key == "client_name" {
                    db = db.Joins("Client").Where("client.name = ?", v)
                }

                if key == "contact_name" {
                    db = db.Joins("Contact").Where("contact.name = ?", v)
                }

                if key == "validity_date" {
                    db = db.Where(key+" = ?", v)
                }

            case int:
                if key == "client_id" || key == "sale_chance_id" {
                    db = db.Where(key+" = ?", v)

 model/request/masterOrder.go

@@ -20,5 +20,5 @@

type GetMasterOrderList struct {
    PageInfo
    Keyword string `json:"keyword"`
    SearchMap map[string]interface{} `json:"search_map"` // 搜索条件: map[string]interface{}{"name": "xxx"}; {"number": "销售总单号", "client_name": "客户名称", "member_name": "销售负责人", "start_time": "开始时间", "end_time": "结束时间", "money": "总金额", "member_name": "负责人"}
}

 model/request/quotation.go

@@ -26,5 +26,5 @@

type GetQuotationList struct {
    PageInfo
    SearchMap map[string]interface{} // 搜索条件: map[string]interface{}{"name": "xxx"}; {"sale_chance_id": 销售线索id}
    SearchMap map[string]interface{} // 搜索条件: map[string]interface{}{"name": "xxx"}; {"sale_chance_id": 销售线索id, "client_name": "客户名称", "member_name": "销售负责人", "contact_name": "联系人", "validity_date": "有效期"}
}

 model/saleChance.go

@@ -90,7 +90,7 @@
                }

                if key == "member_name" {
                    db = db.Joins("User").Where("User.name LIKE ?", "%"+v+"%")
                    db = db.Joins("User").Where("User.username LIKE ?", "%"+v+"%")
                }

                if key == "sale_stage" {

 service/masterOrder.go

@@ -44,9 +44,9 @@
    return ecode.OK
}

func (MasterOrderService) GetMasterOrderList(page, pageSize int, keyword string) ([]*model.MasterOrder, int64, int) {
func (MasterOrderService) GetMasterOrderList(page, pageSize int, data map[string]interface{}) ([]*model.MasterOrder, int64, int) {
    // get contact list
    contacts, total, err := model.NewMasterOrderSearch().SetKeyword(keyword).SetPage(page, pageSize).FindAll()
    contacts, total, err := model.NewMasterOrderSearch().SetPage(page, pageSize).SetSearchMap(data).FindAll()
    if err != nil {
        return nil, 0, ecode.MasterOrderListErr
    }