Bladeren bron

添加任务状态

yuliang1112 2 jaren geleden
bovenliggende
commit
544019331c
4 gewijzigde bestanden met toevoegingen van 6 en 1 verwijderingen
  1. 2 1
      db/project.go
  2. 1 0
      model/gorm_model/project_task_list.go
  3. 1 0
      model/http_model/project_taskList.go
  4. 2 0
      pack/project_task_list.go

+ 2 - 1
db/project.go

@@ -105,8 +105,8 @@ func GetProjectTaskList(ctx context.Context, projectID string, pageSize, pageNum
 		logrus.WithContext(ctx).Errorf("[GetProjectTaskList] error query mysql total, err:%+v", err)
 		return nil, 0, err
 	}
-	// 查询账号id
 
+	// 查询账号id
 	var accountIds []int
 	taskMap := make(map[int]gorm_model.YoungeeTaskInfo)
 	for _, taskInfo := range taskInfos {
@@ -150,6 +150,7 @@ func GetProjectTaskList(ctx context.Context, projectID string, pageSize, pageNum
 		}
 		taskAccounts = append(taskAccounts, taskAccount)
 	}
+
 	projectTasks = pack.TaskAccountToTaskInfo(taskAccounts)
 	// 删除只存在于一个表中的元素
 	for i := 0; i < len(projectTasks); i++ {

+ 1 - 0
model/gorm_model/project_task_list.go

@@ -44,6 +44,7 @@ type ProjectTaskInfo struct {
 	StrategyID             int       `json:"strategy_id"`               // 报名选择的招募策略id
 	TaskReward             int64     `json:"task_reward"`               // 任务奖励金额
 	HomePageUrl            string    `json:"home_page_url"`             // 主页链接
+	TaskStatus             string    `json:"task_status"`               // 任务状态 1待选 2已选 3落选
 	CreateDate             time.Time `json:"create_date"`               // 创建时间
 }
 

+ 1 - 0
model/http_model/project_taskList.go

@@ -18,6 +18,7 @@ type ProjectTaskPreview struct {
 	StrategyId             string `json:"strategy_id"`               // 报名选择的招募策略id
 	TaskReward             string `json:"task_reward"`               // 任务奖励金额
 	HomePageCaptureUrl     string `json:"home_page_capture_url"`     // 主页链接
+	TaskStatus             string `json:"task_status"`               // 任务状态
 	CreateDate             string `json:"create_date"`               // 创建时间
 }
 

+ 2 - 0
pack/project_task_list.go

@@ -27,6 +27,7 @@ func GormFullProjectToHttpProjectTaskPreview(projectTaskInfo *gorm_model.Project
 		StrategyId:             conv.MustString(projectTaskInfo.StrategyID),
 		TaskReward:             conv.MustString(projectTaskInfo.TaskReward),
 		HomePageCaptureUrl:     conv.MustString(projectTaskInfo.HomePageUrl),
+		TaskStatus:             conv.MustString(projectTaskInfo.TaskStatus),
 		CreateDate:             createDate,
 	}
 }
@@ -49,6 +50,7 @@ func GetTaskInfoStruct(taskAccount *gorm_model.TaskAccount) *gorm_model.ProjectT
 		HomePageUrl:            taskAccount.Account.HomePageCaptureUrl,
 		TalentPersonalInfoSnap: taskAccount.Task.TalentPersonalInfoSnap,
 		FansCount:              taskAccount.Account.FansCount,
+		TaskStatus:             taskAccount.Task.TaskStatus,
 		StrategyID:             taskAccount.Task.StrategyID,
 	}
 }