Commit @adf07d9a131a583e5fae441990cdd0e271631424

rosewiper 2023-12-07

요금 사용내역 사용내역 및 거래명세서 건수 오류 수정

@adf07d9a131a583e5fae441990cdd0e271631424

ff31b44

adf07d9

src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java

--- src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java

+++ src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java

...	...	@@ -192,6 +192,12 @@
192	192	private int mmsGroupFWCntSum; // mms 실패대기(건)
193	193	private int mmsTotFWPriceSum; // mms 실패대기(금액)
194	194
	195	+ private int shtSendCount;
	196	+ private int longSendCount;
	197	+ private int pictSendCount;
	198	+ private int atSendCount;
	199	+ private int ftSendCount;
	200	+
195	201	private String searchDelayMsgYn;
196	202
197	203	public String getSearchDelayMsgYn() {
...	...	@@ -1559,4 +1565,34 @@
1559	1565	public void setAtSmishingYn(String atSmishingYn) {
1560	1566	this.atSmishingYn = atSmishingYn;
1561	1567	}
	1568	+ public int getShtSendCount() {
	1569	+ return shtSendCount;
	1570	+ }
	1571	+ public void setShtSendCount(int shtSendCount) {
	1572	+ this.shtSendCount = shtSendCount;
	1573	+ }
	1574	+ public int getLongSendCount() {
	1575	+ return longSendCount;
	1576	+ }
	1577	+ public void setLongSendCount(int longSendCount) {
	1578	+ this.longSendCount = longSendCount;
	1579	+ }
	1580	+ public int getPictSendCount() {
	1581	+ return pictSendCount;
	1582	+ }
	1583	+ public void setPictSendCount(int pictSendCount) {
	1584	+ this.pictSendCount = pictSendCount;
	1585	+ }
	1586	+ public int getAtSendCount() {
	1587	+ return atSendCount;
	1588	+ }
	1589	+ public void setAtSendCount(int atSendCount) {
	1590	+ this.atSendCount = atSendCount;
	1591	+ }
	1592	+ public int getFtSendCount() {
	1593	+ return ftSendCount;
	1594	+ }
	1595	+ public void setFtSendCount(int ftSendCount) {
	1596	+ this.ftSendCount = ftSendCount;
	1597	+ }
1562	1598	}

ff31b44

adf07d9

src/main/java/itn/let/mjo/pay/web/MjonPayController.java

--- src/main/java/itn/let/mjo/pay/web/MjonPayController.java

+++ src/main/java/itn/let/mjo/pay/web/MjonPayController.java


     	SimpleDateFormat transFormat = new SimpleDateFormat("yyyy-MM-dd");
 		List<MjonMsgVO> 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());
 			}

     	SimpleDateFormat transFormat = new SimpleDateFormat("yyyy-MM-dd");
 		List<MjonMsgVO> 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();

ff31b44

adf07d9

src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml

--- src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml


 			, 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

ff31b44

adf07d9

src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintStatementPopUp.jsp

--- src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintStatementPopUp.jsp

+++ src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintStatementPopUp.jsp


 		                            	<tr>
 		                            		<td>${result.msgTypeName}</td>
 		                            		<td>
-			                            		<fmt:formatNumber type="number" maxFractionDigits="3" value="${result.sendCount}" var="sendCount" />
-												<c:out value="${sendCount}"/>		                            		
+		                            			<c:choose>
+		                            				<c:when test="${result.msgTypeName eq '단문(SMS)'}">
+		                            					<fmt:formatNumber type="number" maxFractionDigits="3" value="${result.shtSendCount}" var="shtSendCount" />
+														<c:out value="${shtSendCount}"/>
+		                            				</c:when>
+		                            				<c:when test="${result.msgTypeName eq '장문(LMS)'}">
+		                            					<fmt:formatNumber type="number" maxFractionDigits="3" value="${result.longSendCount}" var="longSendCount" />
+														<c:out value="${longSendCount}"/>
+		                            				</c:when>
+		                            				<c:when test="${result.msgTypeName eq '그림(MMS)'}">
+		                            					<fmt:formatNumber type="number" maxFractionDigits="3" value="${result.pictSendCount}" var="pictSendCount" />
+														<c:out value="${pictSendCount}"/>
+		                            				</c:when>
+		                            				<c:when test="${result.msgTypeName eq '알림톡'}">
+		                            					<fmt:formatNumber type="number" maxFractionDigits="3" value="${result.atSendCount}" var="atSendCount" />
+														<c:out value="${atSendCount}"/>
+		                            				</c:when>
+		                            				<c:otherwise>
+		                            					<fmt:formatNumber type="number" maxFractionDigits="3" value="${result.ftSendCount}" var="ftSendCount" />
+														<c:out value="${ftSendCount}"/>
+		                            				</c:otherwise>
+		                            			</c:choose>
+			                            		<%-- <fmt:formatNumber type="number" maxFractionDigits="3" value="${result.sendCount}" var="sendCount" />
+												<c:out value="${sendCount}"/>	 --%>	                            		
 		                            		</td>
 		                            		<td>
 			                            		<fmt:formatNumber type="number" maxFractionDigits="3" value="${result.supplyPrice}" var="supplyPrice" />

ff31b44

adf07d9

src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp

--- src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp

+++ src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp


 		                            	<tr>
 		                            		<td>${result.msgTypeName}</td>
 		                            		<td>
-		                            			<fmt:formatNumber type="number" maxFractionDigits="3" value="${result.sendCount}" var="sendCount" />
-												<c:out value="${sendCount}"/>
+		                            			<c:choose>
+		                            				<c:when test="${result.msgTypeName eq '단문(SMS)'}">
+		                            					<fmt:formatNumber type="number" maxFractionDigits="3" value="${result.shtSendCount}" var="shtSendCount" />
+														<c:out value="${shtSendCount}"/>
+		                            				</c:when>
+		                            				<c:when test="${result.msgTypeName eq '장문(LMS)'}">
+		                            					<fmt:formatNumber type="number" maxFractionDigits="3" value="${result.longSendCount}" var="longSendCount" />
+														<c:out value="${longSendCount}"/>
+		                            				</c:when>
+		                            				<c:when test="${result.msgTypeName eq '그림(MMS)'}">
+		                            					<fmt:formatNumber type="number" maxFractionDigits="3" value="${result.pictSendCount}" var="pictSendCount" />
+														<c:out value="${pictSendCount}"/>
+		                            				</c:when>
+		                            				<c:when test="${result.msgTypeName eq '알림톡'}">
+		                            					<fmt:formatNumber type="number" maxFractionDigits="3" value="${result.atSendCount}" var="atSendCount" />
+														<c:out value="${atSendCount}"/>
+		                            				</c:when>
+		                            				<c:otherwise>
+		                            					<fmt:formatNumber type="number" maxFractionDigits="3" value="${result.ftSendCount}" var="ftSendCount" />
+														<c:out value="${ftSendCount}"/>
+		                            				</c:otherwise>
+		                            			</c:choose>
+		                            			<%-- <fmt:formatNumber type="number" maxFractionDigits="3" value="${result.sendCount}" var="sendCount" />
+												<c:out value="${sendCount}"/> --%>
 		                            		</td>
 		                            		<td>
 		                            			<fmt:formatNumber type="number" maxFractionDigits="3" value="${result.supplyPrice}" var="supplyPrice" />

Add a comment

Open 0
Closed 0

List

...	...	@@ -4292,13 +4292,13 @@
4292	4292	SimpleDateFormat transFormat = new SimpleDateFormat("yyyy-MM-dd");
4293	4293	List<MjonMsgVO> payUserSumList = mjonMsgDataService.selectPayUserSumList(mjonMsgVO);
4294	4294	for(MjonMsgVO item : payUserSumList) {
4295		- sendSumCount += item.getSendCount();
	4295	+ sendSumCount = sendSumCount + (item.getShtSendCount() + item.getLongSendCount() + item.getPictSendCount() + item.getAtSendCount() + item.getFtSendCount());
4296	4296	supplySumPrice += item.getSupplyPrice();
4297	4297	vatSumPrice += item.getVatPrice();
4298	4298	totalSumPrice += item.getTotalPrice();
4299	4299
4300	4300	// 시작일, 종료일
4301		- if (i == 0) {
	4301	+ if (i == 0) {
4302	4302	minRegDate = transFormat.parse(item.getMinRegDate());
4303	4303	maxRegDate = transFormat.parse(item.getMaxRegDate());
4304	4304	}
...	...	@@ -4528,7 +4528,7 @@
4528	4528	SimpleDateFormat transFormat = new SimpleDateFormat("yyyy-MM-dd");
4529	4529	List<MjonMsgVO> payUserSumList = mjonMsgDataService.selectPayUserSumList(mjonMsgVO);
4530	4530	for(MjonMsgVO item : payUserSumList) {
4531		- sendSumCount += item.getSendCount();
	4531	+ sendSumCount = sendSumCount + (item.getShtSendCount() + item.getLongSendCount() + item.getPictSendCount() + item.getAtSendCount() + item.getFtSendCount());
4532	4532	supplySumPrice += item.getSupplyPrice();
4533	4533	vatSumPrice += item.getVatPrice();
4534	4534	totalSumPrice += item.getTotalPrice();

...	...	@@ -3306,6 +3306,11 @@
3306	3306	, MIN(DATE_FORMAT(M.REGDATE, '%Y-%m-%d' )) AS minRegDate
3307	3307	, M.msgTypeName
3308	3308	, M.orderByCode
	3309	+ , SUM(IF(M.msgTypeName = '단문(SMS)', 1, 0)) AS shtSendCount
	3310	+ , SUM(IF(M.msgTypeName = '장문(LMS)', 1, 0)) AS longSendCount
	3311	+ , SUM(IF(M.msgTypeName = '그림(MMS)', 1, 0)) AS pictSendCount
	3312	+ , SUM(IF(M.msgTypeName = '알림톡', 1, 0)) AS atSendCount
	3313	+ , SUM(IF(M.msgTypeName = '친구톡', 1, 0)) AS ftSendCount
3309	3314	, SUM(M.MSG_GROUP_CNT) AS sendCount
3310	3315	, ifnull(ROUND(SUM(M.EACH_PRICE) , 2), 0) AS supplyPrice
3311	3316	, 0 AS vatPrice

...	...	@@ -113,8 +113,30 @@
113	113	<tr>
114	114	<td>${result.msgTypeName}</td>
115	115	<td>
116		- <fmt:formatNumber type="number" maxFractionDigits="3" value="${result.sendCount}" var="sendCount" />
117		- <c:out value="${sendCount}"/>
	116	+ <c:choose>
	117	+ <c:when test="${result.msgTypeName eq '단문(SMS)'}">
	118	+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${result.shtSendCount}" var="shtSendCount" />
	119	+ <c:out value="${shtSendCount}"/>
	120	+ </c:when>
	121	+ <c:when test="${result.msgTypeName eq '장문(LMS)'}">
	122	+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${result.longSendCount}" var="longSendCount" />
	123	+ <c:out value="${longSendCount}"/>
	124	+ </c:when>
	125	+ <c:when test="${result.msgTypeName eq '그림(MMS)'}">
	126	+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${result.pictSendCount}" var="pictSendCount" />
	127	+ <c:out value="${pictSendCount}"/>
	128	+ </c:when>
	129	+ <c:when test="${result.msgTypeName eq '알림톡'}">
	130	+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${result.atSendCount}" var="atSendCount" />
	131	+ <c:out value="${atSendCount}"/>
	132	+ </c:when>
	133	+ <c:otherwise>
	134	+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${result.ftSendCount}" var="ftSendCount" />
	135	+ <c:out value="${ftSendCount}"/>
	136	+ </c:otherwise>
	137	+ </c:choose>
	138	+ <%-- <fmt:formatNumber type="number" maxFractionDigits="3" value="${result.sendCount}" var="sendCount" />
	139	+ <c:out value="${sendCount}"/> --%>
118	140	</td>
119	141	<td>
120	142	<fmt:formatNumber type="number" maxFractionDigits="3" value="${result.supplyPrice}" var="supplyPrice" />

...	...	@@ -155,8 +155,30 @@
155	155	<tr>
156	156	<td>${result.msgTypeName}</td>
157	157	<td>
158		- <fmt:formatNumber type="number" maxFractionDigits="3" value="${result.sendCount}" var="sendCount" />
159		- <c:out value="${sendCount}"/>
	158	+ <c:choose>
	159	+ <c:when test="${result.msgTypeName eq '단문(SMS)'}">
	160	+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${result.shtSendCount}" var="shtSendCount" />
	161	+ <c:out value="${shtSendCount}"/>
	162	+ </c:when>
	163	+ <c:when test="${result.msgTypeName eq '장문(LMS)'}">
	164	+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${result.longSendCount}" var="longSendCount" />
	165	+ <c:out value="${longSendCount}"/>
	166	+ </c:when>
	167	+ <c:when test="${result.msgTypeName eq '그림(MMS)'}">
	168	+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${result.pictSendCount}" var="pictSendCount" />
	169	+ <c:out value="${pictSendCount}"/>
	170	+ </c:when>
	171	+ <c:when test="${result.msgTypeName eq '알림톡'}">
	172	+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${result.atSendCount}" var="atSendCount" />
	173	+ <c:out value="${atSendCount}"/>
	174	+ </c:when>
	175	+ <c:otherwise>
	176	+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${result.ftSendCount}" var="ftSendCount" />
	177	+ <c:out value="${ftSendCount}"/>
	178	+ </c:otherwise>
	179	+ </c:choose>
	180	+ <%-- <fmt:formatNumber type="number" maxFractionDigits="3" value="${result.sendCount}" var="sendCount" />
	181	+ <c:out value="${sendCount}"/> --%>
160	182	</td>
161	183	<td>
162	184	<fmt:formatNumber type="number" maxFractionDigits="3" value="${result.supplyPrice}" var="supplyPrice" />

Delete comment