Merge branch 'master' into fly

wangpengfei

2023-08-10 724674c54da32406a16264850c3719b2553aada6

 model/serviceContract.go

@@ -26,9 +26,9 @@
      Quotation               Quotation             `json:"quotation" gorm:"foreignKey:QuotationId"`
      ServiceContractTypeId   int                   `json:"serviceContractTypeId" gorm:"column:service_contract_type_id;type:int;comment:合同类型id"`
      ServiceContractType     ServiceContractType   `json:"serviceContractType" gorm:"foreignKey:ServiceContractTypeId"`
      SignTime                string                `json:"signTime" gorm:"column:sign_time;type:datetime;comment:签约时间"`
      StartTime               string                `json:"startTime" gorm:"column:start_time;type:datetime;comment:开始时间"`
      EndTime                 string                `json:"endTime" gorm:"column:end_time;type:datetime;comment:结束时间"`
      SignTime                string                `json:"signTime" gorm:"column:sign_time;type:varchar(255);comment:签约时间"`
      StartTime               string                `json:"startTime" gorm:"column:start_time;type:varchar(255);comment:开始时间"`
      EndTime                 string                `json:"endTime" gorm:"column:end_time;type:varchar(255);comment:结束时间"`
      ServiceContractStatusId int                   `json:"serviceContractStatusId" gorm:"column:service_contract_status_id;type:int;comment:合同状态id"`
      ServiceContractStatus   ServiceContractStatus `json:"serviceContractStatus" gorm:"foreignKey:ServiceContractStatusId"`
      ServiceTimes            int                   `json:"serviceTimes" gorm:"column:service_times;type:int;comment:服务次数"`
@@ -96,7 +96,7 @@
   case constvar.ServiceContractKeywordPrincipal:
      db = db.Joins("left join user on user.id = service_contract.member_id").Where("user.username like ?", fmt.Sprintf("%%%s%%", slf.Keyword))
   case constvar.ServiceContractKeywordProductName:
      db = db.Joins("Products", clause.LeftJoin).Where("Products.name like ?", fmt.Sprintf("%%%s%%", slf.Keyword))
      db = db.Joins("left join service_contract_product scp on scp.service_contract_id = service_contract.id left join products on scp.product_id = products.id").Where("products.name like ?", fmt.Sprintf("%%%s%%", slf.Keyword))
   case constvar.ServiceContractKeywordServiceBeginDate:
      db = db.Where("start_time = ?", slf.Keyword)
   case constvar.ServiceContractKeywordServiceEndDate: