bug修改

liujiandao

2023-10-17 d4bf53dd19a45ef09a367babcf7a2ac04ae1d08f

 model/serviceOrder.go

@@ -21,12 +21,13 @@
      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"`
      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
      Product              Product            `gorm:"foreignKey:ProductId"`
      ServiceTypeId        int                `gorm:"column:service_type_id;type:int;not null;default:0;comment:服务方式id" json:"serviceTypeId"` // 服务方式id
      Subject              string             `gorm:"column:subject;type:varchar(255);not null;default:'';comment:主题" json:"subject"`                       // 主题
      ProductTypeName      string             `gorm:"column:product_type_name;type:varchar(255);not null;default:'';comment:产品分类名称" json:"productTypeName"` // 产品分类名称
      ProductName          string             `gorm:"column:product_name;type:varchar(255);not null;default:'';comment:产品名称" json:"productName"`            // 产品名称
      ServiceTypeId        int                `gorm:"column:service_type_id;type:int;not null;default:0;comment:服务方式id" json:"serviceTypeId"`               // 服务方式id
      ServiceType          ServiceType        `gorm:"foreignKey:ServiceTypeId"`
      ServiceManId         int                `gorm:"column:service_man_id;type:int;not null;default:0;comment:服务人员" json:"serviceManId"` // 服务人员
      ServiceMan           User               `gorm:"foreignKey:ServiceManId" json:"serviceMan"`                                          // 服务人员
      ContactId            int                `gorm:"linkman_id" json:"contactId"`                                                        // 联系人id
      Contact              Contact            `gorm:"foreignKey:ContactId"`
      Address              string             `gorm:"column:address;type:varchar(255);not null;default:'';comment:上门地址" json:"address"`           // 上门地址
@@ -53,22 +54,26 @@
      Solution             string             `gorm:"column:solution;type:varchar(255);not null;default:'';comment:解决方法" json:"solution"`              // 解决方法
      SolutionRemark       string             `gorm:"column:solution_remark;type:varchar(255);not null;default:'';comment:内部备注" json:"solutionRemark"` // 内部备注
      Remark               string             `gorm:"column:remark;type:varchar(255);not null;default:'';comment:备注" json:"remark"`                    // 备注
      CodeStandID          string             `json:"codeStandID" gorm:"column:code_stand_id;type:varchar(255);comment:编码id"`
      CrmModel
   }

   // ServiceOrderSearch 服务单搜索条件
   ServiceOrderSearch struct {
      ServiceOrder
      Orm         *gorm.DB
      QueryClass  constvar.ServiceOrderQueryClass
      KeywordType constvar.ServiceOrderKeywordType
      Keyword     string
      PageNum     int
      PageSize    int
      Preload     bool
      Orm           *gorm.DB
      QueryClass    constvar.ServiceOrderQueryClass
      KeywordType   constvar.ServiceOrderKeywordType
      Keyword       string
      PageNum       int
      PageSize      int
      Preload       bool
      ServiceManIds []int
      Order         string
   }
)

func (ServiceOrder) TableName() string {
func (slf *ServiceOrder) TableName() string {
   return "service_order"
}

@@ -84,23 +89,30 @@
      db = db.Where("id = ?", slf.Id)
   }
   if slf.ServiceContractId != 0 {
      db = db.Where("service_contract_id = ?", slf.ServiceContractId)
      db = db.Where("contract_id = ?", slf.ServiceContractId)
   }
   if slf.SalesDetailsId != 0 {
      db = db.Where("sales_details_id = ?", slf.SalesDetailsId)
      db = db.Where("order_id = ?", slf.SalesDetailsId)
   }
   if slf.Order != "" {
      db = db.Order(slf.Order)
   }
   if slf.Preload {
      db = db.
         Preload("Client").
         Preload("Contract").
         Preload("OrderManage").
         Preload("Product").
         Preload("ServiceContract").
         Preload("SalesDetails").
         Preload("ServiceType").
         Preload("Contact").
         Preload("SaleChance").
         Preload("ServiceMan").
         Preload("PriorityLevel").
         Preload("SaleChance").
         Preload("FaultType").
         Preload("Severity").
         Preload("ServiceOrderStatus").
         Preload("TimeSpent").
         Preload("Faq")

   }
   switch slf.KeywordType {
   case constvar.ServiceOrderKeywordClientName:
@@ -119,6 +131,10 @@
      db = db.Joins("FaultType", clause.LeftJoin).Where("FaultType.name like ?", fmt.Sprintf("%%%s%%", slf.Keyword))
   }

   if len(slf.ServiceManIds) > 0 {
      db = db.Where("service_man_id in ?", slf.ServiceManIds)
   }

   return db
}

@@ -129,6 +145,12 @@

func (slf *ServiceOrderSearch) Delete() error {
   var db = slf.build()
   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
}

@@ -179,8 +201,18 @@
   return slf
}

func (slf *ServiceOrderSearch) SetMemberIds(memberIds []int) *ServiceOrderSearch {
   slf.ServiceManIds = memberIds
   return slf
}

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

func (slf *ServiceOrderSearch) SetOrder(order string) *ServiceOrderSearch {
   slf.Order = order
   return slf
}

@@ -223,3 +255,8 @@
   err := db.Find(&records).Error
   return records, total, err
}

func (slf *ServiceOrderSearch) UpdateByMap(data map[string]interface{}) error {
   var db = slf.build()
   return db.Updates(data).Error
}