Browse Source

[20250409]初稿记录

lin-jim-leon 1 week ago
parent
commit
a9839992d2
1 changed files with 9 additions and 3 deletions
  1. 9 3
      service/sketch.go

+ 9 - 3
service/sketch.go

@@ -191,7 +191,7 @@ func (*sketch) GetSketchInfo(ctx context.Context, request http_model.GetSketchIn
 		Content:        SketchInfo.Content,
 		Content:        SketchInfo.Content,
 		SketchPhotos:   SketchPhotos,
 		SketchPhotos:   SketchPhotos,
 		Agreeat:        SketchInfo.AgreeAt.Format("2006-01-02 15:04:05"),
 		Agreeat:        SketchInfo.AgreeAt.Format("2006-01-02 15:04:05"),
-		Submitat:       SketchInfo.SubmitAt.Format("2006-01-02 15:04:05"),
+		Submitat:       SketchInfo.CreateAt.Format("2006-01-02 15:04:05"),
 		ReverseOpinion: SketchInfo.ReviseOpinion,
 		ReverseOpinion: SketchInfo.ReviseOpinion,
 	}
 	}
 	return &SketchInfoData, nil
 	return &SketchInfoData, nil
@@ -219,12 +219,18 @@ func (*sketch) GetSketchRecordList(ctx context.Context, request http_model.GetSk
 			}
 			}
 			SketchPhotos = append(SketchPhotos, sketchPhoto)
 			SketchPhotos = append(SketchPhotos, sketchPhoto)
 		}
 		}
+		var reviewat string
+		if sketchinfo.IsOk == 0 {
+			reviewat = sketchinfo.RejectAt.Format("2006-01-02 15:04:05")
+		} else {
+			reviewat = sketchinfo.AgreeAt.Format("2006-01-02 15:04:05")
+		}
 		SketchInfoData := http_model.GetSketchInfoData{
 		SketchInfoData := http_model.GetSketchInfoData{
 			Title:          sketchinfo.Title,
 			Title:          sketchinfo.Title,
 			Content:        sketchinfo.Content,
 			Content:        sketchinfo.Content,
 			SketchPhotos:   SketchPhotos,
 			SketchPhotos:   SketchPhotos,
-			Agreeat:        sketchinfo.AgreeAt.Format("2006-01-02 15:04:05"),
-			Submitat:       sketchinfo.SubmitAt.Format("2006-01-02 15:04:05"),
+			Agreeat:        reviewat,
+			Submitat:       sketchinfo.CreateAt.Format("2006-01-02 15:04:05"),
 			ReverseOpinion: sketchinfo.ReviseOpinion,
 			ReverseOpinion: sketchinfo.ReviseOpinion,
 		}
 		}
 		data = append(data, SketchInfoData)
 		data = append(data, SketchInfoData)