From 03da959c4f6a76d363ce8b36d1e6fccac9a2d977 Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Mon, 10 Feb 2025 17:39:55 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B0=9C=EC=86=A1=EA=B2=B0=EA=B3=BC=20?= =?UTF-8?q?=EC=86=8D=EB=8F=84=EA=B3=84=EC=86=8D=20=EC=98=A4=EB=A5=98?= =?UTF-8?q?=EC=82=AC=ED=95=AD=20=EC=A7=84=ED=96=89=EC=A4=91=204891?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mjo/msgsent/service/MjonMsgSentVO.java | 1 + .../service/impl/MjonMsgSentServiceImpl.java | 31 +++++++++++++------ .../sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml | 1 + .../jsp/web/msgsent/MsgSentAllListAjax.jsp | 21 +++++++++---- 4 files changed, 38 insertions(+), 16 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 4d6571ea..af114ee2 100644 --- a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java +++ b/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; //발신번호 diff --git a/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java b/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java index bbc5f3f1..ced8202c 100644 --- a/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java +++ b/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java @@ -132,16 +132,6 @@ public class MjonMsgSentServiceImpl extends EgovAbstractServiceImpl implements // 목록 List 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); @@ -154,6 +144,27 @@ public class MjonMsgSentServiceImpl extends EgovAbstractServiceImpl implements t.setStatusCd(code); }); + + 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"); + } + }); + + // 총 카운트 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 75b48484..e2e0bfeb 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 @@ -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 , ( diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp index 68fff760..dd839b70 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp @@ -8,6 +8,7 @@