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 0e93135..d73c3b4 100644 --- a/src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java +++ b/src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java @@ -313,5 +313,7 @@ public class MjonMsgVO extends ComDefaultVO{ private String detailType; private List mjonMsgSendVOList = new ArrayList<>(); + + private String rsltCodeMsgTxt; //전송사 결과 코드 내용 } diff --git a/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java b/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java index daf5e48..b628be3 100644 --- a/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java +++ b/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java @@ -3171,7 +3171,8 @@ public class MjonMsgController { if(j==4) cell.setCellValue(((MjonMsgVO)resultList.get(i)).getSentDateTxt()); //전송시간 if(j==5) cell.setCellValue(((MjonMsgVO)resultList.get(i)).getSmsTxt()); //문자내용 if(j==6) cell.setCellValue(((MjonMsgVO)resultList.get(i)).getCurStateTxt()); //현재상태 - if(j==7) cell.setCellValue(((MjonMsgVO)resultList.get(i)).getRsltCode() + "/" + ((MjonMsgVO)resultList.get(i)).getRsltCode2()); //처리결과 + //if(j==7) cell.setCellValue(((MjonMsgVO)resultList.get(i)).getRsltCode() + "/" + ((MjonMsgVO)resultList.get(i)).getRsltCode2()); //처리결과 + if(j==7) cell.setCellValue("(" + ((MjonMsgVO)resultList.get(i)).getRsltCode() + ") " + ((MjonMsgVO)resultList.get(i)).getRsltCodeMsgTxt()); //처리결과 코드 내용 if(j==8) cell.setCellValue(((MjonMsgVO)resultList.get(i)).getMsgTypeTxt()); //메시지타입 if(j==9) cell.setCellValue(((MjonMsgVO)resultList.get(i)).getConectMthdTxt()); //접속기기 if(j==10) cell.setCellValue(((MjonMsgVO)resultList.get(i)).getAgentCodeTxt()); //전송사 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 4108019..3b60eeb 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 @@ -1187,6 +1187,13 @@ , M.rsltCode , M.rsltCode2 , M.rsltNet + , IFNULL( + (SELECT RESULT_CODE_TXT + FROM MJ_MSG_RESULT_CODE + WHERE AGENT_CODE = M.agentCode + AND RESULT_CODE = m.rsltCode + ), + '결과코드 내용이 없습니다.') AS rsltCodeMsgTxt , M.callTo , M.callFrom , M.smsTxt diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgDetailList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgDetailList.jsp index b4ac83b..07ea3a5 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgDetailList.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgDetailList.jsp @@ -42,6 +42,7 @@ function fn_search(){ function linkPage(pageNo){ var listForm = document.listForm ; listForm.pageIndex.value = pageNo ; + listForm.action = ""; listForm.submit(); }