Merge branch 'Be/Report' into 'backend'
Be/report See merge request s11-webmobile1-sub2/S11P12A701!125
This commit is contained in:
commit
e0438c7a7a
@ -40,9 +40,11 @@ public class Board {
|
||||
@Column(nullable = true)
|
||||
private int viewCount;
|
||||
|
||||
@Column(columnDefinition = "TIMESTAMP")
|
||||
@CreatedDate
|
||||
LocalDateTime createdAt;
|
||||
|
||||
@Column(columnDefinition = "TIMESTAMP")
|
||||
@LastModifiedDate
|
||||
LocalDateTime modifiedAt;
|
||||
|
||||
|
@ -9,6 +9,8 @@ import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
import org.springframework.data.annotation.CreatedDate;
|
||||
import org.springframework.data.annotation.LastModifiedDate;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@ -26,10 +28,12 @@ public class Comment {
|
||||
@Column(columnDefinition = "TEXT", nullable = false)
|
||||
private String content;
|
||||
|
||||
@Column
|
||||
@Column(columnDefinition = "TIMESTAMP")
|
||||
@CreatedDate
|
||||
private LocalDateTime createdAt;
|
||||
|
||||
@Column
|
||||
@Column(columnDefinition = "TIMESTAMP")
|
||||
@LastModifiedDate
|
||||
private LocalDateTime modifiedAt;
|
||||
|
||||
@ManyToOne
|
||||
|
@ -64,9 +64,6 @@ public class ReportController {
|
||||
return new ResponseEntity<>(detailReport, HttpStatus.OK);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@GetMapping("/teacher/reportSet/{lectureId}")
|
||||
public ResponseEntity<List<ReportSetResponse>> searchReportSets(@PathVariable("lectureId") long lectureId){
|
||||
List<ReportSetResponse> reportSetResponses = reportService.findReportSets(lectureId);
|
||||
|
@ -1,14 +1,14 @@
|
||||
package com.edufocus.edufocus.report.entity.dto;
|
||||
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.*;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.UUID;
|
||||
|
||||
@Builder
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class ReportSetResponse {
|
||||
|
@ -30,6 +30,7 @@ public class Report {
|
||||
|
||||
private int correctCount;
|
||||
|
||||
@Column(columnDefinition = "TIMESTAMP")
|
||||
@CreatedDate
|
||||
private LocalDateTime testAt;
|
||||
|
||||
|
@ -34,6 +34,7 @@ public class ReportSet {
|
||||
)
|
||||
private UUID id;
|
||||
|
||||
@Column(columnDefinition = "TIMESTAMP")
|
||||
@CreatedDate
|
||||
private LocalDateTime createAt;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user