diff --git a/src/main/java/kcc/let/schdlr/service/web/AnotaionSchedule.java b/src/main/java/kcc/let/schdlr/service/web/AnotaionSchedule.java index bcd213ee..be8c3229 100644 --- a/src/main/java/kcc/let/schdlr/service/web/AnotaionSchedule.java +++ b/src/main/java/kcc/let/schdlr/service/web/AnotaionSchedule.java @@ -200,6 +200,18 @@ public class AnotaionSchedule { vEPrcsDetailVO.setLctrDivCd(lctrDivCd); vEPrcsDetailVO.setDiffDay(diffDay); + if("10".equals(lctrDivCd)) { //청소년 + vEPrcsDetailVO.setSndFlag("C"); + }else if("20".equals(lctrDivCd)) { //성인 + vEPrcsDetailVO.setSndFlag("S"); + }else if("30".equals(lctrDivCd)) { //체험교실 + vEPrcsDetailVO.setSndFlag("G"); + }else if("40".equals(lctrDivCd)) { //기반강화 + vEPrcsDetailVO.setSndFlag("A"); + }else { //기소유예 + vEPrcsDetailVO.setSndFlag("B"); + } + List VEEduAplctVOList = vEPrcsAplctPrdService.selectOneDayBeforeTrainingStartDate(vEPrcsDetailVO); for(VEPrcsDetailVO vo : VEEduAplctVOList) { @@ -224,7 +236,7 @@ public class AnotaionSchedule { // 테스트 String phone = "01083584250"; - Map resultMap = sendSMS.VeSendSMS(phone, vEEduAplctVO.getSndCn()); + Map resultMap = sendSMS.VeSendSMS(phone, vEEduAplctVO.getSndCn(), vEEduAplctVO.getSndFlag()); //문자 발송 성공 시 로그 diff --git a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngVO.java b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngVO.java index 64e38ff8..882049b5 100644 --- a/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngVO.java +++ b/src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngVO.java @@ -227,6 +227,10 @@ public class VEAStngVO extends ComDefaultVO implements Serializable { private String atchFileId; + /** + * 자주사용하는 sms 문구 + */ + private String smsCn; @@ -1044,5 +1048,11 @@ public class VEAStngVO extends ComDefaultVO implements Serializable { public void setAtchFileId(String atchFileId) { this.atchFileId = atchFileId; } + public String getSmsCn() { + return smsCn; + } + public void setSmsCn(String smsCn) { + this.smsCn = smsCn; + } } diff --git a/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java b/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java index 57e8254e..fb67ec59 100644 --- a/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java +++ b/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java @@ -1015,4 +1015,69 @@ public class CrownixAjaxController { return modelAndView; } + + /** + * 청소년 결과보고 출력 + * + */ + @RequestMapping("/ve/aplct/tngrVisitEdu/eduAplct/tngrRsltRprtListAjax.do") + public ModelAndView tngrRsltRprtListAjax( + VEEduAplctVO vEEduAplctVO + , ModelMap model + , HttpServletRequest request + ) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + System.out.println(" vEInstrDetailVO.getRsltlist().toString() :: "+vEEduAplctVO.getRsltList().toString()); + List vEEduAplctVOList = vEEduMIXService.selectTngrRsltRprtList(vEEduAplctVO); + //복호화 + vEEduAplctVOList = egovCryptoUtil.decryptVEEduAplctVOList(vEEduAplctVOList); + + JSONArray jsReqInfo = new JSONArray(); //신청인 정보 + + /*for (int i=0;i VeSendSMS(String receiver, String msg) throws Exception { + public Map VeSendSMS(String receiver, String msg, String sndFlag) throws Exception { String result = ""; Map resultMap = new HashMap<>(); @@ -92,7 +92,22 @@ public class VeSendSMS { sms.put("msg", msg); // 메세지 내용 sms.put("receiver", receiver); // 수신번호 //sms.put("destination", "01111111111|담당자,01111111112|홍길동"); // 수신인 %고객명% 치환 - sms.put("sender", "055-792-0233"); // 발신번호 + + /*24.01.18 메뉴별 발신번호 처리ㅏ*/ + String sender = "055-792-0233"; + if("C".equals(sndFlag)) { // 청소년 + sender = "055-792-0233"; + }else if("S".equals(sndFlag)) { //성인 + sender = "02-2669-0083"; + }else if("G".equals(sndFlag)) { //체험교실 + sender = "055-792-0234"; + }else if("A".equals(sndFlag)) { //기반강화 + sender = "02-2669-0082"; + }else if("B".equals(sndFlag)) { // 기소유예 + sender = "055-792-0223"; + } + + sms.put("sender", sender); // 발신번호 //sms.put("rdate", ""); // 예약일자 - 20161004 : 2016-10-04일기준 //sms.put("rtime", ""); // 예약시간 - 1930 : 오후 7시30분 //sms.put("testmode_yn", "Y"); // Y 인경우 실제문자 전송X , 자동취소(환불) 처리 diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java index 20582fb9..dbd6d80b 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java @@ -107,4 +107,6 @@ public interface VEEduMIXService { List selectAdultRsltRprtList(VEEduAplctVO paramVO) throws Exception; List selectExprnAtchFileDownList(VEEduAplctVO paramVO) throws Exception; + + List selectTngrRsltRprtList(VEEduAplctVO paramVO) throws Exception; } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java index 39c0997c..bbc60ff8 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java @@ -265,5 +265,11 @@ public class VEEduMIXDAO extends EgovAbstractDAO { @SuppressWarnings("unchecked") List tlist = (List) list("VEEduMIXDAO.selectExprnAtchFileDownList", paramVO); return tlist; - } + } + + public List selectTngrRsltRprtList(VEEduAplctVO paramVO) { + @SuppressWarnings("unchecked") + List tlist = (List) list("VEEduMIXDAO.selectTngrRsltRprtList", paramVO); + return tlist; + } } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java index 37c90706..aa558bc2 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java @@ -236,4 +236,9 @@ public class VEEduMIXServiceImpl implements VEEduMIXService { public List selectExprnAtchFileDownList(VEEduAplctVO paramVO) throws Exception{ return vEEduMIXDAO.selectExprnAtchFileDownList(paramVO); } + + @Override + public List selectTngrRsltRprtList(VEEduAplctVO paramVO) throws Exception{ + return vEEduMIXDAO.selectTngrRsltRprtList(paramVO); + } } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java index 2dc21b24..fa29e7eb 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java @@ -2,7 +2,7 @@ package kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service; import java.util.List; -import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; +import kcc.ve.adv.tngr.stngInfo.service.VEAStngVO; public interface CndtnTrgtMngService { @@ -32,7 +32,9 @@ public interface CndtnTrgtMngService { void updateEduStateCdAndReqStateCdAjax(CndtnTrgtMngVO cndtnTrgtMngVO); + VEAStngVO selectSMSSndString(VEAStngVO vEAStngVO); + void updateSMSSndString(VEAStngVO vEAStngVO); /* //C diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java index b20f5575..1f945390 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java @@ -5,6 +5,7 @@ import java.util.List; import org.springframework.stereotype.Repository; import egovframework.rte.psl.dataaccess.EgovAbstractDAO; +import kcc.ve.adv.tngr.stngInfo.service.VEAStngVO; import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngVO; @Repository("cndtnTrgtInfoMngDAO") @@ -157,4 +158,12 @@ public class CndtnTrgtMngDAO extends EgovAbstractDAO { update("cndtnTrgtInfoMngDAO.updateEduStateCdAndReqStateCdAjax", cndtnTrgtInfoMngVO); } + public VEAStngVO selectSMSSndString(VEAStngVO vEAStngVO) { + return (VEAStngVO) select("cndtnTrgtInfoMngDAO.selectSMSSndString", vEAStngVO); + } + + public void updateSMSSndString(VEAStngVO vEAStngVO) { + update("cndtnTrgtInfoMngDAO.updateSMSSndString", vEAStngVO); + } + } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java index 9a661b70..c898b992 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java @@ -8,6 +8,7 @@ import javax.annotation.Resource; import org.springframework.stereotype.Service; import egovframework.rte.fdl.idgnr.EgovIdGnrService; +import kcc.ve.adv.tngr.stngInfo.service.VEAStngVO; import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngService; import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngVO; @@ -89,6 +90,15 @@ public class CndtnTrgtMngServiceImpl implements CndtnTrgtMngService { return cndtnTrgtInfoMngDAO.memoUpdate(cndtnTrgtInfoMngVO); } + @Override + public VEAStngVO selectSMSSndString(VEAStngVO vEAStngVO) { + return cndtnTrgtInfoMngDAO.selectSMSSndString(vEAStngVO); + } + + @Override + public void updateSMSSndString(VEAStngVO vEAStngVO) { + cndtnTrgtInfoMngDAO.updateSMSSndString(vEAStngVO); + } } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java index 5958b03f..7fdfbbee 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java @@ -40,6 +40,7 @@ import kcc.com.utl.user.service.CheckFileUtil; import kcc.com.utl.user.service.CheckLoginUtil; import kcc.let.uat.uia.service.SsoLoginVO; import kcc.let.utl.fcc.service.EgovCryptoUtil; +import kcc.ve.adv.tngr.stngInfo.service.VEAStngVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsAplctPrdService; import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsCntntVO; @@ -1962,8 +1963,45 @@ public class CndtnTrgtMngController { @RequestMapping("/oprtn/cndtnSspnIdtmt/popup/trgtSendSmsPopup.do") public String eduDocReqAlertPopup( @ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO , ModelMap model , HttpServletRequest request ) throws Exception { + VEAStngVO vEAStngVO = new VEAStngVO(); + vEAStngVO.setStngCd("SND01"); + vEAStngVO = cndtnTrgtInfoMngService.selectSMSSndString(vEAStngVO); + + model.addAttribute("vEAStngVO", vEAStngVO); return "oprtn/cndtnSspnIdtmt/popup/trgtSendSmsPopup"; } + + @RequestMapping("/oprtn/cndtnSspnIdtmt/popup/smsStringUpdateAjax.do") + public ModelAndView smsStringUpdateAjax( @ModelAttribute("vEEduAplctVO") VEAStngVO vEAStngVO , ModelMap model , HttpServletRequest request ) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + //로그인 처리==================================== + //로그인 정보 가져오기 + String s_oprtnLoginCheckNInfo = checkLoginUtil.oprtnCheckNInfo(model); + if (!"".equals(s_oprtnLoginCheckNInfo)) { + modelAndView.addObject("result", "loginFail"); + return modelAndView; + } + //로그인 처리==================================== + + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + + int successCnt = 0; + try { + + vEAStngVO.setLastUpdusrId(loginVO.getUniqId()); //esntl_id + vEAStngVO.setCn(vEAStngVO.getSmsCn()); + cndtnTrgtInfoMngService.updateSMSSndString(vEAStngVO); + modelAndView.addObject("result", "success"); + } catch (Exception ex) { + ex.printStackTrace(); + modelAndView.addObject("result", "fail"); + } + + return modelAndView; + } ////////////////////////////////////////////////////////////////////////////////////////////////////////////// // // diff --git a/src/main/java/kcc/ve/oprtn/pblc/sndMng/web/SndMngController.java b/src/main/java/kcc/ve/oprtn/pblc/sndMng/web/SndMngController.java index 659175fc..f640ecd1 100644 --- a/src/main/java/kcc/ve/oprtn/pblc/sndMng/web/SndMngController.java +++ b/src/main/java/kcc/ve/oprtn/pblc/sndMng/web/SndMngController.java @@ -568,7 +568,7 @@ public class SndMngController { String message = "정상적으로 발송되었습니다."; VeSendSMS sendSMS = new VeSendSMS(); - Map resultMap = sendSMS.VeSendSMS(vEEduAplctVO.getClphone(), vEEduAplctVO.getSndCn()); + Map resultMap = sendSMS.VeSendSMS(vEEduAplctVO.getClphone(), vEEduAplctVO.getSndCn(), vEEduAplctVO.getSndFlag()); LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); diff --git a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml index e2d16500..1a990a05 100644 --- a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml @@ -4,6 +4,7 @@ + @@ -478,4 +479,27 @@ #sspnIdtmtTrgtOrdList[]# + + + + + /* cndtnTrgtInfoMngDAO.updateSMSSndString */ + UPDATE VEA_BASIC_INFO_STNG + SET + CN = #cn#, + LAST_UPDT_PNTTM = SYSDATE, + LAST_UPDUSR_ID = #lastUpdusrId# + WHERE stng_cd = #stngCd# + diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml index b6b7a48a..7ccec155 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml @@ -8065,4 +8065,39 @@ VALUES + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp index 0883dc0a..c2e4170d 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp @@ -367,6 +367,7 @@ "교육운영 관리 시스템입니다. 찾아가는 성인 교육에 배정되셨습니다.", returnData.vEInstrDetailVOList[i].eduAplctOrd, returnData.vEInstrDetailVOList[i].userId, + "S", "N" ); sendEmail( diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduInstrFeeMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduInstrFeeMngList.jsp index 6366277d..95b32fca 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduInstrFeeMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduInstrFeeMngList.jsp @@ -195,6 +195,7 @@ "교육운영 관리 시스템입니다." + $(this).data('instrnm')+"님의 " + $(this).data('date') + " 교육 강사료는 " + $(this).data('instrfeesum') +"원입니다.", $(this).val().split('@')[0], $(this).data('userid'), + "S", "N" ); }); diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp index cfd6257e..a46f86f7 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp @@ -210,6 +210,7 @@ "교육운영 관리 시스템입니다.\n" + $(this).data('chrgnm')+"님의 " + $(this).data('date') + " 교육 강의만족도 제출 바랍니다.", $(this).val().split('@')[0], $(this).data('userid'), + "S", "N" ); sendEmail( @@ -447,7 +448,7 @@ }else{ //개발 var viewer = new m2soft.crownix.Viewer('http://119.193.215.98:8093/ReportingServer/service'); viewer.hideToolbarItem(["save"]); - viewer.openFile('adult_rslts_20240104.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/adultVisitEdu/eduAplct/adultRsltRprtListAjax.do?rsltList='+rsltList+']'); + viewer.openFile('adult_rslts_20240104.mrd', '/rf [http://192.168.0.12:8086/offedu/ve/aplct/adultVisitEdu/eduAplct/adultRsltRprtListAjax.do?rsltList='+rsltList+']'); } } diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmm/rejectPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmm/rejectPopup.jsp index 850790bf..95082c67 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cmm/rejectPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmm/rejectPopup.jsp @@ -53,6 +53,7 @@ "교육운영 관리 시스템입니다. 등록하신 체험교실 운영신청 수정요청드립니다.", "", "", + "G", "N" ); } diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp index 3837bc90..8138ab0c 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp @@ -285,6 +285,7 @@ $("#smsMsg").val(), $(this).val(), $(this).data('userid'), + "B", "N" ); } diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/eduInstrFeeMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/eduInstrFeeMngList.jsp index fa45f067..2db9418b 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/eduInstrFeeMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/eduInstrFeeMngList.jsp @@ -256,6 +256,7 @@ "교육운영 관리 시스템입니다." + $(this).data('instrnm')+"님의 " + $(this).data('date') + " 교육 강사료는 " + $(this).data('instrfeesum') +"원입니다.", $(this).val().split('@')[0], $(this).data('userid'), + "B", "N" ); }); diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/trgtSendSmsPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/trgtSendSmsPopup.jsp index 14b90cb5..aabee1ef 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/trgtSendSmsPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/trgtSendSmsPopup.jsp @@ -57,11 +57,36 @@ close(); } + function smsUpdate(){ + $("#smsCn").val($("#smsCnTxtArea").val()); + var frm = new FormData(document.getElementById("smsStringForm")); + $.ajax({ + type:"POST", + url:"${pageContext.request.contextPath}/oprtn/cndtnSspnIdtmt/popup/smsStringUpdateAjax.do", + data:frm, + dataType:'json', + async: false, + processData: false, + contentType: false, + cache: false, + success:function(returnData){ + if(returnData.result == "success"){ + alert("저장 되었습니다."); + } + }, + error:function(request , status, error){ + alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + } + }); + } - +
+ + +
@@ -100,7 +125,37 @@
- + +
+

+

+
+ + + + + + + + + + + +
+

자주사용하는 문구

+
+
+
+
+
+
+ +
+
+ +
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp index 0cabcc2c..44436231 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp @@ -279,7 +279,7 @@ return; } document.popForm.action = ""; - window.open("#", "_trgtSendSmsPopup", "scrollbars = no, top=100px, left=100px, height=550px, width=750px"); + window.open("#", "_trgtSendSmsPopup", "scrollbars = no, top=100px, left=100px, height=650px, width=750px"); document.popForm.target = "_trgtSendSmsPopup"; document.popForm.submit(); @@ -298,6 +298,7 @@ cn, $(this).data('sspnidtmttrgtord'), $(this).data('userid'), + "B", "N" ); }); diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/eduInstrFeeMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/eduInstrFeeMngList.jsp index 8e311938..c0858b90 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/eduInstrFeeMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/eduInstrFeeMngList.jsp @@ -255,6 +255,7 @@ "교육운영 관리 시스템입니다." + $(this).data('instrnm')+"님의 " + $(this).data('date') + " 교육 강사료는 " + $(this).data('instrfeesum') +"원입니다.", $(this).val().split('@')[0], $(this).data('userid'), + "A", "N" ); }); diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp index 89a255b9..30d10319 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp @@ -267,6 +267,7 @@ $("#smsMsg").val(), $(this).val(), $(this).data('userid'), + "A", "N" ); } diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngDetail.jsp index a233b2df..4a70e55b 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngDetail.jsp @@ -155,6 +155,7 @@ "교육운영 관리 시스템입니다. 신청하신 찾아가는 청소년 교육이 확정되었습니다.", '', '', + "C", "N" ); sendEmail( diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduInstrFeeMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduInstrFeeMngList.jsp index 173a18a1..921b05e8 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduInstrFeeMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduInstrFeeMngList.jsp @@ -195,6 +195,7 @@ "교육운영 관리 시스템입니다." + $(this).data('instrnm')+"님의 " + $(this).data('date') + " 교육 강사료는 " + $(this).data('instrfeesum') +"원입니다.", $(this).val().split('@')[0], $(this).data('userid'), + "C", "N" ); }); diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp index 802e5334..b03c629d 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduRsltMngList.jsp @@ -330,6 +330,7 @@ "교육운영 관리 시스템입니다.\n" + $(this).data('chrgnm')+"님의 " + $(this).data('date') + " 교육 강의만족도 제출 바랍니다.", $(this).val().split('@')[0], $(this).data('userid'), + "C", "N" ); sendEmail( @@ -481,7 +482,7 @@ data-lctr="${list.userId}" value="${list.eduAplctOrd}@${list.eduChasiOrd}" data-phone="" data-cnt="" data-date=" ~ " data-email="" data-chrgnm="" data-userId="" - title="Check" type="checkbox"/> + data-educhasiord="" title="Check" type="checkbox"/> @@ -530,7 +531,8 @@
- + +
@@ -563,5 +565,49 @@ . + + + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduDocReqAlertPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduDocReqAlertPopup.jsp index f4c6a543..41965a29 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduDocReqAlertPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/eduDocReqAlertPopup.jsp @@ -60,6 +60,7 @@ $('#cn').val(), "", "", + "C", "Y" ); }); diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/popup/eduRsltRprtRegPop.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/popup/eduRsltRprtRegPop.jsp index f3ad1501..6ce3c3ac 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/popup/eduRsltRprtRegPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/endInfo/popup/eduRsltRprtRegPop.jsp @@ -30,7 +30,7 @@ $("#file_temp").click(); }); - $("#limitcount").val("5"); + $("#limitcount").val("1"); //파일첨부관련 설정들=============================================== @@ -130,7 +130,8 @@ " /> " /> - + +