update

zhangqian

2023-08-11 e027ac6cb0705ab4eda2a162fb70f4532f24af93

update

 api/v1/serviceFollowup.go

@@ -96,6 +96,7 @@


    ctx.Ok()

}



// checkServiceFollowupParams

func checkServiceFollowupParams(serviceFollowup request.ServiceFollowup) (errCode int, serviceFollowupModel model.ServiceFollowup) {

    //if serviceFollowup.Number == "" {

@@ -140,7 +141,7 @@
        return

    }



    serviceFollowups, total, errCode := serviceFollowupService.GetServiceFollowupList(params.Page, params.PageSize, params.KeywordType, params.Keyword)
    serviceFollowups, total, errCode := serviceFollowupService.GetServiceFollowupList(params.Page, params.PageSize, params.KeywordType, params.Keyword, params.ServiceOrderId)

    if errCode != ecode.OK {

        ctx.Fail(errCode)

        return


 api/v1/serviceOrder.go

@@ -109,7 +109,7 @@
        return
    }

    serviceOrder, total, errCode := service.NewServiceOrderService().GetServiceOrderList(params.Page, params.PageSize, params.QueryClass, params.KeywordType, params.Keyword)
    serviceOrder, total, errCode := service.NewServiceOrderService().GetServiceOrderList(params.Page, params.PageSize, params.QueryClass, params.KeywordType, params.Keyword, params.ServiceContractId, params.SalesDetailsId)
    if errCode != ecode.OK {
        ctx.Fail(errCode)
        return

 docs/docs.go

@@ -12213,11 +12213,11 @@
                "satisfactionId": {
                    "type": "integer"
                },
                "serviceId": {
                    "type": "integer"
                },
                "serviceOrder": {
                    "$ref": "#/definitions/model.ServiceOrder"
                },
                "serviceOrderId": {
                    "type": "integer"
                },
                "solveRate": {
                    "$ref": "#/definitions/model.SolveRate"
@@ -12266,13 +12266,6 @@
                    "description": "联系人id",
                    "type": "integer"
                },
                "contract": {
                    "$ref": "#/definitions/model.Contract"
                },
                "contractId": {
                    "description": "合同id",
                    "type": "integer"
                },
                "expectTime": {
                    "description": "希望处理时间",
                    "type": "string"
@@ -12292,10 +12285,6 @@
                    "type": "integer"
                },
                "id": {
                    "type": "integer"
                },
                "orderId": {
                    "description": "销售订单id",
                    "type": "integer"
                },
                "orderManage": {
@@ -12334,6 +12323,20 @@
                    "description": "销售机会id",
                    "type": "integer"
                },
                "salesDetails": {
                    "$ref": "#/definitions/model.SalesDetails"
                },
                "salesDetailsId": {
                    "description": "销售明细id",
                    "type": "integer"
                },
                "serviceContract": {
                    "$ref": "#/definitions/model.ServiceContract"
                },
                "serviceContractId": {
                    "description": "服务合同id",
                    "type": "integer"
                },
                "serviceManId": {
                    "description": "服务人员",
                    "type": "integer"
@@ -12344,6 +12347,10 @@
                },
                "serviceOrderStatus": {
                    "$ref": "#/definitions/model.ServiceOrderStatus"
                },
                "serviceOrderStatusId": {
                    "description": "处理状态",
                    "type": "integer"
                },
                "serviceType": {
                    "$ref": "#/definitions/model.ServiceType"
@@ -12362,10 +12369,6 @@
                "solutionRemark": {
                    "description": "内部备注",
                    "type": "string"
                },
                "status": {
                    "description": "处理状态",
                    "type": "integer"
                },
                "subject": {
                    "description": "主题",
@@ -13994,6 +13997,10 @@
                    "description": "服务单编号",
                    "type": "string"
                },
                "serviceOrderStatusId": {
                    "description": "处理状态",
                    "type": "integer"
                },
                "serviceTypeId": {
                    "description": "服务方式id",
                    "type": "integer"
@@ -14009,10 +14016,6 @@
                "solutionRemark": {
                    "description": "内部备注",
                    "type": "string"
                },
                "status": {
                    "description": "处理状态",
                    "type": "integer"
                },
                "subject": {
                    "description": "主题",
@@ -14786,6 +14789,10 @@
                "pageSize": {
                    "description": "每页大小",
                    "type": "integer"
                },
                "serviceOrderId": {
                    "description": "服务回访单id",
                    "type": "integer"
                }
            }
        },
@@ -14808,6 +14815,12 @@
                },
                "queryClass": {
                    "$ref": "#/definitions/constvar.ServiceOrderQueryClass"
                },
                "salesDetailsId": {
                    "type": "integer"
                },
                "serviceContractId": {
                    "type": "integer"
                }
            }
        },
@@ -17140,6 +17153,10 @@
                    "description": "服务单编号",
                    "type": "string"
                },
                "serviceOrderStatusId": {
                    "description": "处理状态",
                    "type": "integer"
                },
                "serviceTypeId": {
                    "description": "服务方式id",
                    "type": "integer"
@@ -17155,10 +17172,6 @@
                "solutionRemark": {
                    "description": "内部备注",
                    "type": "string"
                },
                "status": {
                    "description": "处理状态",
                    "type": "integer"
                },
                "subject": {
                    "description": "主题",

 docs/swagger.json

@@ -12201,11 +12201,11 @@
                "satisfactionId": {
                    "type": "integer"
                },
                "serviceId": {
                    "type": "integer"
                },
                "serviceOrder": {
                    "$ref": "#/definitions/model.ServiceOrder"
                },
                "serviceOrderId": {
                    "type": "integer"
                },
                "solveRate": {
                    "$ref": "#/definitions/model.SolveRate"
@@ -12254,13 +12254,6 @@
                    "description": "联系人id",
                    "type": "integer"
                },
                "contract": {
                    "$ref": "#/definitions/model.Contract"
                },
                "contractId": {
                    "description": "合同id",
                    "type": "integer"
                },
                "expectTime": {
                    "description": "希望处理时间",
                    "type": "string"
@@ -12280,10 +12273,6 @@
                    "type": "integer"
                },
                "id": {
                    "type": "integer"
                },
                "orderId": {
                    "description": "销售订单id",
                    "type": "integer"
                },
                "orderManage": {
@@ -12322,6 +12311,20 @@
                    "description": "销售机会id",
                    "type": "integer"
                },
                "salesDetails": {
                    "$ref": "#/definitions/model.SalesDetails"
                },
                "salesDetailsId": {
                    "description": "销售明细id",
                    "type": "integer"
                },
                "serviceContract": {
                    "$ref": "#/definitions/model.ServiceContract"
                },
                "serviceContractId": {
                    "description": "服务合同id",
                    "type": "integer"
                },
                "serviceManId": {
                    "description": "服务人员",
                    "type": "integer"
@@ -12332,6 +12335,10 @@
                },
                "serviceOrderStatus": {
                    "$ref": "#/definitions/model.ServiceOrderStatus"
                },
                "serviceOrderStatusId": {
                    "description": "处理状态",
                    "type": "integer"
                },
                "serviceType": {
                    "$ref": "#/definitions/model.ServiceType"
@@ -12350,10 +12357,6 @@
                "solutionRemark": {
                    "description": "内部备注",
                    "type": "string"
                },
                "status": {
                    "description": "处理状态",
                    "type": "integer"
                },
                "subject": {
                    "description": "主题",
@@ -13982,6 +13985,10 @@
                    "description": "服务单编号",
                    "type": "string"
                },
                "serviceOrderStatusId": {
                    "description": "处理状态",
                    "type": "integer"
                },
                "serviceTypeId": {
                    "description": "服务方式id",
                    "type": "integer"
@@ -13997,10 +14004,6 @@
                "solutionRemark": {
                    "description": "内部备注",
                    "type": "string"
                },
                "status": {
                    "description": "处理状态",
                    "type": "integer"
                },
                "subject": {
                    "description": "主题",
@@ -14774,6 +14777,10 @@
                "pageSize": {
                    "description": "每页大小",
                    "type": "integer"
                },
                "serviceOrderId": {
                    "description": "服务回访单id",
                    "type": "integer"
                }
            }
        },
@@ -14796,6 +14803,12 @@
                },
                "queryClass": {
                    "$ref": "#/definitions/constvar.ServiceOrderQueryClass"
                },
                "salesDetailsId": {
                    "type": "integer"
                },
                "serviceContractId": {
                    "type": "integer"
                }
            }
        },
@@ -17128,6 +17141,10 @@
                    "description": "服务单编号",
                    "type": "string"
                },
                "serviceOrderStatusId": {
                    "description": "处理状态",
                    "type": "integer"
                },
                "serviceTypeId": {
                    "description": "服务方式id",
                    "type": "integer"
@@ -17143,10 +17160,6 @@
                "solutionRemark": {
                    "description": "内部备注",
                    "type": "string"
                },
                "status": {
                    "description": "处理状态",
                    "type": "integer"
                },
                "subject": {
                    "description": "主题",

 docs/swagger.yaml

@@ -1527,10 +1527,10 @@
        $ref: '#/definitions/model.Satisfaction'
      satisfactionId:
        type: integer
      serviceId:
        type: integer
      serviceOrder:
        $ref: '#/definitions/model.ServiceOrder'
      serviceOrderId:
        type: integer
      solveRate:
        $ref: '#/definitions/model.SolveRate'
      solveRateId:
@@ -1566,11 +1566,6 @@
      contactId:
        description: 联系人id
        type: integer
      contract:
        $ref: '#/definitions/model.Contract'
      contractId:
        description: 合同id
        type: integer
      expectTime:
        description: 希望处理时间
        type: string
@@ -1585,9 +1580,6 @@
        description: 故障类别id
        type: integer
      id:
        type: integer
      orderId:
        description: 销售订单id
        type: integer
      orderManage:
        $ref: '#/definitions/model.OrderManage'
@@ -1615,6 +1607,16 @@
      saleChanceId:
        description: 销售机会id
        type: integer
      salesDetails:
        $ref: '#/definitions/model.SalesDetails'
      salesDetailsId:
        description: 销售明细id
        type: integer
      serviceContract:
        $ref: '#/definitions/model.ServiceContract'
      serviceContractId:
        description: 服务合同id
        type: integer
      serviceManId:
        description: 服务人员
        type: integer
@@ -1623,6 +1625,9 @@
        type: string
      serviceOrderStatus:
        $ref: '#/definitions/model.ServiceOrderStatus'
      serviceOrderStatusId:
        description: 处理状态
        type: integer
      serviceType:
        $ref: '#/definitions/model.ServiceType'
      serviceTypeId:
@@ -1636,9 +1641,6 @@
      solutionRemark:
        description: 内部备注
        type: string
      status:
        description: 处理状态
        type: integer
      subject:
        description: 主题
        type: string
@@ -2739,6 +2741,9 @@
      serviceNumber:
        description: 服务单编号
        type: string
      serviceOrderStatusId:
        description: 处理状态
        type: integer
      serviceTypeId:
        description: 服务方式id
        type: integer
@@ -2751,9 +2756,6 @@
      solutionRemark:
        description: 内部备注
        type: string
      status:
        description: 处理状态
        type: integer
      subject:
        description: 主题
        type: string
@@ -3298,6 +3300,9 @@
      pageSize:
        description: 每页大小
        type: integer
      serviceOrderId:
        description: 服务回访单id
        type: integer
    type: object
  request.GetServiceOrderList:
    properties:
@@ -3313,6 +3318,10 @@
        type: integer
      queryClass:
        $ref: '#/definitions/constvar.ServiceOrderQueryClass'
      salesDetailsId:
        type: integer
      serviceContractId:
        type: integer
    type: object
  request.GetSubOrderList:
    properties:
@@ -4887,6 +4896,9 @@
      serviceNumber:
        description: 服务单编号
        type: string
      serviceOrderStatusId:
        description: 处理状态
        type: integer
      serviceTypeId:
        description: 服务方式id
        type: integer
@@ -4899,9 +4911,6 @@
      solutionRemark:
        description: 内部备注
        type: string
      status:
        description: 处理状态
        type: integer
      subject:
        description: 主题
        type: string

 model/request/serviceFollowup.go

@@ -31,6 +31,7 @@
    PageInfo

    KeywordType constvar.ServiceFollowupKeywordType `json:"keywordType"`

    Keyword     string                              `json:"keyword"`

    ServiceOrderId int                                 `json:"serviceOrderId"` //服务回访单id

}



type DeleteServiceFollowup struct {


 model/request/serviceOrder.go

@@ -43,4 +43,6 @@
    QueryClass  constvar.ServiceOrderQueryClass  `json:"queryClass" form:"queryClass"`
    KeywordType constvar.ServiceOrderKeywordType `json:"keywordType" form:"keywordType"`
    Keyword     string                           `json:"keyword" form:"keyword"`
    ServiceContractId int                              `json:"serviceContractId" form:"serviceContractId"`
    SalesDetailsId    int                              `json:"salesDetailsId" form:"salesDetailsId"`
}

 model/serviceFollowup.go

@@ -16,7 +16,7 @@
        Number               string               `json:"number" gorm:"column:number;type:varchar(255);comment:合同编号"`
        ContactId            int                  `json:"contactId" gorm:"column:contact_id;type:int;comment:联系人id"`
        Contact              Contact              `json:"contact"  gorm:"foreignKey:ContactId"`
        ServiceId            int                  `json:"serviceId" gorm:"column:service_id;type:int;comment:客户服务单id"`
        ServiceOrderId       int                  `json:"serviceOrderId" gorm:"column:service_order_id;type:int;comment:客户服务单id"`
        ServiceOrder         ServiceOrder         `gorm:"foreignKey:ServiceId"`
        CustomerServiceSheet CustomerServiceSheet `json:"customerServiceSheet" gorm:"foreignKey:ServiceId"`
        MemberId             int                  `json:"memberId" gorm:"column:member_id;type:int;comment:服务人员id"`
@@ -144,6 +144,11 @@
    return slf
}

func (slf *ServiceFollowupSearch) SetServiceOrderId(id int) *ServiceFollowupSearch {
    slf.ServiceOrderId = id
    return slf
}

func (slf *ServiceFollowupSearch) SetPreload(preload bool) *ServiceFollowupSearch {
    slf.Preload = preload
    return slf

 model/serviceOrder.go

@@ -17,9 +17,10 @@
        ServiceNumber        string             `gorm:"column:service_number;type:varchar(255);not null;default:'';comment:服务单编号" json:"serviceNumber"` // 服务单编号
        ClientId             int                `gorm:"column:client_id;type:int;not null;default:0;comment:客户id" json:"clientId"`                      // 客户id
        Client               Client             `gorm:"foreignKey:ClientId"`
        ContractId           int                `gorm:"column:contract_id;type:int;not null;default:0;comment:合同id" json:"contractId"` // 合同id
        Contract             Contract           `gorm:"foreignKey:ContractId"`
        OrderId              int                `gorm:"column:order_id;type:int;not null;default:0;comment:销售订单id" json:"orderId"` // 销售订单id
        ServiceContractId    int                `gorm:"column:contract_id;type:int;not null;default:0;comment:服务合同id" json:"serviceContractId"` // 服务合同id
        ServiceContract      ServiceContract    `gorm:"foreignKey:ServiceContractId"`
        SalesDetailsId       int                `gorm:"column:order_id;type:int;not null;default:0;comment:销售订单id" json:"salesDetailsId"` // 销售明细id
        SalesDetails         SalesDetails       `gorm:"foreignKey:SalesDetailsId"`
        OrderManage          OrderManage        `gorm:"foreignKey:OrderId"`
        Subject              string             `gorm:"column:subject;type:varchar(255);not null;default:'';comment:主题" json:"subject"` // 主题
        ProductId            int                `gorm:"column:product_id;type:int;not null;default:0;comment:产品id" json:"productId"`    // 产品id
@@ -83,6 +84,12 @@
    if slf.Id != 0 {
        db = db.Where("id = ?", slf.Id)
    }
    if slf.ServiceContractId != 0 {
        db = db.Where("service_contract_id = ?", slf.ServiceContractId)
    }
    if slf.SalesDetailsId != 0 {
        db = db.Where("sales_details_id = ?", slf.SalesDetailsId)
    }
    if slf.Preload {
        db = db.
            Preload("Client").
@@ -143,6 +150,16 @@
    return slf
}

func (slf *ServiceOrderSearch) SetServiceContractId(id int) *ServiceOrderSearch {
    slf.ServiceContractId = id
    return slf
}

func (slf *ServiceOrderSearch) SetSalesDetailsId(id int) *ServiceOrderSearch {
    slf.SalesDetailsId = id
    return slf
}

func (slf *ServiceOrderSearch) SetPage(page, size int) *ServiceOrderSearch {
    slf.PageNum, slf.PageSize = page, size
    return slf

 service/serviceFollowup.go

@@ -41,13 +41,14 @@
    return ecode.OK
}

func (FollowupService) GetServiceFollowupList(page, pageSize int, keywordType constvar.ServiceFollowupKeywordType, keyword string) ([]*model.ServiceFollowup, int64, int) {
func (FollowupService) GetServiceFollowupList(page, pageSize int, keywordType constvar.ServiceFollowupKeywordType, keyword string, serviceOrderId int) ([]*model.ServiceFollowup, int64, int) {
    // get contact list
    contacts, total, err := model.NewServiceFollowupSearch().
        SetKeywordType(keywordType).
        SetKeyword(keyword).
        SetPage(page, pageSize).
        SetPreload(true).
        SetServiceOrderId(serviceOrderId).
        FindAll()
    if err != nil {
        return nil, 0, ecode.ServiceFollowupListErr

 service/serviceOrder.go

@@ -30,13 +30,15 @@
    return ecode.OK
}

func (ServiceOrderService) GetServiceOrderList(page, pageSize int, queryClass constvar.ServiceOrderQueryClass, keywordType constvar.ServiceOrderKeywordType, keyword string) ([]*model.ServiceOrder, int64, int) {
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).
        SetKeyword(keyword).
        SetKeywordType(keywordType).
        SetQueryClass(queryClass).
        SetPreload(true).
        SetServiceContractId(serviceContractId).
        SetSalesDetailsId(salesDetailsId).
        Find()
    if err != nil {
        return nil, 0, ecode.DBErr