Merge remote-tracking branch 'origin/master'

wangpengfei

2023-08-18 f264456b1e4fd284f53ecc4c70a3b951578bfd2d

 model/client.go

@@ -27,12 +27,13 @@
      ServiceMemberId   int            `json:"service_member_id" gorm:"column:service_member_id;type:int(11);comment:服务负责人ID"`
      DetailAddress     string         `json:"detail_address" gorm:"column:detail_address;type:varchar(255);comment:详细地址"`
      Remark            string         `json:"remark" gorm:"column:remark;type:varchar(255);comment:备注"`
      CreatorId         int            `json:"creator_id" gorm:"column:creator_id;type:int;comment:创建人id"`
      NextVisitTime     *CustomTime    `json:"next_visit_time" gorm:"column:next_visit_time;type:datetime;comment:下次回访时间"`
      LatestServiceTime *CustomTime    `json:"latest_service_time" gorm:"column:latest_service_time;type:datetime;comment:最晚服务时间"`
      FollowRecord      []FollowRecord `json:"follow_record" gorm:"foreignKey:ClientId"`
      Address
      Business
      gorm.Model `json:"-"`
      gormModel
   }

   ClientSearch struct {
@@ -58,15 +59,6 @@
   return &ClientSearch{
      Orm: db,
   }
}

func (c *Client) BeforeSave(tx *gorm.DB) (err error) {
   if c.DeletedAt.Valid {
      c.IsDeleted = true
   } else {
      c.IsDeleted = false
   }
   return
}

func (slf *ClientSearch) build() *gorm.DB {
@@ -143,6 +135,7 @@

func (slf *ClientSearch) Delete() error {
   var db = slf.build()
   db.Update("is_deleted", 1)
   return db.Delete(&Client{}).Error
}