2 次代码提交 1db64b84cf ... 9375cf80bb

作者 SHA1 备注 提交日期
  lin-jim-leon 9375cf80bb Merge remote-tracking branch 'origin/develop' into develop 1 周之前
  lin-jim-leon 8ceffec7b9 [20250413]settleflag 1 周之前
共有 2 个文件被更改,包括 8 次插入7 次删除
  1. 3 3
      db/locallife_task.go
  2. 5 4
      db/project_task.go

+ 3 - 3
db/locallife_task.go

@@ -870,7 +870,7 @@ func GetLocalSketchList(ctx context.Context, request http_model.LocalTasksketchl
 		response := &http_model.LocalTasksketchinfo{
 			Task:       taskinfo,
 			SketchId:   sketchinfo.SketchID,
-			SubmitAt:   sketchinfo.SubmitAt.Format("2006-01-02 15:04:05"),
+			SubmitAt:   sketchinfo.CreateAt.Format("2006-01-02 15:04:05"),
 			AgreeAt:    sketchinfo.AgreeAt.Format("2006-01-02 15:04:05"),
 			SketchType: sketchinfo.Type,
 			Operator:   boperator,
@@ -1106,7 +1106,7 @@ func GetLocalLinkList(ctx context.Context, request http_model.LocalTaskLinklistR
 		response := &http_model.LocalTaskLinkinfo{
 			Task:     taskinfo,
 			LinkId:   linkinfo.LinkID,
-			SubmitAt: linkinfo.SubmitAt.Format("2006-01-02 15:04:05"),
+			SubmitAt: linkinfo.CreateAt.Format("2006-01-02 15:04:05"),
 			AgreeAt:  linkinfo.AgreeAt.Format("2006-01-02 15:04:05"),
 			LinkUrl:  linkinfo.LinkUrl,
 			PhotoUrl: linkinfo.PhotoUrl,
@@ -1341,7 +1341,7 @@ func GetLocalDataList(ctx context.Context, request http_model.LocalTaskDatalistR
 		response := &http_model.LocalTaskDatainfo{
 			Task:          taskinfo,
 			DataId:        datainfo.DataID,
-			SubmitAt:      datainfo.SubmitAt.Format("2006-01-02 15:04:05"),
+			SubmitAt:      datainfo.CreateAt.Format("2006-01-02 15:04:05"),
 			AgreeAt:       datainfo.AgreeAt.Format("2006-01-02 15:04:05"),
 			PhotoUrl:      datainfo.PhotoUrl,
 			PlayNumber:    datainfo.PlayNumber,

+ 5 - 4
db/project_task.go

@@ -573,7 +573,7 @@ func RefuseproTaskCoop(ctx context.Context, taskIds []string, operatorid string,
 
 	var tasks []gorm_model.YoungeeTaskInfo
 	err = db.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id IN ? AND task_stage = 1", taskIds).Find(&tasks).Error
-
+	fmt.Println(taskIds, talentIds)
 	err = db.Transaction(func(tx *gorm.DB) error {
 		// 2. 修改任务状态和任务阶段
 		for _, taskInfo := range tasks {
@@ -821,7 +821,7 @@ func GetSketchList(ctx context.Context, request http_model.TasksketchlistRequest
 		response := &http_model.Tasksketchinfo{
 			Task:       taskinfo,
 			SketchId:   sketchinfo.SketchID,
-			SubmitAt:   sketchinfo.SubmitAt.Format("2006-01-02 15:04:05"),
+			SubmitAt:   sketchinfo.CreateAt.Format("2006-01-02 15:04:05"),
 			AgreeAt:    sketchinfo.AgreeAt.Format("2006-01-02 15:04:05"),
 			SketchType: sketchinfo.Type,
 			Operator:   boperator,
@@ -1055,7 +1055,7 @@ func GetLinkList(ctx context.Context, request http_model.TaskLinklistRequest) (*
 		response := &http_model.TaskLinkinfo{
 			Task:     taskinfo,
 			LinkId:   linkinfo.LinkID,
-			SubmitAt: linkinfo.SubmitAt.Format("2006-01-02 15:04:05"),
+			SubmitAt: linkinfo.CreateAt.Format("2006-01-02 15:04:05"),
 			AgreeAt:  linkinfo.AgreeAt.Format("2006-01-02 15:04:05"),
 			LinkUrl:  linkinfo.LinkUrl,
 			PhotoUrl: linkinfo.PhotoUrl,
@@ -1190,6 +1190,7 @@ func GetDataList(ctx context.Context, request http_model.TaskDatalistRequest) (*
 		query = query.Where("talent_name LIKE ? OR s_operate_name LIKE ?", "%"+request.Others+"%", "%"+request.Others+"%")
 	}
 	// 计算总数
+	fmt.Println(projecrtaskinfo)
 	var total int64
 	if err := query.Count(&total).Error; err != nil {
 		return nil, err
@@ -1288,7 +1289,7 @@ func GetDataList(ctx context.Context, request http_model.TaskDatalistRequest) (*
 		response := &http_model.TaskDatainfo{
 			Task:          taskinfo,
 			DataId:        datainfo.DataID,
-			SubmitAt:      datainfo.SubmitAt.Format("2006-01-02 15:04:05"),
+			SubmitAt:      datainfo.CreateAt.Format("2006-01-02 15:04:05"),
 			AgreeAt:       datainfo.AgreeAt.Format("2006-01-02 15:04:05"),
 			PhotoUrl:      datainfo.PhotoUrl,
 			PlayNumber:    datainfo.PlayNumber,