diff --git a/frontend/src/modules/stats/views/MonthList.vue b/frontend/src/modules/stats/views/MonthList.vue index a676c82..6f6fc55 100644 --- a/frontend/src/modules/stats/views/MonthList.vue +++ b/frontend/src/modules/stats/views/MonthList.vue @@ -51,17 +51,23 @@
- - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -71,6 +77,9 @@ + + + @@ -83,6 +92,12 @@ + + + + + + @@ -106,6 +121,18 @@ + + + + + +
LMS MMS 알림톡대체발송SMS대체발송LMS대체발송MMS
발송건수성공건수/(%) 발송건수 성공건수/(%)발송건수성공건수/(%)발송건수성공건수/(%)발송건수성공건수/(%)
{{ option.succCntR.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') }}
({{ option.succRtR }}%) 		{{ option.fbSndCntS.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') }} + {{ option.fbSuccCntS.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') }}
({{ option.succFbRtS }}%) + 		{{ option.fbSndCntL.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') }} + {{ option.fbSuccCntL.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') }}
({{ option.succFbRtL }}%) + 		{{ option.fbSndCntM.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') }} + {{ option.fbSuccCntM.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',') }}
({{ option.succFbRtM }}%) +
@@ -336,6 +363,27 @@ export default { excelData.sndCntR = this.list[i].sndCntR; excelData.succCntR = succCntR; + // 대체발송 SMS 성공 건수 + var fbSuccCntS = this.list[i].fbSuccCntS; + var succFbRtS = this.list[i].succFbRtS; + fbSuccCntS = fbSuccCntS + '(' + succFbRtS + '%)'; + excelData.fbSndCntS = this.list[i].fbSndCntS; + excelData.fbSuccCntS = fbSuccCntS; + + // 대체발송 LMS 성공 건수 + var fbSuccCntL = this.list[i].fbSuccCntL; + var succFbRtL = this.list[i].succFbRtL; + fbSuccCntL = fbSuccCntL + '(' + succFbRtL + '%)'; + excelData.fbSndCntL = this.list[i].fbSndCntL; + excelData.fbSuccCntL = fbSuccCntL; + + // 대체발송 MMS 성공 건수 + var fbSuccCntM = this.list[i].fbSuccCntM; + var succFbRtM = this.list[i].succFbRtM; + fbSuccCntM = fbSuccCntM + '(' + succFbRtM + '%)'; + excelData.fbSndCntM = this.list[i].fbSndCntM; + excelData.fbSuccCntM = fbSuccCntM; + excelList.push(excelData); } diff --git a/src/main/java/kr/co/uplus/ez/api/stats/StatsService.java b/src/main/java/kr/co/uplus/ez/api/stats/StatsService.java index 9584ac5..dbde00c 100644 --- a/src/main/java/kr/co/uplus/ez/api/stats/StatsService.java +++ b/src/main/java/kr/co/uplus/ez/api/stats/StatsService.java @@ -35,6 +35,11 @@ public class StatsService { public MonthListResDto monthList(MonthListReqDto monthListReqDto) { StatsMapper statsMapper = sqlSessionSlave.getMapper(StatsMapper.class); + //오늘 날짜 조회인지 확인 + if(DateUtils.date2strYM().equals(monthListReqDto.getEndMon())) { + monthListReqDto.setNowDiv("Y"); + } + List monthLists = statsMapper.selectMonStatList(monthListReqDto); MonthListRes monthListRes = new MonthListRes(); diff --git a/src/main/java/kr/co/uplus/ez/api/stats/dto/MonthList.java b/src/main/java/kr/co/uplus/ez/api/stats/dto/MonthList.java index 36de52c..e17fdcd 100644 --- a/src/main/java/kr/co/uplus/ez/api/stats/dto/MonthList.java +++ b/src/main/java/kr/co/uplus/ez/api/stats/dto/MonthList.java @@ -41,4 +41,22 @@ public class MonthList implements Serializable { private String succCntR; @ApiModelProperty(example = "알림톡 성공율", name = "알림톡 성공율", dataType = "String") private String succRtR; + @ApiModelProperty(example = "대체발송SMS 발송건수", name = "대체발송SMS 발송건수", dataType = "String") + private String fbSndCntS; + @ApiModelProperty(example = "대체발송SMS 성공건수", name = "대체발송SMS 성공건수", dataType = "String") + private String fbSuccCntS; + @ApiModelProperty(example = "대체발송SMS 성공율", name = "대체발송SMS 성공율", dataType = "String") + private String succFbRtS; + @ApiModelProperty(example = "대체발송LMS 발송건수", name = "대체발송LMS 발송건수", dataType = "String") + private String fbSndCntL; + @ApiModelProperty(example = "대체발송LMS 성공건수", name = "대체발송LMS 성공건수", dataType = "String") + private String fbSuccCntL; + @ApiModelProperty(example = "대체발송LMS 성공율", name = "대체발송LMS 성공율", dataType = "String") + private String succFbRtL; + @ApiModelProperty(example = "대체발송MMS 발송건수", name = "대체발송MMS 발송건수", dataType = "String") + private String fbSndCntM; + @ApiModelProperty(example = "대체발송MMS 성공건수", name = "대체발송MMS 성공건수", dataType = "String") + private String fbSuccCntM; + @ApiModelProperty(example = "대체발송MMS 성공율", name = "대체발송MMS 성공율", dataType = "String") + private String succFbRtM; } \ No newline at end of file diff --git a/src/main/java/kr/co/uplus/ez/api/stats/dto/MonthListReqDto.java b/src/main/java/kr/co/uplus/ez/api/stats/dto/MonthListReqDto.java index cebd3a5..c78d83a 100644 --- a/src/main/java/kr/co/uplus/ez/api/stats/dto/MonthListReqDto.java +++ b/src/main/java/kr/co/uplus/ez/api/stats/dto/MonthListReqDto.java @@ -22,5 +22,9 @@ public class MonthListReqDto implements Serializable { @NotNull @ApiModelProperty(example = "현재 페이지", name = "현재 페이지", dataType = "int") private int page; + + @NotNull + @ApiModelProperty(example = "당일 조회 여부", name = "당일 조회 여부", dataType = "String") + private String nowDiv = "N"; } \ No newline at end of file diff --git a/src/main/resources/mapper/mysql/stats/stats-mapper.xml b/src/main/resources/mapper/mysql/stats/stats-mapper.xml index b5131cc..813bf48 100644 --- a/src/main/resources/mapper/mysql/stats/stats-mapper.xml +++ b/src/main/resources/mapper/mysql/stats/stats-mapper.xml @@ -5,272 +5,204 @@