발송결과 속도계속 오류사항 진행중 4891

src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java

@@ -26,6 +26,7 @@ public class MjonMsgSentVO extends UserDefaultVO{
 	private List msgGroupIdList;	//문자 그룹아이디 리스트
 	private String smsTxt;			//문자 내용
 	private String subject;			//문자 제목
+	private String subjectChkYn;			//문자 제목
 	private Date regdate;			//문자 등록일자
 	private Date reqdate;			//문자 예약 발송 일자
 	private String callFrom;		//발신번호

src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java

@@ -132,16 +132,6 @@ public class MjonMsgSentServiceImpl  extends EgovAbstractServiceImpl implements
 		// 목록
 		List<MjonMsgSentVO> resultList = mjonMsgSentDAO.selectAllMsgSentList_advc(mjonMsgSentVO);
 
-		// 내용이 없고 이미지만 있을 경우
-		resultList.stream().forEach(t->{
-			log.info("+ t.getMsgKind() : [{}]",t.getMsgType());
-			if("6".equals(t.getMsgType()) 
-					&& StringUtils.isEmpty(t.getSmsTxt())
-					&& !"0".equals(t.getFileCnt()) 
-					) {
-				t.setSmsTxt("이미지");
-			}
-		});
 
 		// groupID에 대한 결과건수(대기, 성공 실패) 분할건수를 가져옴
 		resultList = makeDetailFunction(resultList);
@@ -155,6 +145,27 @@ public class MjonMsgSentServiceImpl  extends EgovAbstractServiceImpl implements
 		});
 
 
+		resultList.stream().forEach(t->{
+
+			// 내용이 없고 이미지만 있을 경우
+			// 내용에 "이미지"표시
+			if("6".equals(t.getMsgType()) 
+					&& StringUtils.isEmpty(t.getSmsTxt())
+					&& !"0".equals(t.getFileCnt()) 
+					) {
+				t.setSmsTxt("이미지");
+			}
+			
+			// 예약 취소일 시 대기건도 0으로 표시
+			if( t.getReserveCYn().equals(("Y")) ) {
+				t.setResultSValue("0");
+				t.setResultFValue("0");
+				t.setResultWValue("0");
+			}
+		});
+		
+		
+		
 		
 		// 총 카운트
 		int totalCnt = mjonMsgSentDAO.countAllMsgSentList(mjonMsgSentVO);

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

@@ -428,6 +428,7 @@
 			, B.MSG_GROUP_CNT as msgGroupCnt
 			, B.SMS_TXT as smsTxt
 			, B.SUBJECT as subject
+			, B.SUBJECT_CHK_YN as subjectChkYn
 			, DATE_FORMAT(B.REGDATE, '%Y-%m-%d %T') AS regdate
 			, DATE_FORMAT(B.REQ_DATE, '%Y-%m-%d %T') AS reqDate
 			, (

src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp

@@ -8,6 +8,7 @@
 <script src="/publish/js/content.js"></script>
 <script src="/publish/js/popupLayer.js"></script>
 <script type="text/javascript">
+/* 문자 발송결과 리스트 advc*/
 $(document).ready(function(){
 // 	var searchStartDate = '${searchStartDate}';
 // 	console.log('searchStartDate : ', searchStartDate);
@@ -245,6 +246,7 @@ function fnReservCancel(msgGroupId){
 									</c:when>
 									<c:otherwise>
 										<p><fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${result.reqdate}" /></p>
+										
 									</c:otherwise>
 								</c:choose>
 							</td>
@@ -273,21 +275,28 @@ function fnReservCancel(msgGroupId){
 										</c:if>
 									</c:if>
 									<a href="#none" onclick="fn_sentDetailView('${result.msgGroupId}')">
+										<c:choose>
+											<c:when test="${result.subjectChkYn eq 'Y' }">
+												<c:out value="${result.subject }" />
+											</c:when>
+											<c:otherwise>
 												<c:out value="${result.smsTxt}" />
+											</c:otherwise>
+										</c:choose>
 									</a>
 								</div>
 							</td>
 							<td>
-								<p><c:out value="${result.msgGroupCnt}"/> </p>
+								<p><fmt:formatNumber value="${result.msgGroupCnt}" type="number" groupingUsed="true" /> </p>
 							</td>
 							<td>
-								<p><c:out value="${result.resultWValue}"/> </p>
+								<p><fmt:formatNumber value="${result.resultWValue}" type="number" groupingUsed="true" /> </p>
 							</td>
 							<td>
-								<p class="c_002c9a"><c:out value="${result.resultSValue}"/> </p>
+								<p class="c_002c9a"><fmt:formatNumber value="${result.resultSValue}" type="number" groupingUsed="true" /> </p>
 							</td>
 							<td>
-								<p class="c_e40000"><c:out value="${result.resultFValue}"/> </p>
+								<p class="c_e40000"><fmt:formatNumber value="${result.resultFValue}" type="number" groupingUsed="true" /> </p>
 							</td>
 							<td>
 								<c:out value="${result.totPrice}"/>