Merge pull request '260713_01_ENH: 평가 파일 업로드 시 regUser를 지정 가능하게 수정' (#8) from develop into master

Reviewed-on: #8
This commit is contained in:
2026-07-13 12:13:18 +09:00
5 changed files with 11 additions and 6 deletions

View File

@@ -124,7 +124,7 @@ public class AssignController {
ctx.getUserId(), ctx.getUserId(),
now, now,
ctx.getClientIp(), ctx.getClientIp(),
UploadContentDto.from(file) UploadContentDto.from(file, ctx.getUserId())
); );
return result; return result;
} }

View File

@@ -89,7 +89,7 @@ public class PerformanceController {
ExcelUploadResultDto result = performanceService.createPerformancesFromExcel(file, regId, now); ExcelUploadResultDto result = performanceService.createPerformancesFromExcel(file, regId, now);
systemEventLogService.writeUploadPerformanceLog(regId, now, clientIp, UploadContentDto.from(file)); systemEventLogService.writeUploadPerformanceLog(regId, now, clientIp, UploadContentDto.from(file, regId));
return result; return result;
} }

View File

@@ -65,18 +65,21 @@ public class ReviewController {
public PerformanceReviewDto uploadReviewFile( public PerformanceReviewDto uploadReviewFile(
@PathVariable Integer performanceId, @PathVariable Integer performanceId,
@PathVariable Integer reviewType, @PathVariable Integer reviewType,
@RequestParam(required = false) String paramUserId,
@RequestParam("file") MultipartFile file, @RequestParam("file") MultipartFile file,
RequestUserContext ctx RequestUserContext ctx
) { ) {
LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
PerformanceReviewDto result = reviewService.uploadReviewFile(performanceId, reviewType, file, ctx.getUserId(), now); String userId = paramUserId != null ? paramUserId : ctx.getUserId();
PerformanceReviewDto result = reviewService.uploadReviewFile(performanceId, reviewType, file, userId, now);
systemEventLogService.writeUploadReviewFileLog( systemEventLogService.writeUploadReviewFileLog(
ctx.getUserId(), ctx.getUserId(),
now, now,
ctx.getClientIp(), ctx.getClientIp(),
performanceId, performanceId,
reviewType, reviewType,
UploadContentDto.from(file) UploadContentDto.from(file, userId)
); );
return result; return result;
} }

View File

@@ -86,7 +86,7 @@ public class UserController {
ExcelUploadResultDto result = userService.createUsersFromExcel(userRole, file, regId, now); ExcelUploadResultDto result = userService.createUsersFromExcel(userRole, file, regId, now);
systemEventLogService.writeUploadUserLog(regId, now, clientIp, UploadContentDto.from(file)); systemEventLogService.writeUploadUserLog(regId, now, clientIp, UploadContentDto.from(file, regId));
return result; return result;
} }

View File

@@ -16,12 +16,14 @@ public class UploadContentDto {
String fileName; String fileName;
String fileType; String fileType;
Long fileSize; Long fileSize;
String uploadUserId;
public static UploadContentDto from(MultipartFile file){ public static UploadContentDto from(MultipartFile file, String uploadUserId){
return UploadContentDto.builder() return UploadContentDto.builder()
.fileName(file.getOriginalFilename()) .fileName(file.getOriginalFilename())
.fileType(file.getContentType()) .fileType(file.getContentType())
.fileSize(file.getSize()) .fileSize(file.getSize())
.uploadUserId(uploadUserId)
.build(); .build();
} }
} }