From 76da6c8d577b3301fb6b61bffc1df6171e059da7 Mon Sep 17 00:00:00 2001 From: kubo8 Date: Fri, 23 Dec 2022 12:55:04 +0900 Subject: [PATCH] =?UTF-8?q?=EB=82=A0=EC=A7=9C=EB=B3=84=20=ED=86=B5?= =?UTF-8?q?=EA=B3=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stats/service/mock/dayExcelHeader.json | 39 ++ frontend/src/modules/stats/views/DayList.vue | 70 ++- .../co/uplus/ez/api/stats/StatsService.java | 7 +- .../kr/co/uplus/ez/api/stats/dto/DayList.java | 18 + .../uplus/ez/api/stats/dto/DayListReqDto.java | 3 + .../mapper/mysql/stats/stats-mapper.xml | 473 ++++++++---------- 6 files changed, 331 insertions(+), 279 deletions(-) diff --git a/frontend/src/modules/stats/service/mock/dayExcelHeader.json b/frontend/src/modules/stats/service/mock/dayExcelHeader.json index 1452b28..534fbc2 100644 --- a/frontend/src/modules/stats/service/mock/dayExcelHeader.json +++ b/frontend/src/modules/stats/service/mock/dayExcelHeader.json @@ -27,6 +27,18 @@ { "name": "알림톡", "colspan": 2 + }, + { + "name": "대체발송SMS", + "colspan": 2 + }, + { + "name": "대체발송LMS", + "colspan": 2 + }, + { + "name": "대체발송MMS", + "colspan": 2 } ], [ @@ -74,6 +86,33 @@ { "key": "succCntR", "name": "성공건수" + }, + { + "key": "fbSndCntS", + "name": "발송건수", + "format": "Format_00" + }, + { + "key": "fbSuccCntS", + "name": "성공건수/(%)" + }, + { + "key": "fbSndCntL", + "name": "발송건수", + "format": "Format_00" + }, + { + "key": "fbSuccCntL", + "name": "성공건수/(%)" + }, + { + "key": "fbSndCntM", + "name": "발송건수", + "format": "Format_00" + }, + { + "key": "fbSuccCntM", + "name": "성공건수/(%)" } ] ] diff --git a/frontend/src/modules/stats/views/DayList.vue b/frontend/src/modules/stats/views/DayList.vue index e777890..47b448f 100644 --- a/frontend/src/modules/stats/views/DayList.vue +++ b/frontend/src/modules/stats/views/DayList.vue @@ -47,17 +47,23 @@
- - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -67,6 +73,9 @@ + + + @@ -79,6 +88,12 @@ + + + + + + @@ -102,6 +117,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 }}%) +
@@ -306,6 +333,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 dbde00c..7e3eb20 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 @@ -93,7 +93,12 @@ public class StatsService { */ public DayListResDto dayList(DayListReqDto dayListReqDto) { StatsMapper statsMapper = sqlSessionSlave.getMapper(StatsMapper.class); - + + //오늘 날짜 조회인지 확인 + if(DateUtils.date2strYMD().equals(dayListReqDto.getEndDay())) { + dayListReqDto.setNowDiv("Y"); + } + List dayLists = statsMapper.selectDayStatList(dayListReqDto); DayListRes dayListRes = new DayListRes(); diff --git a/src/main/java/kr/co/uplus/ez/api/stats/dto/DayList.java b/src/main/java/kr/co/uplus/ez/api/stats/dto/DayList.java index 077b57c..124712c 100644 --- a/src/main/java/kr/co/uplus/ez/api/stats/dto/DayList.java +++ b/src/main/java/kr/co/uplus/ez/api/stats/dto/DayList.java @@ -41,4 +41,22 @@ public class DayList 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/DayListReqDto.java b/src/main/java/kr/co/uplus/ez/api/stats/dto/DayListReqDto.java index ffc8bce..e91a8e5 100644 --- a/src/main/java/kr/co/uplus/ez/api/stats/dto/DayListReqDto.java +++ b/src/main/java/kr/co/uplus/ez/api/stats/dto/DayListReqDto.java @@ -14,6 +14,9 @@ public class DayListReqDto implements Serializable { private String startDay; @ApiModelProperty(example = "조회종료일", name = "조회종료일",dataType = "String") private String endDay; + + @ApiModelProperty(example = "당일 조회 여부", name = "당일 조회 여부", dataType = "String") + private String nowDiv = "N"; // @NotNull // @ApiModelProperty(example = "페이지당 조회할 목록 수", name = "페이지당 조회할 목록 수", dataType = "String") diff --git a/src/main/resources/mapper/mysql/stats/stats-mapper.xml b/src/main/resources/mapper/mysql/stats/stats-mapper.xml index 813bf48..ddd8e1d 100644 --- a/src/main/resources/mapper/mysql/stats/stats-mapper.xml +++ b/src/main/resources/mapper/mysql/stats/stats-mapper.xml @@ -43,7 +43,8 @@ CASE WHEN RPLCSND_CH_CD = 'MMS' THEN IFNULL(FBACK_CNT, 0) ELSE 0 END AS fbSndCntM, CASE WHEN RPLCSND_CH_CD = 'MMS' THEN IFNULL(FBACK_SUCC_CNT, 0) ELSE 0 END AS fbSuccCntM FROM - hubez_common.EZ_CUST_MSTAT + hubez_common.EZ_CUST_MSTAT ewm INNER JOIN + hubez_common.EZ_SVC_USER esu ON ewm.USER_SEQ = esu.USER_SEQ WHERE SUM_YM BETWEEN STR_TO_DATE(CONCAT(#{startMon},'01'),'%Y%m%d') AND STR_TO_DATE(CONCAT(#{endMon},'01'),'%Y%m%d') AND BIZRNO != '1234567890' @@ -135,7 +136,8 @@ CASE WHEN RPLCSND_CH_CD = 'MMS' THEN IFNULL(FBACK_CNT, 0) ELSE 0 END AS fbSndCntM, CASE WHEN RPLCSND_CH_CD = 'MMS' THEN IFNULL(FBACK_SUCC_CNT, 0) ELSE 0 END AS fbSuccCntM FROM - hubez_common.EZ_CUST_MSTAT + hubez_common.EZ_CUST_MSTAT ewm INNER JOIN + hubez_common.EZ_SVC_USER esu ON ewm.USER_SEQ = esu.USER_SEQ WHERE SUM_YM BETWEEN STR_TO_DATE(CONCAT(#{startMon},'01'),'%Y%m%d') AND STR_TO_DATE(CONCAT(#{endMon},'01'),'%Y%m%d') AND BIZRNO != '1234567890' @@ -208,271 +210,208 @@