From adf07d9a131a583e5fae441990cdd0e271631424 Mon Sep 17 00:00:00 2001 From: rosewiper Date: Thu, 7 Dec 2023 18:41:20 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9A=94=EA=B8=88=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=EB=82=B4=EC=97=AD=20=EC=82=AC=EC=9A=A9=EB=82=B4=EC=97=AD=20?= =?UTF-8?q?=EB=B0=8F=20=EA=B1=B0=EB=9E=98=EB=AA=85=EC=84=B8=EC=84=9C=20?= =?UTF-8?q?=EA=B1=B4=EC=88=98=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itn/let/mjo/msg/service/MjonMsgVO.java | 36 +++++++++++++++++++ .../let/mjo/pay/web/MjonPayController.java | 6 ++-- .../sqlmap/let/msg/MjonMsgData_SQL_mysql.xml | 5 +++ .../jsp/web/pay/MsgPrintStatementPopUp.jsp | 26 ++++++++++++-- .../jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp | 26 ++++++++++++-- 5 files changed, 92 insertions(+), 7 deletions(-) diff --git a/src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java b/src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java index 78d114b9..d2c31e04 100644 --- a/src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java +++ b/src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java @@ -192,6 +192,12 @@ public class MjonMsgVO extends ComDefaultVO{ private int mmsGroupFWCntSum; // mms 실패대기(건) private int mmsTotFWPriceSum; // mms 실패대기(금액) + private int shtSendCount; + private int longSendCount; + private int pictSendCount; + private int atSendCount; + private int ftSendCount; + private String searchDelayMsgYn; public String getSearchDelayMsgYn() { @@ -1559,4 +1565,34 @@ public class MjonMsgVO extends ComDefaultVO{ public void setAtSmishingYn(String atSmishingYn) { this.atSmishingYn = atSmishingYn; } + public int getShtSendCount() { + return shtSendCount; + } + public void setShtSendCount(int shtSendCount) { + this.shtSendCount = shtSendCount; + } + public int getLongSendCount() { + return longSendCount; + } + public void setLongSendCount(int longSendCount) { + this.longSendCount = longSendCount; + } + public int getPictSendCount() { + return pictSendCount; + } + public void setPictSendCount(int pictSendCount) { + this.pictSendCount = pictSendCount; + } + public int getAtSendCount() { + return atSendCount; + } + public void setAtSendCount(int atSendCount) { + this.atSendCount = atSendCount; + } + public int getFtSendCount() { + return ftSendCount; + } + public void setFtSendCount(int ftSendCount) { + this.ftSendCount = ftSendCount; + } } diff --git a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java index 46ebdacf..55d5f1c5 100644 --- a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java +++ b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java @@ -4292,13 +4292,13 @@ public class MjonPayController { SimpleDateFormat transFormat = new SimpleDateFormat("yyyy-MM-dd"); List payUserSumList = mjonMsgDataService.selectPayUserSumList(mjonMsgVO); for(MjonMsgVO item : payUserSumList) { - sendSumCount += item.getSendCount(); + sendSumCount = sendSumCount + (item.getShtSendCount() + item.getLongSendCount() + item.getPictSendCount() + item.getAtSendCount() + item.getFtSendCount()); supplySumPrice += item.getSupplyPrice(); vatSumPrice += item.getVatPrice(); totalSumPrice += item.getTotalPrice(); // 시작일, 종료일 - if (i == 0) { + if (i == 0) { minRegDate = transFormat.parse(item.getMinRegDate()); maxRegDate = transFormat.parse(item.getMaxRegDate()); } @@ -4528,7 +4528,7 @@ public class MjonPayController { SimpleDateFormat transFormat = new SimpleDateFormat("yyyy-MM-dd"); List payUserSumList = mjonMsgDataService.selectPayUserSumList(mjonMsgVO); for(MjonMsgVO item : payUserSumList) { - sendSumCount += item.getSendCount(); + sendSumCount = sendSumCount + (item.getShtSendCount() + item.getLongSendCount() + item.getPictSendCount() + item.getAtSendCount() + item.getFtSendCount()); supplySumPrice += item.getSupplyPrice(); vatSumPrice += item.getVatPrice(); totalSumPrice += item.getTotalPrice(); diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml index 6512f3bb..974c6425 100644 --- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml @@ -3306,6 +3306,11 @@ , MIN(DATE_FORMAT(M.REGDATE, '%Y-%m-%d' )) AS minRegDate , M.msgTypeName , M.orderByCode + , SUM(IF(M.msgTypeName = '단문(SMS)', 1, 0)) AS shtSendCount + , SUM(IF(M.msgTypeName = '장문(LMS)', 1, 0)) AS longSendCount + , SUM(IF(M.msgTypeName = '그림(MMS)', 1, 0)) AS pictSendCount + , SUM(IF(M.msgTypeName = '알림톡', 1, 0)) AS atSendCount + , SUM(IF(M.msgTypeName = '친구톡', 1, 0)) AS ftSendCount , SUM(M.MSG_GROUP_CNT) AS sendCount , ifnull(ROUND(SUM(M.EACH_PRICE) , 2), 0) AS supplyPrice , 0 AS vatPrice diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintStatementPopUp.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintStatementPopUp.jsp index 323874bd..168bd867 100644 --- a/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintStatementPopUp.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintStatementPopUp.jsp @@ -155,8 +155,30 @@ function f_print(){ ${result.msgTypeName} - - + + + + + + + + + + + + + + + + + + + + + + + <%-- + --%> diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp index 5403726a..e6e00c3d 100644 --- a/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp @@ -113,8 +113,30 @@ function f_print(){ ${result.msgTypeName} - - + + + + + + + + + + + + + + + + + + + + + + + <%-- + --%>