From fd43fce572d4156a2d4b0b7fabbd87e483e1cf66 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Mon, 13 Jul 2026 09:44:57 +0900 Subject: [PATCH] =?UTF-8?q?260713=5F01=5FENH:=20=EB=B0=9C=EC=86=A1=20?= =?UTF-8?q?=EA=B2=B0=EA=B3=BC=EC=97=90=20result=20code=EC=97=90=20?= =?UTF-8?q?=EB=8C=80=ED=95=9C=20label=20=EB=A7=A4=EC=B9=AD=ED=95=B4?= =?UTF-8?q?=EC=84=9C=20=EB=B0=98=ED=99=98=ED=95=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95,=20bulksend=EC=97=90=20=EB=8C=80=ED=95=9C=20?= =?UTF-8?q?=EA=B2=B0=EA=B3=BC=20=EC=A1=B0=ED=9A=8C=EB=8F=84=20=ED=86=B5?= =?UTF-8?q?=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/controller/ReportController.java | 3 +- .../server/dto/report/SendResultInfoDto.java | 34 +++++++++++++++++++ .../notihub/server/service/ReportService.java | 9 ++--- 3 files changed, 40 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/kri/notihub/server/controller/ReportController.java b/src/main/java/com/kri/notihub/server/controller/ReportController.java index 38a8114..d07b340 100644 --- a/src/main/java/com/kri/notihub/server/controller/ReportController.java +++ b/src/main/java/com/kri/notihub/server/controller/ReportController.java @@ -8,7 +8,6 @@ import com.kri.notihub.server.common.enums.ChannelType; import com.kri.notihub.server.common.enums.SendType; import com.kri.notihub.server.dto.report.BulkSendInfoDto; import com.kri.notihub.server.dto.report.ReportExcelResponseDto; -import com.kri.notihub.server.dto.report.SendInfoDto; import com.kri.notihub.server.dto.report.SendResultCodeDto; import com.kri.notihub.server.dto.report.SendResultInfoDto; import com.kri.notihub.server.dto.report.SendResultSummaryRequestDto; @@ -67,7 +66,7 @@ public class ReportController { @Operation(summary = "대량발송 결과 조회") @PostMapping("/bulk-detail/{bulkSendKey}") - public PageResponseDto getBulkSendDetail( + public PageResponseDto getBulkSendDetail( @PathVariable String bulkSendKey, @Valid @RequestBody PageRequestDto pageReq ) { diff --git a/src/main/java/com/kri/notihub/server/dto/report/SendResultInfoDto.java b/src/main/java/com/kri/notihub/server/dto/report/SendResultInfoDto.java index 2670fd3..c7b076f 100644 --- a/src/main/java/com/kri/notihub/server/dto/report/SendResultInfoDto.java +++ b/src/main/java/com/kri/notihub/server/dto/report/SendResultInfoDto.java @@ -1,11 +1,14 @@ package com.kri.notihub.server.dto.report; import com.kri.notihub.server.persistence.entity.TSendEntity; +import com.kri.notihub.server.persistence.entity.TSendResultCodeEntity; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import java.time.LocalDateTime; +import java.util.List; +import java.util.Objects; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -41,6 +44,14 @@ public class SendResultInfoDto { @Schema(description = "결과 코드") private Short resultCode; + @Size(max = 128) + @Schema(description = "결과 라벨") + private String resultLabel; + + @Size(max = 128) + @Schema(description = "결과 표시 라벨") + private String resultViewLabel; + @Schema(description = "템플릿 인덱스") private Long tmplatIdx; @@ -91,16 +102,25 @@ public class SendResultInfoDto { private LocalDateTime regDt; public static SendResultInfoDto from(TSendEntity entity) { + return from(entity, null); + } + + public static SendResultInfoDto from(TSendEntity entity, + List resultCodeEntity) { if (entity == null) { return null; } + TSendResultCodeEntity resultCode = findResultCode(entity, resultCodeEntity); + return SendResultInfoDto.builder() .cmid(entity.getCmid()) .bulkSendKey(entity.getBulkSendKey()) .sendTy(entity.getSendTy()) .resve(entity.isResve()) .resultCode(entity.getResultCode()) + .resultLabel(resultCode != null ? resultCode.getResultLabel() : null) + .resultViewLabel(resultCode != null ? resultCode.getResultViewLabel() : null) .tmplatIdx(entity.getTmplatIdx()) .kkoTmplatCd(entity.getKkoTmplatCd()) .sendEml(entity.getSendEml()) @@ -115,4 +135,18 @@ public class SendResultInfoDto { .regDt(entity.getRegDt()) .build(); } + + private static TSendResultCodeEntity findResultCode(TSendEntity entity, + List resultCodeEntity) { + if (resultCodeEntity == null) { + return null; + } + + return resultCodeEntity.stream() + .filter(e -> e.getId() != null) + .filter(e -> Objects.equals(e.getId().getSendCorp(), entity.getSendCorp())) + .filter(e -> Objects.equals(e.getId().getResultCode(), entity.getResultCode())) + .findFirst() + .orElse(null); + } } diff --git a/src/main/java/com/kri/notihub/server/service/ReportService.java b/src/main/java/com/kri/notihub/server/service/ReportService.java index be891ac..3148b82 100644 --- a/src/main/java/com/kri/notihub/server/service/ReportService.java +++ b/src/main/java/com/kri/notihub/server/service/ReportService.java @@ -63,6 +63,7 @@ public class ReportService { public List getSendResultList(String sid, String prjctCd, String reqstSvc, ChannelType channelTy) { List sendTyList = getSendTypeCodeList(channelTy); + List resultCodeList = sendResultCodeRepository.findAll(); List sendList = sendTyList == null ? sendRepository.findBySidAndPrjctCdAndReqstSvcOrderBySendDtDescSendIdxDesc( @@ -72,7 +73,7 @@ public class ReportService { return sendList .stream() - .map(SendResultInfoDto::from) + .map(entity -> SendResultInfoDto.from(entity, resultCodeList)) .toList(); } @@ -91,13 +92,13 @@ public class ReportService { } } - public PageResponseDto getBulkSendDetail(String bulkSendKey, + public PageResponseDto getBulkSendDetail(String bulkSendKey, PageRequestDto pageReq) { List resultCodeList = sendResultCodeRepository.findAll(); Pageable pageable = Pageables.of(pageReq, TSendEntity.class); - Page page = sendRepository.findByBulkSendKey(bulkSendKey, pageable) - .map(entity -> SendInfoDto.from(entity, resultCodeList)); + Page page = sendRepository.findByBulkSendKey(bulkSendKey, pageable) + .map(entity -> SendResultInfoDto.from(entity, resultCodeList)); return PageResponseDto.from(page); }