fix

wangpengfei

2023-08-08 cdb47d41f39a5c600caa41692c9b5b0732944d6a

 model/serviceOrder.go

@@ -12,39 +12,45 @@
   // ServiceOrder 服务单
   ServiceOrder struct {
      Id              int           `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
      ServiceNumber   string        `gorm:"service_number" json:"service_number"` // 服务单编号
      ClientId        int           `gorm:"client_id" json:"client_id"`           // 客户id
      ServiceNumber   string        `gorm:"service_number" json:"serviceNumber"` // 服务单编号
      ClientId        int           `gorm:"client_id" json:"clientId"`           // 客户id
      Client          Client        `gorm:"foreignKey:ClientId"`
      ContractId      int           `gorm:"contract_id" json:"contract_id"` // 合同id
      ContractId      int           `gorm:"contract_id" json:"contractId"` // 合同id
      Contract        Contract      `gorm:"foreignKey:ContractId"`
      OrderId         int           `gorm:"order_id" json:"order_id"` // 销售订单id
      Order           OrderManage   `gorm:"foreignKey:OrderId"`
      Subject         string        `gorm:"subject" json:"subject"`       // 主题
      ProductId       int           `gorm:"product_id" json:"product_id"` // 产品id
      OrderId         int           `gorm:"order_id" json:"orderId"` // 销售订单id
      OrderManage     OrderManage   `gorm:"foreignKey:OrderId"`
      Subject         string        `gorm:"subject" json:"subject"`      // 主题
      ProductId       int           `gorm:"product_id" json:"productId"` // 产品id
      Product         Product       `gorm:"foreignKey:ProductId"`
      ServiceTypeId   int           `gorm:"service_type_id" json:"service_type_id"` // 服务方式
      ServiceTypeId   int           `gorm:"service_type_id" json:"serviceTypeId"` // 服务方式id
      ServiceType     ServiceType   `gorm:"foreignKey:ServiceTypeId"`
      ServiceManId    int           `gorm:"service_man_id" json:"service_man_id"`       // 服务人员
      LinkmanId       int           `gorm:"linkman_id" json:"linkman_id"`               // 联系人id
      Address         string        `gorm:"address" json:"address"`                     // 上门地址
      PriorityLevelId int           `gorm:"priority_level_id" json:"priority_level_id"` // 优先级别
      ServiceManId    int           `gorm:"service_man_id" json:"serviceManId"` // 服务人员
      ContactId       int           `gorm:"linkman_id" json:"contactId"`        // 联系人id
      Contact         Contact       `gorm:"foreignKey:ContactId"`
      Address         string        `gorm:"address" json:"address"`                   // 上门地址
      PriorityLevelId int           `gorm:"priority_level_id" json:"priorityLevelId"` // 优先级别id
      PriorityLevel   PriorityLevel `gorm:"foreignKey:PriorityLevelId"`
      AppointmentTime string        `gorm:"appointment_time" json:"appointment_time"` // 预约上门时间
      SaleLeads       int           `gorm:"sale_leads" json:"sale_leads"`             // 销售机会id
      SeverityId      int           `gorm:"severity_id" json:"severity"`              // 严重程度
      Severity        Severity      `gorm:"foreignKey:SeverityId"`
      Status          int           `gorm:"status" json:"status"`               // 处理状态
      ExpectTime      string        `gorm:"expect_time" json:"expect_time"`     // 希望处理时间
      RealTime        string        `gorm:"real_time" json:"real_time"`         // 实际处理时间
      CarFare         float64       `gorm:"car_fare" json:"car_fare"`           // 交通费
      ChargeAmount    float64       `gorm:"charge_amount" json:"charge_amount"` // 收费金额
      TimeSpentId     int           `gorm:"time_spent_id" json:"time_spent_id"` // 花费时间
      FaqId           int           `gorm:"problem_id" json:"problem_id"`       // 常见问题id
      Faq             Faq           `gorm:"foreignKey:FaqId"`
      ProblemDesc     string        `gorm:"problem_desc" json:"problem_desc"`       // 问题描述
      Solution        string        `gorm:"solution" json:"solution"`               // 解决方法
      SolutionRemark  string        `gorm:"solution_remark" json:"solution_remark"` // 内部备注
      Remark          string        `gorm:"remark" json:"remark"`                   // 备注
      AppointmentTime string        `gorm:"appointment_time" json:"appointmentTime"` // 预约上门时间
      SaleChanceId    int           `gorm:"sale_leads" json:"saleChanceId"`          // 销售机会id

      SaleChance     SaleChance `gorm:"foreignKey:SaleChanceId"`
      FaultTypeId    int        `gorm:"severity_id" json:"faultTypeId"` // 故障类别id
      FaultType      FaultType  `gorm:"foreignKey:FaultTypeId"`
      SeverityId     int        `gorm:"severity_id" json:"severity"` // 严重程度id
      Severity       Severity   `gorm:"foreignKey:SeverityId"`
      Status         int        `gorm:"status" json:"status"`              // 处理状态
      ExpectTime     string     `gorm:"expect_time" json:"expectTime"`     // 希望处理时间
      RealTime       string     `gorm:"real_time" json:"realTime"`         // 实际处理时间
      CarFare        float64    `gorm:"car_fare" json:"carFare"`           // 交通费
      ChargeAmount   float64    `gorm:"charge_amount" json:"chargeAmount"` // 收费金额
      TimeSpentId    int        `gorm:"time_spent_id" json:"timeSpentId"`  // 花费时间
      TimeSpent      TimeSpent  `gorm:"foreignKey:TimeSpentId"`
      FaqId          int        `gorm:"problem_id" json:"faqId"` // 常见问题id
      Faq            Faq        `gorm:"foreignKey:FaqId"`
      ProblemDesc    string     `gorm:"problem_desc" json:"problemDesc"`       // 问题描述
      Solution       string     `gorm:"solution" json:"solution"`              // 解决方法
      SolutionRemark string     `gorm:"solution_remark" json:"solutionRemark"` // 内部备注
      Remark         string     `gorm:"remark" json:"remark"`                  // 备注
   }

   // ServiceOrderSearch 服务单搜索条件
@@ -76,12 +82,14 @@
      db = db.Where("id = ?", slf.Id)
   }
   if slf.Preload {
      db = db.Model(&ServiceOrder{}).
      db = db.
         Preload("Client").
         Preload("Contract").
         Preload("OrderManage").
         Preload("Product").
         Preload("ServiceType").
         Preload("Contact").
         Preload("SaleChance").
         Preload("PriorityLevel").
         Preload("Severity").
         Preload("Faq")