2 Commits 9bdef2c43a ... d7d9e547fc

Author SHA1 Message Date
  lin-jim-leon d7d9e547fc Merge remote-tracking branch 'origin/develop' into develop 1 week ago
  lin-jim-leon aac5e265f0 [20250416]subat->creatat 1 week ago
2 changed files with 10 additions and 6 deletions
  1. 7 3
      db/locallife_task.go
  2. 3 3
      db/project_task.go

+ 7 - 3
db/locallife_task.go

@@ -198,7 +198,7 @@ func GetLocallifetaskList(ctx context.Context, request http_model.GetLocalTaskLi
 				if err != nil {
 					return nil, err
 				}
-				listtime = sketchinfo.SubmitAt.Format("2006-01-02 15:04:05")
+				listtime = sketchinfo.CreateAt.Format("2006-01-02 15:04:05")
 				stageintro = "达人上传初稿时间" //
 			}
 		case 11:
@@ -213,7 +213,7 @@ func GetLocallifetaskList(ctx context.Context, request http_model.GetLocalTaskLi
 				if err != nil {
 					return nil, err
 				}
-				listtime = linkinfo.SubmitAt.Format("2006-01-02 15:04:05")
+				listtime = linkinfo.CreateAt.Format("2006-01-02 15:04:05")
 				stageintro = "达人上传链接时间"
 			}
 		case 13:
@@ -228,7 +228,11 @@ func GetLocallifetaskList(ctx context.Context, request http_model.GetLocalTaskLi
 				if err != nil {
 					return nil, err
 				}
-				listtime = datainfo.SubmitAt.Format("2006-01-02 15:04:05")
+				var auto_task_finish gorm_model.InfoAutoTask
+				db.Model(&gorm_model.InfoAutoTask{}).Where("enterprise_id = ?", request.EnterPriseId).First(&auto_task_finish)
+				// 将小时数转换为 Duration 后相加
+				resultTime := datainfo.CreateAt.Add(time.Duration(auto_task_finish.TaskFinishAuto) * time.Hour)
+				listtime = resultTime.Format("2006-01-02 15:04:05")
 				stageintro = "品牌最晚结算时间"
 			}
 		case 15:

+ 3 - 3
db/project_task.go

@@ -190,7 +190,7 @@ func GetProjecttaskList(ctx context.Context, request http_model.GetTaskListReque
 				if err != nil {
 					return nil, err
 				}
-				listtime = sketchinfo.SubmitAt.Format("2006-01-02 15:04:05")
+				listtime = sketchinfo.CreateAt.Format("2006-01-02 15:04:05")
 				stageintro = "达人上传初稿时间" //
 			}
 		case 11:
@@ -205,7 +205,7 @@ func GetProjecttaskList(ctx context.Context, request http_model.GetTaskListReque
 				if err != nil {
 					return nil, err
 				}
-				listtime = linkinfo.SubmitAt.Format("2006-01-02 15:04:05")
+				listtime = linkinfo.CreateAt.Format("2006-01-02 15:04:05")
 				stageintro = "达人上传链接时间"
 			}
 		case 13:
@@ -223,7 +223,7 @@ func GetProjecttaskList(ctx context.Context, request http_model.GetTaskListReque
 				var auto_task_finish gorm_model.InfoAutoTask
 				db.Model(&gorm_model.InfoAutoTask{}).Where("enterprise_id = ?", request.EnterPriseId).First(&auto_task_finish)
 				// 将小时数转换为 Duration 后相加
-				resultTime := datainfo.SubmitAt.Add(time.Duration(auto_task_finish.TaskFinishAuto) * time.Hour)
+				resultTime := datainfo.CreateAt.Add(time.Duration(auto_task_finish.TaskFinishAuto) * time.Hour)
 				listtime = resultTime.Format("2006-01-02 15:04:05")
 				stageintro = "品牌最晚结算时间"
 			}