Merge branch 'master' into fly

wangpengfei

2023-08-11 4447be59108bfaf2b0e7b43acc6ab1f236bdd875

Merge branch 'master' into fly

 model/request/serviceOrder.go

@@ -20,7 +20,7 @@
    SaleChanceId    int     `gorm:"sale_leads" json:"saleChanceId"`           // 销售机会id
    FaultTypeId     int     `gorm:"severity_id" json:"faultTypeId"`           // 故障类别id
    SeverityId      int     `gorm:"severity_id" json:"severity"`              // 严重程度id
    Status          int     `gorm:"status" json:"status"`                     // 处理状态
    ServiceOrderStatusId int     `gorm:"column:service_order_status_id;type:int;not null;default:0;comment:服务单状态id" json:"serviceOrderStatusId"` // 处理状态
    ExpectTime      string  `gorm:"expect_time" json:"expectTime"`            // 希望处理时间
    RealTime        string  `gorm:"real_time" json:"realTime"`                // 实际处理时间
    CarFare         float64 `gorm:"car_fare" json:"carFare"`                  // 交通费

 model/serviceFollowup.go

@@ -3,7 +3,9 @@
import (
    "aps_crm/constvar"
    "aps_crm/pkg/mysqlx"
    "fmt"
    "gorm.io/gorm"
    "gorm.io/gorm/clause"
)

type (
@@ -66,17 +68,17 @@

    switch slf.KeywordType {
    case constvar.ServiceFollowupKeywordFollowupNo:
        db = db.Where("number = ?", slf.Keyword)
        db = db.Where("number like ?", fmt.Sprintf("%%%s%%", slf.Keyword))
    case constvar.ServiceFollowupKeywordCustomerName:
        db = db.Where("client_id = ?", slf.Keyword)
        db = db.Joins("Client", clause.LeftJoin).Where("Client.name like ?", fmt.Sprintf("%%%s%%", slf.Keyword))
    case constvar.ServiceFollowupKeywordContactName:
        db = db.Where("contact_id = ?", slf.Keyword)
        db = db.Joins("Contact").Where("Contact.name like ?", fmt.Sprintf("%%%s%%", slf.Keyword))
    case constvar.ServiceFollowupKeywordCustomerServiceNo:
        db = db.Where("service_id = ?", slf.Keyword)
        db = db.Joins("ServiceOrder").Where("ServiceOrder.service_number like ?", fmt.Sprintf("%%%s%%", slf.Keyword))
    case constvar.ServiceFollowupKeywordVisitor:
        db = db.Where("member_id = ?", slf.Keyword)
        db = db.Joins("left join user on user.id = service_followup.member_id").Where("user.username like ?", fmt.Sprintf("%%%s%%", slf.Keyword))
    case constvar.ServiceFollowupKeywordSatisfactionDegree:
        db = db.Where("satisfaction_id = ?", slf.Keyword)
        db = db.Joins("Satisfaction").Where("Satisfaction.name like ?", fmt.Sprintf("%%%s%%", slf.Keyword))

    }


 model/serviceOrder.go

@@ -39,7 +39,7 @@
        FaultType            FaultType          `gorm:"foreignKey:FaultTypeId"`
        SeverityId           int                `gorm:"column:severity_id;type:int;not null;default:0;comment:严重程度id" json:"severity"` // 严重程度id
        Severity             Severity           `gorm:"foreignKey:SeverityId"`
        ServiceOrderStatusId int                `gorm:"column:service_order_status_id;type:int;not null;default:0;comment:服务单状态id" json:"status"` // 处理状态
        ServiceOrderStatusId int                `gorm:"column:service_order_status_id;type:int;not null;default:0;comment:服务单状态id" json:"serviceOrderStatusId"` // 处理状态
        ServiceOrderStatus   ServiceOrderStatus `gorm:"foreignKey:ServiceOrderStatusId"`
        ExpectTime           string             `gorm:"column:expect_time;type:varchar(255);not null;default:'';comment:希望处理时间" json:"expectTime"`          // 希望处理时间
        RealTime             string             `gorm:"column:real_time;type:varchar(255);not null;default:'';comment:实际处理时间" json:"realTime"`              // 实际处理时间