From be8286da2b562162dcd2801f75de205993a3ea70 Mon Sep 17 00:00:00 2001
From: rosewiper <rosehips@naver.com>
Date: Mon, 2 Sep 2024 17:20:18 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B0=9C=EC=86=A1=EA=B2=B0=EA=B3=BC=20?=
 =?UTF-8?q?=EC=97=91=EC=85=80=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=20?=
 =?UTF-8?q?=EC=A0=95=EB=A0=AC=20=EB=B0=8F=20=EC=84=B1=EA=B3=B5,=20?=
 =?UTF-8?q?=EC=8B=A4=ED=8C=A8=20=EC=B9=B4=EC=9A=B4=ED=8A=B8=20=EC=98=A4?=
 =?UTF-8?q?=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

---
 .../mjo/msgsent/service/MjonMsgSentVO.java    | 15 +++++++++++++
 .../msgsent/web/MjonMsgSentController.java    | 21 ++++++++++++++++---
 .../sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml  |  4 ++++
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java
index ece24751..93b00b18 100644
--- a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java
+++ b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java
@@ -84,6 +84,9 @@ public class MjonMsgSentVO extends UserDefaultVO{
 	private String msgSentType;
 	private String successCount;
 	
+	private String resultSValue;
+	private String resultWFValue;
+	
 	public String getSuccessCount() {
 		return successCount;
 	}
@@ -458,5 +461,17 @@ public class MjonMsgSentVO extends UserDefaultVO{
 	public void setSendKind(String sendKind) {
 		this.sendKind = sendKind;
 	}
+	public String getResultSValue() {
+		return resultSValue;
+	}
+	public void setResultSValue(String resultSValue) {
+		this.resultSValue = resultSValue;
+	}
+	public String getResultWFValue() {
+		return resultWFValue;
+	}
+	public void setResultWFValue(String resultWFValue) {
+		this.resultWFValue = resultWFValue;
+	}
 	
 }
diff --git a/src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java b/src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java
index e615bec6..e0a1667f 100644
--- a/src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java
+++ b/src/main/java/itn/let/mjo/msgsent/web/MjonMsgSentController.java
@@ -1280,7 +1280,7 @@ private static final Logger logger = LoggerFactory.getLogger(MjonMsgSentControll
 					cell.setCellStyle(style);
 					
 					cell = row.createCell(10);
-					cell.setCellValue("실패");
+					cell.setCellValue("실패/대기");
 					cell.setCellStyle(style);
 					
 					cell = row.createCell(11);
@@ -1380,11 +1380,26 @@ private static final Logger logger = LoggerFactory.getLogger(MjonMsgSentControll
 						
 						
 						double eachPrice = Float.parseFloat(resultAllSentList.get(i).getEachPrice());
+						int resultSValue = 0;
+						int resultWFValue = 0;
+						
+						if(resultAllSentList.get(i).getResultSValue() != null) {
+							resultSValue = Integer.parseInt(resultAllSentList.get(i).getResultSValue());
+						}else {
+							resultSValue = 1;
+						}
+						
+						if(resultAllSentList.get(i).getResultWFValue() != null) {
+							resultWFValue = Integer.parseInt(resultAllSentList.get(i).getResultWFValue());
+						}else {
+							resultWFValue = 1;
+						}
+						
 						
 						if("S".equals(resultAllSentList.get(i).getMsgResult())) {
-							resSucCnt = 1;
+							resSucCnt = resultSValue;
 						} else {
-							resFailCnt = 1;
+							resFailCnt = resultWFValue;
 						}
 							
 						resSucPrice = eachPrice * resSucCnt;
diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
index b556d4d1..c4f5bfcd 100644
--- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
@@ -256,6 +256,8 @@
 			, M2.msgResult
 			, M2.sendKind
 			, M2.msgKind
+			, M2.resultSValue
+			, M2.resultWFValue
 		FROM
 			(		
 			SELECT
@@ -297,6 +299,8 @@
 				, msgTypeName					 AS msgTypeName
 				, orderByCode					 AS orderByCode
 				, RESULT						 AS msgResult
+				, SUM(IF(RESULT = 'S', 1, 0 ))	 AS resultSValue
+                , SUM(IF(RESULT = 'W' OR RESULT = 'F', 1, 0 ))	AS resultWFValue
 				, sendKind						 AS sendKind
 				, MSG_KIND						 AS msgKind
 			FROM