Merge branch 'master' into fly

wangpengfei

2023-08-10 724674c54da32406a16264850c3719b2553aada6

 model/serviceFollowup.go

@@ -10,18 +10,26 @@
   ServiceFollowup struct {

      Id                   int                  `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`

      ClientId             int                  `json:"clientId" gorm:"column:client_id;type:int;comment:客户id"`

      Client               Client               `json:"client" gorm:"foreignKey:ClientId"`
      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"`

      ServiceOrder         ServiceOrder         `gorm:"foreignKey:ServiceId"`

      CustomerServiceSheet CustomerServiceSheet `json:"customerServiceSheet" gorm:"foreignKey:ServiceId"`

      MemberId             int                  `json:"memberId" gorm:"column:member_id;type:int;comment:服务人员id"`

      Member               User                 `json:"Member" gorm:"foreignKey:MemberId"`
      PlanId               int                  `json:"planId" gorm:"column:plan_id;type:int;comment:服务计划id"`

      SatisfactionId       int                  `json:"satisfactionId" gorm:"column:satisfaction_id;type:int;comment:满意度id"`

      Satisfaction         Satisfaction         `json:"satisfaction" gorm:"foreignKey:SatisfactionId"`
      TimelyRateId         int                  `json:"timelyRateId" gorm:"column:timely_rate_id;type:int;comment:及时率id"`

      TimelyRate           TimelyRate           `json:"timelyRate" gorm:"foreignKey:TimelyRateId"`
      SolveRateId          int                  `json:"solveRateId" gorm:"column:solve_rate_id;type:int;comment:解决率id"`

      SolveRate            SolveRate            `json:"solveRate" gorm:"foreignKey:SolveRateId"`
      IsVisitId            int                  `json:"isVisitId" gorm:"column:is_visit_id;type:int;comment:服务人员是否来过id"`

      IsVisit              IsVisit              `json:"isVisit"  gorm:"foreignKey:IsVisitId"`
      OldMemberId          int                  `json:"oldMemberId" gorm:"column:old_member_id;type:int;comment:原服务人员"`

      OldMember            User                 `json:"oldMember" gorm:"foreignKey:OldMemberId"`
      Remark               string               `json:"remark" gorm:"column:remark;type:text;comment:备注"`

      File                 string               `json:"file" gorm:"column:file;type:varchar(255);comment:附件"`



@@ -36,6 +44,7 @@
      OrderBy     string

      PageNum     int

      PageSize    int

      Preload     bool
   }

)



@@ -69,6 +78,19 @@
   case constvar.ServiceFollowupKeywordSatisfactionDegree:

      db = db.Where("satisfaction_id = ?", slf.Keyword)



   }

   if slf.Preload {
      db = db.Preload("CustomerServiceSheet").
         Preload("ServiceOrder").
         Preload("Client").
         Preload("Contact").
         Preload("Satisfaction").
         Preload("TimelyRate").
         Preload("SolveRate").
         Preload("IsVisit").
         Preload("OldMember").
         Preload("Member")
   }



   return db

@@ -111,7 +133,7 @@
      db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)

   }



   err := db.Preload("CustomerServiceSheet").Preload("ServiceOrder").Find(&records).Error

   err := db.Find(&records).Error
   return records, total, err

}



@@ -120,6 +142,11 @@
   return slf

}



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

func (slf *ServiceFollowupSearch) SetKeywordType(keyword constvar.ServiceFollowupKeywordType) *ServiceFollowupSearch {

   slf.KeywordType = keyword

   return slf