diff --git a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java index 75cc6be1..45a757c8 100644 --- a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java +++ b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java @@ -69,6 +69,7 @@ import itn.com.cmm.LoginVO; import itn.com.cmm.service.EgovCmmUseService; import itn.com.cmm.service.EgovFileMngService; import itn.com.cmm.service.EgovFileMngUtil; +import itn.com.cmm.service.FileVO; import itn.com.cmm.util.EgovDoubleSubmitHelper; import itn.com.cmm.util.MJUtil; import itn.com.cmm.util.RedirectUrlMaker; @@ -109,6 +110,7 @@ import itn.let.mjo.pay.service.RefundService; import itn.let.mjo.pay.service.RefundVO; import itn.let.mjo.payva.service.VacsVactService; import itn.let.mjo.payva.service.VacsVactVO; +import itn.let.mjo.reservmsg.service.MjonReservMsgService; import itn.let.org.service.LocVO; import itn.let.org.service.OrgChartManageService; import itn.let.sec.ram.service.AuthorManageVO; @@ -270,6 +272,9 @@ public class EgovUserManageController { @Resource(name = "kakaoApiService") private KakaoApiService kakaoApiService; + @Resource(name = "MjonReservMsgService") + private MjonReservMsgService mjonReservMsgService; + @Autowired KakaoApiTemplate kakaoApiTemplate; @@ -2009,6 +2014,96 @@ public class EgovUserManageController { return "cmm/uss/umt/EgovGnrlUserSelectMsgDataDetailListPop"; } + + /** + * 문자전송 상세보기 팝업화면 + * @param searchVO + * @param model + * @return "uss/ion/msg/SendMsgDetailPopAjax.do" + * @throws Exception + */ + @RequestMapping(value = {"uss/ion/msg/SendMsgDetailPopAjax.do"}) + public String SendMsgDetailPopAjax( + @ModelAttribute("searchVO") MjonMsgVO searchVO, + HttpServletRequest request , + Model model) throws Exception { + + String pattern = (String) request.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE) ; + String reserveType = searchVO.getReserveType(); + + MjonMsgVO mjonMsgVO = new MjonMsgVO(); + if(null != searchVO.getUserData() && !"".equals(searchVO.getUserData())) { //수정 + mjonMsgVO = mjonMsgService.selectMjonMsgVO(searchVO); + + //문자 상세보기 이미지 아이디 받아오기 + String atchFileId1 =""; + String atchFileId2 =""; + String atchFileId3 =""; + + String path1 = mjonMsgVO.getFilePath1(); + String path2 = mjonMsgVO.getFilePath2(); + String path3 = mjonMsgVO.getFilePath3(); + + FileVO fileVO1 = new FileVO(); + FileVO fileVO2 = new FileVO(); + FileVO fileVO3 = new FileVO(); + + if(StringUtil.isNotEmpty(path1)) { + + //파일경로 및 이름을 이용하여 atchFileId, fileExtsn 번호 받아오기 + fileVO1 = getFilePathToAtchFileId(path1); + model.addAttribute("fileVO1", fileVO1); + } + + if(StringUtil.isNotEmpty(path2)) { + + //파일경로 및 이름을 이용하여 atchFileId, fileExtsn 번호 받아오기 + fileVO2 = getFilePathToAtchFileId(path2); + model.addAttribute("fileVO2", fileVO2); + } + + if(StringUtil.isNotEmpty(path3)) { + + //파일경로 및 이름을 이용하여 atchFileId, fileExtsn 번호 받아오기 + fileVO3 = getFilePathToAtchFileId(path3); + model.addAttribute("fileVO3", fileVO3); + } + } + + if(request.getHeader("REFERER").contains("ReceiveNumberList") ) { //수신번호 조회에서 넘김 + mjonMsgVO.setBeforeUrl("ReceiveNumberList"); + } + if(pattern.equals("/uss/ion/msg/CampaignMsgModify.do")) { //사용자 발신 + searchVO.setSearchCampaignYn("Y"); + } + + + mjonMsgVO.setReserveType(reserveType); + model.addAttribute("mjonMsgVO", mjonMsgVO); + return "/cmm/uss/umt/EgovGnrlUserSelectMsgDataDetailPop"; + } + + //파일 이름을 이용하여 첨부파일 아이디(atchFileId), 첨부파일 순번(fileExtsn)을 찾는 함수 + public FileVO getFilePathToAtchFileId(String filePath) throws Exception{ + + //마지막 / 의 인덱스 값 +1을 기준으로 문자열을 짤라줌 + String strFilePath = filePath.substring(filePath.lastIndexOf("/")+1); + + FileVO returnFileVO = new FileVO(); + + //파일 이름과 확장자를 분리해줌 + String[] arrFileNm = strFilePath.split("\\."); + String fileNm = arrFileNm[0]; + String fileExtsn = arrFileNm[1]; + + FileVO fileVO = new FileVO(); + fileVO.setStreFileNm(fileNm); + fileVO.setFileExtsn(fileExtsn); + returnFileVO = mjonReservMsgService.selectFileNmToAtchFileIdInfo(fileVO); + + return returnFileVO; + + } /** * @Method Name : EgovGnrlselectedUserKakaoDataListAjax 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 ccb3ec76..5a382ae1 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 @@ -1458,7 +1458,8 @@ MRC.RESULT_CODE_TXT AS resultCodeTxt, /** 문자 결과 코드 정보*/ MRC.RESULT_CODE AS resultCode, /** 문자 결과 코드 정보*/ MRC.RESULT_CODE2 AS resultCode2, /** 문자 결과 코드 정보*/ - MGD.MSG_KIND AS msgKind /** 문자 종류 -일반, 광고, 선거문자*/ + MGD.MSG_KIND AS msgKind, /** 문자 종류 -일반, 광고, 선거문자*/ + MGD.MSG_GROUP_ID AS msgGroupId FROM MJ_MSG_DATA A LEFT JOIN MJ_MSG_GROUP_DATA MGD ON A.MSG_GROUP_ID = MGD.MSG_GROUP_ID diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectMsgDataDetailListPop.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectMsgDataDetailListPop.jsp index 7ef93746..7d2ad24f 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectMsgDataDetailListPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectMsgDataDetailListPop.jsp @@ -1,14 +1,14 @@ <%-- - Class Name : EgovGnrlUserSelectMsgDataListPop.jsp - Description : 사용자 문자전송리스트(전체) + Class Name : EgovGnrlUserSelectMsgDataDetailListPop.jsp + Description : 사용자 문자전송 상세 리스트 팝업 화면 Modification Information 수정일 수정자 수정내용 ------- -------- --------------------------- - 2022.07.01 우영두 최초 생성 + 2024.09.24 우영두 최초 생성 author : 우영두 - since : 2022.07.01 + since : 2024.09.24 Copyright (C) 2009 by MOPAS All right reserved. --%> @@ -88,17 +88,10 @@ function fn_delete(){ } } -/* 수정 화면*/ -function fn_modify(msgId){ +/* 상세 화면*/ +function fn_modify(userData){ var frm = document.modiForm ; - frm.msgId.value = msgId ; - //frm.submit(); -} - -/* 수정 화면*/ -function fn_detail_list(msgGroupId){ - var frm = document.modiForm ; - frm.msgGroupId.value = msgGroupId ; + frm.userData.value = userData ; frm.submit(); } @@ -380,11 +373,10 @@ function goList(){ -
+ + + + + diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectMsgDataListPop.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectMsgDataListPop.jsp index a66ffe5b..a66fa1f4 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectMsgDataListPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectMsgDataListPop.jsp @@ -757,7 +757,6 @@ function fnGoMsgGroupList(msgGroupId){ -