yuliang1112 2 лет назад
Родитель
Сommit
7d0ca008be

+ 2 - 0
model/http_model/SpecialTaskDataList.go

@@ -26,6 +26,7 @@ type SpecialTaskDataPreview struct {
 	PhotoUrl         string  `json:"photo_url"`         // 数据截图url
 	AllPayment       float64 `json:"all_payment"`       // 企业支付
 	RealPayment      float64 `json:"real_payment"`      // 企业实际支付(扣除违约扣款)
+	Phone            string  `json:"phone"`             // 联系方式
 	SubmitAt         string  `json:"submit_at"`         // 提交时间
 	AgreeAt          string  `json:"agree_at"`          // 同意时间
 	ReviseOpinion    string  `json:"revise_opinion"`    // 审稿意见
@@ -45,6 +46,7 @@ type SpecialTaskDataInfo struct {
 	AllPayment       float64   `json:"all_payment"`       // 企业支付
 	RealPayment      float64   `json:"real_payment"`      // 企业实际支付(扣除违约扣款)
 	ReviseOpinion    string    `json:"revise_opinion"`    // 审稿意见
+	Phone            string    `json:"phone"`             // 联系方式
 	CreateAt         time.Time `json:"create_at"`         // 创建时间
 	SubmitAt         time.Time `json:"submit_at"`         // 提交时间
 	AgreeAt          time.Time `json:"agree_at"`          // 同意时间

+ 2 - 0
model/http_model/SpecialTaskFinishDataList.go

@@ -23,6 +23,7 @@ type SpecialTaskFinishDataPreview struct {
 	CollectNumber    int     `json:"collect_number"`    // 收藏数
 	PhotoUrl         string  `json:"photo_url"`         // 数据截图url
 	RealPayment      float64 `json:"real_payment"`      // 企业实际支付(扣除违约扣款)
+	Phone            string  `json:"phone"`             // 联系方式
 	SubmitAt         string  `json:"submit_at"`         // 提交时间
 	LinkUrl          string  `json:"link_url"`          // 上传链接url
 }
@@ -39,6 +40,7 @@ type SpecialTaskFinishDataInfo struct {
 	PhotoUrl         string    `json:"photo_url"`         // 数据截图url
 	RealPayment      float64   `json:"real_payment"`      // 企业实际支付(扣除违约扣款)
 	LinkUrl          string    `json:"link_url"`          // 上传链接url
+	Phone            string    `json:"phone"`             // 联系方式
 	SubmitAt         time.Time `json:"submit_at"`         // 提交时间
 }
 

+ 2 - 0
model/http_model/SpecialTaskInviteList.go

@@ -23,6 +23,7 @@ type SpecialTaskInvitePreview struct {
 	TaskReward         string `json:"task_reward"`           // 任务奖励金额
 	HomePageUrl        string `json:"home_page_url"`         // 主页链接
 	TaskStatus         string `json:"task_status"`           // 任务状态
+	Phone              string `json:"phone"`                 // 联系方式
 	CreateDate         string `json:"create_date"`           // 创建时间
 }
 
@@ -35,6 +36,7 @@ type SpecialTaskInviteInfo struct {
 	TaskReward         float64   `json:"task_reward"`           // 任务奖励金额
 	HomePageUrl        string    `json:"home_page_url"`         // 主页链接
 	TaskStatus         string    `json:"task_status"`           // 任务状态 1待选 2已选 3落选
+	Phone              string    `json:"phone"`                 // 联系方式
 	CreateDate         time.Time `json:"create_date"`           // 创建时间
 }
 

+ 2 - 0
model/http_model/SpecialTaskLinkList.go

@@ -20,6 +20,7 @@ type SpecialTaskLinkPreview struct {
 	FansCount        string `json:"fans_count"`        // 粉丝数
 	LinkUrl          string `json:"link_url"`          // 上传链接url
 	PhotoUrl         string `json:"photo_url"`         // 上传截图url
+	Phone            string `json:"phone"`             // 联系方式
 	Submit           string `json:"link_upload_time"`  // 创建时间
 	AgreeAt          string `json:"agree_at"`          // 同意时间
 	ReviseOpinion    string `json:"revise_opinion"`    // 审稿意见
@@ -33,6 +34,7 @@ type SpecialTaskLinkInfo struct {
 	LinkUrl          string    `json:"link_url"`          // 上传链接url
 	PhotoUrl         string    `json:"photo_url"`         // 上传截图url
 	ReviseOpinion    string    `json:"revise_opinion"`    // 审稿意见
+	Phone            string    `json:"phone"`             // 联系方式
 	CreateAt         time.Time `json:"create_at"`         // 创建时间
 	SubmitAt         time.Time `json:"submit_at"`         // 提交时间
 	AgreeAt          time.Time `json:"agree_at"`          // 同意时间

+ 2 - 0
model/http_model/SpecialTaskScriptList.go

@@ -20,6 +20,7 @@ type SpecialTaskScriptPreview struct {
 	FansCount        string `json:"fans_count"`         // 粉丝数
 	Submit           string `json:"script_upload_time"` //创建时间
 	Title            string `json:"title"`              //脚本标题
+	Phone            string `json:"phone"`              // 联系方式
 	AgreeAt          string `json:"agree_at"`           //同意时间
 	Content          string `json:"content"`            //脚本内容
 	ReviseOpinion    string `json:"revise_opinion"`     //审稿意见
@@ -33,6 +34,7 @@ type SpecialTaskScriptInfo struct {
 	Title            string    `json:"title"`             //脚本标题
 	Content          string    `json:"content"`           //脚本内容
 	ReviseOpinion    string    `json:"revise_opinion"`    //审稿意见
+	Phone            string    `json:"phone"`             // 联系方式
 	CreateAt         time.Time `json:"create_at"`         //创建时间
 	SubmitAt         time.Time `json:"submit_at"`         // 提交时间
 	AgreeAt          time.Time `json:"agree_at"`          //同意时间

+ 3 - 1
model/http_model/SpecialTaskSketchList.go

@@ -19,6 +19,7 @@ type SpecialTaskSketchPreview struct {
 	SketchID         string `json:"sketch_id"`          // 初稿ID
 	PlatformNickname string `json:"platform_nickname"`  // 账号昵称
 	FansCount        string `json:"fans_count"`         // 粉丝数
+	Phone            string `json:"phone"`              // 联系方式
 	Submit           string `json:"sketch_upload_time"` // 创建时间
 	AgreeAt          string `json:"argee_at"`           // 同意时间
 	Title            string `json:"title"`              // 初稿标题
@@ -34,8 +35,9 @@ type SpecialTaskSketchInfo struct {
 	Title            string    `json:"title"`             //初稿标题
 	Content          string    `json:"content"`           //初稿内容
 	ReviseOpinion    string    `json:"revise_opinion"`    //审稿意见
+	Phone            string    `json:"phone"`             //联系方式
 	CreateAt         time.Time `json:"create_at"`         //创建时间
-	SubmitAt         time.Time `json:"submit_at"`         // 提交时间
+	SubmitAt         time.Time `json:"submit_at"`         //提交时间
 	AgreeAt          time.Time `json:"agree_at"`          //同意时间
 	RejectAt         time.Time `json:"reject_at"`         //拒绝时间
 	IsReview         int       `json:"is_review"`         //是否审核

+ 2 - 0
model/http_model/full_project_list.go

@@ -12,6 +12,7 @@ type FullProjectListRequest struct {
 	ProjectContentType string `json:"project_content_type"` // 内容形式
 	ProjectUpdated     string `json:"project_updated"`      // 最后操作时间
 }
+
 type FullProjectPreview struct {
 	ProjectId          string `json:"project_id"`           // 项目ID
 	ProjectName        string `json:"project_name"`         // 项目名
@@ -22,6 +23,7 @@ type FullProjectPreview struct {
 	ProjectContentType string `json:"project_content_type"` // 内容形式
 	ProjectUpdated     string `json:"project_updated"`      // 最后操作时间
 }
+
 type FullProjectListData struct {
 	FullProjectPreview []*FullProjectPreview `json:"full_project_pre_view"`
 	Total              string                `json:"total"`

+ 3 - 0
pack/special_task_data_list.go

@@ -29,6 +29,7 @@ func MGormSpecialTaskDataInfoToHttpSpecialTaskDataPreview(SpecialTaskDataInfo *h
 		AllPayment:       SpecialTaskDataInfo.AllPayment,
 		RealPayment:      SpecialTaskDataInfo.RealPayment,
 		ReviseOpinion:    SpecialTaskDataInfo.ReviseOpinion,
+		Phone:            SpecialTaskDataInfo.Phone,
 		SubmitAt:         conv.MustString(SpecialTaskDataInfo.SubmitAt, "")[0:19],
 		AgreeAt:          conv.MustString(SpecialTaskDataInfo.AgreeAt, "")[0:19],
 	}
@@ -45,6 +46,7 @@ func SpecialTaskDataToTaskInfo(SpecialTaskDatas []*http_model.SpecialTaskData) [
 
 func GetSpecialTaskDataInfoStruct(SpecialTaskData *http_model.SpecialTaskData) *http_model.SpecialTaskDataInfo {
 	TalentPlatformInfoSnap := SpecialTaskData.Talent.TalentPlatformInfoSnap
+	TalentPersonalInfoSnap := SpecialTaskData.Talent.TalentPersonalInfoSnap
 	return &http_model.SpecialTaskDataInfo{
 		TaskID:           SpecialTaskData.Talent.TaskId,
 		PlatformNickname: conv.MustString(gjson.Get(TalentPlatformInfoSnap, "platform_nickname"), ""),
@@ -59,6 +61,7 @@ func GetSpecialTaskDataInfoStruct(SpecialTaskData *http_model.SpecialTaskData) *
 		AllPayment:       SpecialTaskData.Talent.AllPayment,
 		RealPayment:      SpecialTaskData.Talent.RealPayment,
 		ReviseOpinion:    SpecialTaskData.Data.ReviseOpinion,
+		Phone:            conv.MustString(gjson.Get(TalentPersonalInfoSnap, "talent_phone_number"), ""),
 		CreateAt:         SpecialTaskData.Data.CreateAt,
 		SubmitAt:         SpecialTaskData.Data.SubmitAt,
 		AgreeAt:          SpecialTaskData.Data.AgreeAt,

+ 3 - 0
pack/special_task_finishdata_list.go

@@ -27,6 +27,7 @@ func MGormSpecialTaskFinishDataInfoToHttpSpecialTaskFinishDataPreview(SpecialTas
 		RealPayment:      SpecialTaskFinishDataInfo.RealPayment,
 		PhotoUrl:         SpecialTaskFinishDataInfo.PhotoUrl,
 		LinkUrl:          SpecialTaskFinishDataInfo.LinkUrl,
+		Phone:            SpecialTaskFinishDataInfo.Phone,
 		SubmitAt:         conv.MustString(SpecialTaskFinishDataInfo.SubmitAt, "")[0:19],
 	}
 }
@@ -42,6 +43,7 @@ func SpecialTaskFinishDataToTaskInfo(SpecialTaskFinishDatas []*http_model.Specia
 
 func GetSpecialTaskFinishDataInfoStruct(SpecialTaskFinishData *http_model.SpecialTaskFinishData) *http_model.SpecialTaskFinishDataInfo {
 	TalentPlatformInfoSnap := SpecialTaskFinishData.Talent.TalentPlatformInfoSnap
+	TalentPersonalInfoSnap := SpecialTaskFinishData.Talent.TalentPersonalInfoSnap
 	return &http_model.SpecialTaskFinishDataInfo{
 		TaskID:           SpecialTaskFinishData.Talent.TaskId,
 		PlatformNickname: conv.MustString(gjson.Get(TalentPlatformInfoSnap, "platform_nickname"), ""),
@@ -52,6 +54,7 @@ func GetSpecialTaskFinishDataInfoStruct(SpecialTaskFinishData *http_model.Specia
 		CollectNumber:    SpecialTaskFinishData.Data.CollectNumber,
 		RealPayment:      SpecialTaskFinishData.Talent.RealPayment,
 		PhotoUrl:         SpecialTaskFinishData.Data.PhotoUrl,
+		Phone:            conv.MustString(gjson.Get(TalentPersonalInfoSnap, "talent_phone_number"), ""),
 		LinkUrl:          SpecialTaskFinishData.Link.LinkUrl,
 		SubmitAt:         SpecialTaskFinishData.Data.SubmitAt,
 	}

+ 3 - 0
pack/special_task_invite_list.go

@@ -29,6 +29,7 @@ func GormFullProjectToHttpSpecialTaskInvitePreview(projectTaskInfo *http_model.S
 		HomePageUrl:        conv.MustString(projectTaskInfo.HomePageUrl, ""),
 		TaskStatus:         conv.MustString(projectTaskInfo.TaskStatus, ""),
 		CreateDate:         createDate,
+		Phone:              projectTaskInfo.Phone,
 	}
 }
 
@@ -43,6 +44,7 @@ func YoungeeTaskInfoToSpecialTaskInviteInfo(taskAccounts []gorm_model.YoungeeTas
 
 func GetSpecialTaskInviteInfoStruct(taskAccount gorm_model.YoungeeTaskInfo) *http_model.SpecialTaskInviteInfo {
 	TalentPlatformInfoSnap := taskAccount.TalentPlatformInfoSnap
+	TalentPersonalInfoSnap := taskAccount.TalentPersonalInfoSnap
 	//fmt.Printf("任务-账户关联 %+v", taskAccount)
 	return &http_model.SpecialTaskInviteInfo{
 		TaskID:             taskAccount.TaskId,
@@ -54,5 +56,6 @@ func GetSpecialTaskInviteInfoStruct(taskAccount gorm_model.YoungeeTaskInfo) *htt
 		HomePageCaptureUrl: conv.MustString(gjson.Get(TalentPlatformInfoSnap, "home_page_capture_url"), ""),
 		FansCount:          conv.MustString(gjson.Get(TalentPlatformInfoSnap, "fans_count"), ""),
 		TaskStatus:         string(rune(taskAccount.TaskStatus)),
+		Phone:              conv.MustString(gjson.Get(TalentPersonalInfoSnap, "talent_phone_number"), ""),
 	}
 }

+ 3 - 0
pack/special_task_link_list.go

@@ -22,6 +22,7 @@ func MGormSpecialTaskLinkInfoToHttpSpecialTaskLinkPreview(SpecialTaskLinkInfo *h
 		FansCount:        conv.MustString(SpecialTaskLinkInfo.FansCount, ""),
 		PhotoUrl:         SpecialTaskLinkInfo.PhotoUrl,
 		LinkUrl:          SpecialTaskLinkInfo.LinkUrl,
+		Phone:            SpecialTaskLinkInfo.Phone,
 		ReviseOpinion:    SpecialTaskLinkInfo.ReviseOpinion,
 		Submit:           conv.MustString(SpecialTaskLinkInfo.SubmitAt, "")[0:19],
 		AgreeAt:          conv.MustString(SpecialTaskLinkInfo.AgreeAt, "")[0:19],
@@ -39,6 +40,7 @@ func SpecialTaskLinkToTaskInfo(SpecialTaskLinks []*http_model.SpecialTaskLink) [
 
 func GetSpecialTaskLinkInfoStruct(SpecialTaskLink *http_model.SpecialTaskLink) *http_model.SpecialTaskLinkInfo {
 	TalentPlatformInfoSnap := SpecialTaskLink.Talent.TalentPlatformInfoSnap
+	TalentPersonalInfoSnap := SpecialTaskLink.Talent.TalentPersonalInfoSnap
 	return &http_model.SpecialTaskLinkInfo{
 		TaskID:           SpecialTaskLink.Talent.TaskId,
 		PlatformNickname: conv.MustString(gjson.Get(TalentPlatformInfoSnap, "platform_nickname"), ""),
@@ -50,6 +52,7 @@ func GetSpecialTaskLinkInfoStruct(SpecialTaskLink *http_model.SpecialTaskLink) *
 		CreateAt:         SpecialTaskLink.Link.CreateAt,
 		SubmitAt:         SpecialTaskLink.Link.SubmitAt,
 		AgreeAt:          SpecialTaskLink.Link.AgreeAt,
+		Phone:            conv.MustString(gjson.Get(TalentPersonalInfoSnap, "talent_phone_number"), ""),
 		RejectAt:         SpecialTaskLink.Link.RejectAt,
 		IsReview:         SpecialTaskLink.Link.IsReview,
 	}

+ 3 - 0
pack/special_task_script_list.go

@@ -23,6 +23,7 @@ func MGormSpecialTaskScriptInfoToHttpSpecialTaskScriptPreview(SpecialTaskScriptI
 		Title:            SpecialTaskScriptInfo.Title,
 		Content:          SpecialTaskScriptInfo.Content,
 		ReviseOpinion:    SpecialTaskScriptInfo.ReviseOpinion,
+		Phone:            SpecialTaskScriptInfo.Phone,
 		Submit:           conv.MustString(SpecialTaskScriptInfo.SubmitAt, "")[0:19],
 		AgreeAt:          conv.MustString(SpecialTaskScriptInfo.AgreeAt, "")[0:19],
 	}
@@ -39,6 +40,7 @@ func SpecialTaskScriptToTaskInfo(SpecialTaskScripts []*http_model.SpecialTaskScr
 
 func GetSpecialTaskScriptInfoStruct(SpecialTaskScript *http_model.SpecialTaskScript) *http_model.SpecialTaskScriptInfo {
 	TalentPlatformInfoSnap := SpecialTaskScript.Talent.TalentPlatformInfoSnap
+	TalentPersonalInfoSnap := SpecialTaskScript.Talent.TalentPersonalInfoSnap
 	return &http_model.SpecialTaskScriptInfo{
 		TaskID:           SpecialTaskScript.Talent.TaskId,
 		PlatformNickname: conv.MustString(gjson.Get(TalentPlatformInfoSnap, "platform_nickname"), ""),
@@ -50,6 +52,7 @@ func GetSpecialTaskScriptInfoStruct(SpecialTaskScript *http_model.SpecialTaskScr
 		CreateAt:         SpecialTaskScript.Script.CreateAt,
 		SubmitAt:         SpecialTaskScript.Script.SubmitAt,
 		AgreeAt:          SpecialTaskScript.Script.AgreeAt,
+		Phone:            conv.MustString(gjson.Get(TalentPersonalInfoSnap, "talent_phone_number"), ""),
 		RejectAt:         SpecialTaskScript.Script.RejectAt,
 		IsReview:         SpecialTaskScript.Script.IsReview,
 	}

+ 3 - 0
pack/special_task_sketch_list.go

@@ -24,6 +24,7 @@ func MGormSpecialTaskSketchInfoToHttpSpecialTaskSketchPreview(SpecialTaskSketchI
 		Title:            SpecialTaskSketchInfo.Title,
 		Content:          SpecialTaskSketchInfo.Content,
 		ReviseOpinion:    SpecialTaskSketchInfo.ReviseOpinion,
+		Phone:            SpecialTaskSketchInfo.Phone,
 		Submit:           conv.MustString(SpecialTaskSketchInfo.SubmitAt, "")[0:19],
 		AgreeAt:          conv.MustString(SpecialTaskSketchInfo.AgreeAt, "")[0:19],
 	}
@@ -40,6 +41,7 @@ func SpecialTaskSketchToTaskInfo(SpecialTaskSketchs []*http_model.SpecialTaskSke
 
 func GetSpecialTaskSketchInfoStruct(SpecialTaskSketch *http_model.SpecialTaskSketch) *http_model.SpecialTaskSketchInfo {
 	TalentPlatformInfoSnap := SpecialTaskSketch.Talent.TalentPlatformInfoSnap
+	TalentPersonalInfoSnap := SpecialTaskSketch.Talent.TalentPersonalInfoSnap
 	return &http_model.SpecialTaskSketchInfo{
 		TaskID:           SpecialTaskSketch.Talent.TaskId,
 		PlatformNickname: conv.MustString(gjson.Get(TalentPlatformInfoSnap, "platform_nickname"), ""),
@@ -49,6 +51,7 @@ func GetSpecialTaskSketchInfoStruct(SpecialTaskSketch *http_model.SpecialTaskSke
 		Content:          SpecialTaskSketch.Sketch.Content,
 		ReviseOpinion:    SpecialTaskSketch.Sketch.ReviseOpinion,
 		CreateAt:         SpecialTaskSketch.Sketch.CreateAt,
+		Phone:            conv.MustString(gjson.Get(TalentPersonalInfoSnap, "talent_phone_number"), ""),
 		SubmitAt:         SpecialTaskSketch.Sketch.SubmitAt,
 		AgreeAt:          SpecialTaskSketch.Sketch.AgreeAt,
 		RejectAt:         SpecialTaskSketch.Sketch.RejectAt,