|
@@ -4,8 +4,10 @@ import (
|
|
|
"context"
|
|
|
"fmt"
|
|
|
"reflect"
|
|
|
+ "strconv"
|
|
|
"youngee_b_api/model/common_model"
|
|
|
"youngee_b_api/model/gorm_model"
|
|
|
+ "youngee_b_api/model/http_model"
|
|
|
"youngee_b_api/pack"
|
|
|
"youngee_b_api/util"
|
|
|
|
|
@@ -72,7 +74,7 @@ func GetFullProjectList(ctx context.Context, enterpriseID int64, pageSize, pageN
|
|
|
return fullProjects, total, nil
|
|
|
}
|
|
|
|
|
|
-func GetProjectTaskList(ctx context.Context, projectID string, pageSize, pageNum int64, conditions *common_model.TaskConditions) ([]*gorm_model.ProjectTaskInfo, int64, error) {
|
|
|
+func GetProjectTaskList(ctx context.Context, projectID string, pageSize, pageNum int64, conditions *common_model.TaskConditions) ([]*http_model.ProjectTaskInfo, int64, error) {
|
|
|
db := GetReadDB(ctx)
|
|
|
// 查询task表信息
|
|
|
db = db.Debug().Model(gorm_model.YoungeeTaskInfo{})
|
|
@@ -147,10 +149,10 @@ func GetProjectTaskList(ctx context.Context, projectID string, pageSize, pageNum
|
|
|
for _, accountInfo := range accountInfos {
|
|
|
accountMap[accountInfo.AccountID] = accountInfo
|
|
|
}
|
|
|
- var taskAccounts []*gorm_model.TaskAccount
|
|
|
- var projectTasks []*gorm_model.ProjectTaskInfo
|
|
|
+ var taskAccounts []*http_model.TaskAccount
|
|
|
+ var projectTasks []*http_model.ProjectTaskInfo
|
|
|
for _, accountId := range accountIds {
|
|
|
- taskAccount := new(gorm_model.TaskAccount)
|
|
|
+ taskAccount := new(http_model.TaskAccount)
|
|
|
_, ok := taskMap[accountId]
|
|
|
_, ok2 := accountMap[accountId]
|
|
|
if ok && ok2 {
|
|
@@ -161,7 +163,7 @@ func GetProjectTaskList(ctx context.Context, projectID string, pageSize, pageNum
|
|
|
}
|
|
|
|
|
|
projectTasks = pack.TaskAccountToTaskInfo(taskAccounts)
|
|
|
- var fullProjectTasks []*gorm_model.ProjectTaskInfo
|
|
|
+ var fullProjectTasks []*http_model.ProjectTaskInfo
|
|
|
// 删除只存在于一个表中的元素
|
|
|
for i := 0; i < len(projectTasks); i++ {
|
|
|
if projectTasks[i].TaskID != 0 {
|
|
@@ -214,8 +216,12 @@ func GetRecruitStrategys(ctx context.Context, ProjectID int64) ([]gorm_model.Rec
|
|
|
func ChangeTaskStatus(ctx context.Context, data []string, taskStatus string) error {
|
|
|
db := GetReadDB(ctx)
|
|
|
taskInfo := gorm_model.YoungeeTaskInfo{}
|
|
|
+ taskSta, err := strconv.Atoi(taskStatus)
|
|
|
+ if err != nil {
|
|
|
+ return err
|
|
|
+ }
|
|
|
if err := db.Debug().Model(&taskInfo).Where("task_id IN ?", data).
|
|
|
- Updates(gorm_model.YoungeeTaskInfo{TaskStatus: taskStatus}).Error; err != nil {
|
|
|
+ Updates(gorm_model.YoungeeTaskInfo{TaskStatus: taskSta}).Error; err != nil {
|
|
|
|
|
|
logrus.WithContext(ctx).Errorf("[ChangeTaskStatus] error query mysql total, err:%+v", err)
|
|
|
return err
|