Merge branch 'master' of ssh://192.168.5.5:29418/aps/crm

zhangqian

2023-08-11 ae6883ce426727efca4facab973d814ae66c69c2

 model/followRecord.go

@@ -3,29 +3,28 @@
import (
   "aps_crm/pkg/mysqlx"
   "gorm.io/gorm"
   "time"
)

type (
   FollowRecord struct {
      Id                   int       `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
      ClientId             int       `json:"client_id" gorm:"column:client_id;type:int(11);comment:客户id"`
      ClientStatusId       int       `json:"client_status_id" gorm:"column:client_status_id;type:int(11);comment:客户状态id"`
      MemberId             int       `json:"member_id" gorm:"column:member_id;type:int(11);comment:跟进人id"`
      Member               User      `json:"member" gorm:"foreignKey:MemberId"`
      Number               string    `json:"number" gorm:"column:number;type:varchar(255);comment:跟进编号"`
      ContactId            int       `json:"contact_id" gorm:"column:contact_id;type:int(11);comment:联系人id"`
      Topic                string    `json:"topic" gorm:"column:topic;type:varchar(255);comment:跟进主题"`
      Record               string    `json:"record" gorm:"column:record;type:MEDIUMTEXT;comment:跟进记录"`
      SaleChanceId         int       `json:"sale_chance_id" gorm:"column:sale_chance_id;type:int(11);comment:销售机会id"`
      SalesLeadsId         int       `json:"sales_leads_id" gorm:"column:sales_leads_id;type:int(11);comment:销售线索id"`
      ContactInformationId int       `json:"contact_information_id" gorm:"column:contact_information_id;type:int(11);comment:联系方式id"`
      FollowTime           time.Time `json:"follow_time" gorm:"column:follow_time;type:datetime;comment:跟进时间"`
      NextFollowTime       time.Time `json:"next_follow_time" gorm:"column:next_follow_time;type:datetime;comment:下次跟进时间"`
      Purpose              string    `json:"purpose" gorm:"column:purpose;type:varchar(255);comment:跟进目的"`
      Content              string    `json:"content" gorm:"column:content;type:MEDIUMTEXT;comment:跟进内容"`
      Client               Client    `json:"client" gorm:"foreignKey:ClientId"`
      Contact              Contact   `json:"contact" gorm:"foreignKey:ContactId"`
      Id                   int         `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
      ClientId             int         `json:"client_id" gorm:"column:client_id;type:int(11);comment:客户id"`
      ClientStatusId       int         `json:"client_status_id" gorm:"column:client_status_id;type:int(11);comment:客户状态id"`
      MemberId             int         `json:"member_id" gorm:"column:member_id;type:int(11);comment:跟进人id"`
      Member               User        `json:"member" gorm:"foreignKey:MemberId"`
      Number               string      `json:"number" gorm:"column:number;type:varchar(255);comment:跟进编号"`
      ContactId            int         `json:"contact_id" gorm:"column:contact_id;type:int(11);comment:联系人id"`
      Topic                string      `json:"topic" gorm:"column:topic;type:varchar(255);comment:跟进主题"`
      Record               string      `json:"record" gorm:"column:record;type:MEDIUMTEXT;comment:跟进记录"`
      SaleChanceId         int         `json:"sale_chance_id" gorm:"column:sale_chance_id;type:int(11);comment:销售机会id"`
      SalesLeadsId         int         `json:"sales_leads_id" gorm:"column:sales_leads_id;type:int(11);comment:销售线索id"`
      ContactInformationId int         `json:"contact_information_id" gorm:"column:contact_information_id;type:int(11);comment:联系方式id"`
      FollowTime           *CustomTime `json:"follow_time" gorm:"column:follow_time;type:datetime;comment:跟进时间"`
      NextFollowTime       *CustomTime `json:"next_follow_time" gorm:"column:next_follow_time;type:datetime;comment:下次跟进时间"`
      Purpose              string      `json:"purpose" gorm:"column:purpose;type:varchar(255);comment:跟进目的"`
      Content              string      `json:"content" gorm:"column:content;type:MEDIUMTEXT;comment:跟进内容"`
      Client               Client      `json:"client" gorm:"foreignKey:ClientId"`
      Contact              Contact     `json:"contact" gorm:"foreignKey:ContactId"`
      gorm.Model           `json:"-"`
   }

@@ -94,6 +93,12 @@
            if key == "client_status" {
               db = db.Joins("Client").Joins("Client.ClientStatus").Where("Client__ClientStatus.name LIKE ?", "%"+v+"%")
            }
         case int:
         case int64:
         case float64:
            if key == "client_id" || key == "contact_id" || key == "sales_leads_id" || key == "sale_chance_id" {
               db = db.Where(key+" = ?", v)
            }
         }
      }
   }