diff --git a/src/main/java/itn/com/cmm/util/XssFilterUtil.java b/src/main/java/itn/com/cmm/util/XssFilterUtil.java index 43fcbc71..b39a028d 100644 --- a/src/main/java/itn/com/cmm/util/XssFilterUtil.java +++ b/src/main/java/itn/com/cmm/util/XssFilterUtil.java @@ -81,7 +81,6 @@ public class XssFilterUtil { test_str_low.contains("kill")|| test_str_low.contains("batch")|| test_str_low.contains("shutdown")|| - test_str_low.contains("touch")|| test_str_low.contains("wget")|| test_str_low.contains("iptables")|| test_str_low.contains("traceroute")|| diff --git a/src/main/java/itn/let/mjo/human/web/MjonHumanPageController.java b/src/main/java/itn/let/mjo/human/web/MjonHumanPageController.java new file mode 100644 index 00000000..5883e447 --- /dev/null +++ b/src/main/java/itn/let/mjo/human/web/MjonHumanPageController.java @@ -0,0 +1,98 @@ +package itn.let.mjo.human.web; + +import java.util.List; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.ModelAndView; + +import itn.let.mjo.msgdata.web.MjonMsgDataController; +import itn.let.uss.umt.service.EgovMberManageService; +import itn.let.uss.umt.service.EgovUserManageService; +import itn.let.uss.umt.service.MberManageVO; +import itn.let.uss.umt.service.UserManageVO; + +@Controller +public class MjonHumanPageController { + + /** userManageService */ + @Resource(name = "userManageService") + private EgovUserManageService userManageService; + + /** mberManageService */ + @Resource(name = "mberManageService") + private EgovMberManageService mberManageService; + + private static final Logger logger = LoggerFactory.getLogger(MjonMsgDataController.class); + + @RequestMapping(value="/web/user/humanPage.do") + public String humanPageIndex() throws Exception { + + return "web/login/humanPage"; + } + + @RequestMapping(value="/web/user/humanPageAuthenticatedPage.do") + public String humanPageAuthenticatedUser() throws Exception { + + return "web/login/humanPageAuthenticatedPage"; + } + + @RequestMapping(value="/web/user/humanCertifiedAjax.do") + public ModelAndView humanCertifiedAjax( + HttpServletRequest request, HttpServletResponse response, ModelMap model, + @ModelAttribute("userManageVO") UserManageVO userManageVO) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + try { + + UserManageVO userInfoVO = new UserManageVO(); + userInfoVO.setEmplyrNm(userManageVO.getEmplyrNm()); // 이름 + userInfoVO.setMblDn(userManageVO.getMblDn()); // Dn + + List usedNmList = userManageService.selectUserIdAjax(userInfoVO); + + boolean TorF = usedNmList.size() > 0 ? true : false; + + if (!TorF) { + System.out.println(TorF); + System.out.println(TorF); + + modelAndView.addObject("message", "입력하신 아이디/이름 정보에 맞는 회원이 없습니다."); + modelAndView.addObject("result", "fail-check"); + modelAndView.addObject("resultSts", "0"); + modelAndView.addObject("resultBlockSts", "0"); + + return modelAndView; + } + + MberManageVO mberManageVO = new MberManageVO(); + // 회원 휴면회원에서 일반회원으로 업데이트 + mberManageVO.setMberId(usedNmList.get(0).getEmplyrId()); //탈퇴사유 중 직접입력으로 타입 지정 + mberManageVO.setDormantYn("N"); + + int updateCount = mberManageService.updateUserDormant(mberManageVO); + + if(updateCount != 0) { + modelAndView.addObject("result", "success"); + }else { + modelAndView.addObject("result", "fail"); + } + }catch (Exception e) { + logger.error(e.getMessage(), e); + + } + + + return modelAndView; + } +} 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 468116ba..004ccc10 100644 --- a/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java +++ b/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java @@ -5046,7 +5046,33 @@ public class MjonMsgController { public String pdfView(FileVO fileVO , ModelMap model , HttpServletRequest request) throws Exception { - + + // 파라미터 + String docuDiv = request.getParameter("docuDiv"); + String hstManagerNm = request.getParameter("hstManagerNm"); + String hstMbtlNum = request.getParameter("hstMbtlNum"); + String cmphstId = request.getParameter("cmphstId"); + String atchFileId = request.getParameter("atchFileId"); + String workAtchFileId = request.getParameter("workAtchFileId"); + + // 조회 + MberCmpHstVO mberCmpHstVO = new MberCmpHstVO(); + mberCmpHstVO.setCmphstId(cmphstId); + mberCmpHstVO = egovMberCmpHstService.selectMberCmpHstDetail(mberCmpHstVO); + String hstSttus = mberCmpHstVO.getHstSttus(); + String hstType = mberCmpHstVO.getHstType(); + String mberNm = mberCmpHstVO.getMberNm(); + String bizType = mberCmpHstVO.getBizType(); + String bizNo = mberCmpHstVO.getBizNo(); + String ceoNm = mberCmpHstVO.getCeoNm(); + String mberId = mberCmpHstVO.getMberId(); + String managerNm = mberCmpHstVO.getManagerNm(); + String mbtlNum = mberCmpHstVO.getMbtlNum(); + + if (docuDiv.equals("2")) { + fileVO.setAtchFileId(workAtchFileId); + } + FileVO fvo = fileService.selectFileInf(fileVO); String path = ""; String fileType = ""; @@ -5068,21 +5094,35 @@ public class MjonMsgController { } } - String mberNm = request.getParameter("mberNm"); - String bizNo = request.getParameter("bizNo"); - String ceoNm = request.getParameter("ceoNm"); - String hstManagerNm = request.getParameter("hstManagerNm"); - String hstMbtlNum = request.getParameter("hstMbtlNum"); + //기업유형 + ComDefaultCodeVO voComCode = new ComDefaultCodeVO(); + voComCode.setCodeId("ITN033"); + model.addAttribute("bizTypeList", cmmUseService.selectCmmCodeDetail(voComCode)); + // 유형 코드조회 + voComCode.setCodeId("ITN048"); + model.addAttribute("hstTypeList", cmmUseService.selectCmmCodeDetail(voComCode)); + model.addAttribute("pdfPath", path); model.addAttribute("fileType", fileType); - model.addAttribute("atchFileId", fileVO.getAtchFileId()); + model.addAttribute("docuDiv", docuDiv); + model.addAttribute("atchFileId", atchFileId); + model.addAttribute("workAtchFileId", workAtchFileId); model.addAttribute("mberNm", mberNm); + model.addAttribute("bizType", bizType); model.addAttribute("bizNo", bizNo); model.addAttribute("ceoNm", ceoNm); model.addAttribute("hstManagerNm", hstManagerNm); model.addAttribute("hstMbtlNum", hstMbtlNum); - + model.addAttribute("hstSttus", hstSttus); + model.addAttribute("cmphstId", cmphstId); + model.addAttribute("hstType", hstType); + model.addAttribute("mberId", mberId); + model.addAttribute("managerNm", managerNm); + model.addAttribute("mbtlNum", mbtlNum); + model.addAttribute("atchFileSttus", mberCmpHstVO.getAtchFileSttus()); + model.addAttribute("workAtchFileSttus", mberCmpHstVO.getWorkAtchFileSttus()); + return "/uss/ion/msg/pdfView"; } @@ -5117,16 +5157,24 @@ public class MjonMsgController { List fileList = fileService.selectFileInfs(fileVO); model.addAttribute("fileList", fileList); + // 파라미터 String phmId = request.getParameter("phmId"); - String phoneNumber = request.getParameter("phoneNumber"); - String userName = request.getParameter("userName"); String managerNm = request.getParameter("managerNm"); String dept = request.getParameter("dept"); - String nameType = request.getParameter("nameType"); - String phmType = request.getParameter("phmType"); String authYnTxt = request.getParameter("authYnTxt"); String phmAuthTypeTxt = request.getParameter("phmAuthTypeTxt"); String ownerName = request.getParameter("ownerName"); + + // 조회 + MjPhoneMemberVO mjPhoneMemberVO = new MjPhoneMemberVO(); + mjPhoneMemberVO = mjonMsgService.selectSendPhoneNumberByPhmId(phmId); + String phoneNumber = mjPhoneMemberVO.getPhoneNumber(); + String userId = mjPhoneMemberVO.getUserId(); + String userName = mjPhoneMemberVO.getUserName(); + String nameType = mjPhoneMemberVO.getNameType(); + String phmType = mjPhoneMemberVO.getPhmType(); + String authYn = mjPhoneMemberVO.getAuthYn(); + String rejectReason = mjPhoneMemberVO.getRejectReason(); // 필수서류 String requiredDocuments = ""; @@ -5211,26 +5259,24 @@ public class MjonMsgController { } } - - - - - model.addAttribute("pdfPath", path); model.addAttribute("fileType", fileType); model.addAttribute("atchFileId", fileVO.getAtchFileId()); model.addAttribute("fileSn", fileVO.getFileSn()); model.addAttribute("phmId", phmId); model.addAttribute("phoneNumber", phoneNumber); + model.addAttribute("userId", userId); model.addAttribute("userName", userName); model.addAttribute("managerNm", managerNm); model.addAttribute("dept", dept); model.addAttribute("nameType", nameType); model.addAttribute("phmType", phmType); + model.addAttribute("authYn", authYn); model.addAttribute("authYnTxt", authYnTxt); model.addAttribute("phmAuthTypeTxt", phmAuthTypeTxt); model.addAttribute("ownerName", ownerName); model.addAttribute("requiredDocuments", requiredDocuments); + model.addAttribute("rejectReason", rejectReason); return "/uss/ion/msg/pdfViewPhone"; } diff --git a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java index b923ab59..e63b1580 100644 --- a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java +++ b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java @@ -1837,6 +1837,10 @@ public class MjonPayController { } model.addAttribute("tabType", tabType); + MberGrdVO mberGrdVO = new MberGrdVO(); + List mberGrdSettingList = mberGrdService.selectMberGrdSettingList(mberGrdVO); + model.addAttribute("mberGrdSettingList", mberGrdSettingList); + return "/web/pay/PayView"; } diff --git a/src/main/java/itn/let/sym/grd/web/MberGrdController.java b/src/main/java/itn/let/sym/grd/web/MberGrdController.java index 1860a1f6..f5d632ea 100644 --- a/src/main/java/itn/let/sym/grd/web/MberGrdController.java +++ b/src/main/java/itn/let/sym/grd/web/MberGrdController.java @@ -92,7 +92,7 @@ public class MberGrdController { try{ MberGrdVO mberGrdVO1 = new MberGrdVO(); mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO); - if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate() && mberGrdVO1.getGrdDatePrgYn().equals("Y")) { + if (mberGrdVO1.getGrdNoti().equals("Y")) { isSuccess = true; } } @@ -127,17 +127,22 @@ public class MberGrdController { if (StringUtils.isNotEmpty(userId)) { mberGrdVO.setMberId(userId); - // 회원별 이벤트 진행여부 - int mberEventPrgCnt = mberGrdService.selectMberEventPrgCnt(mberGrdVO.getMberId()); - if (mberEventPrgCnt == 0) { - rtnMberGrdVO = mberGrdService.selectMberGrdInfo(mberGrdVO.getMberId()); - if (null != rtnMberGrdVO) { - isSuccess = true; - } - else { - msg = "종료"; - } - } + // Step 1. 등급제 시행 ON 일경우(시행일자 진행여부 Y일경우) + MberGrdVO mberGrdVO1 = new MberGrdVO(); + mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO); + if (mberGrdVO1.getGrdNoti().equals("Y")) { + // Step 2. 회원별 이벤트 진행여부 + int mberEventPrgCnt = mberGrdService.selectMberEventPrgCnt(mberGrdVO.getMberId()); + if (mberEventPrgCnt == 0) { + rtnMberGrdVO = mberGrdService.selectMberGrdInfo(mberGrdVO.getMberId()); + if (null != rtnMberGrdVO) { + isSuccess = true; + } + else { + msg = "종료"; + } + } + } } } catch(Exception e) { diff --git a/src/main/java/itn/let/sym/grd/web/MberGrdMngController.java b/src/main/java/itn/let/sym/grd/web/MberGrdMngController.java index 99664375..408ecf4d 100644 --- a/src/main/java/itn/let/sym/grd/web/MberGrdMngController.java +++ b/src/main/java/itn/let/sym/grd/web/MberGrdMngController.java @@ -4,6 +4,7 @@ import java.util.List; import javax.annotation.Resource; +import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.ModelAttribute; @@ -182,7 +183,7 @@ public class MberGrdMngController { // Step 1. 등급제 시행 ON 일경우 MberGrdVO mberGrdVO1 = new MberGrdVO(); mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO); - if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate() && mberGrdVO1.getGrdDatePrgYn().equals("Y")) { + if (mberGrdVO1.getGrdNoti().equals("Y")) { mberGrdVO.setGrdNewDate(mberGrdVO1.getGrdNewDate()); // 회원별 등급 초기화 @@ -312,7 +313,7 @@ public class MberGrdMngController { ModelAndView modelAndView = new ModelAndView(); modelAndView.setViewName("jsonView"); - boolean isSuccess = true; + boolean isSuccess = false; String msg = ""; MberGrdVO rtnMberGrdVO = new MberGrdVO(); @@ -320,20 +321,28 @@ public class MberGrdMngController { LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); String frstRegisterId = loginVO == null ? "" : loginVO.getId(); mberGrdVO.setEditId(frstRegisterId); // 최초등록자ID - + try{ - rtnMberGrdVO = mberGrdService.selectMberGrdInfo(mberGrdVO.getMberId()); - if (null != rtnMberGrdVO) { - // 등급제 적용 - - } - else { - isSuccess = false; - msg = "종료"; - } + if (StringUtils.isNotEmpty(mberGrdVO.getMberId())) { + // Step 1. 등급제 시행 ON 일경우(시행일자 진행여부 Y일경우) + MberGrdVO mberGrdVO1 = new MberGrdVO(); + mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO); + if (mberGrdVO1.getGrdNoti().equals("Y")) { + // Step 2. 회원별 이벤트 진행여부 + int mberEventPrgCnt = mberGrdService.selectMberEventPrgCnt(mberGrdVO.getMberId()); + if (mberEventPrgCnt == 0) { + rtnMberGrdVO = mberGrdService.selectMberGrdInfo(mberGrdVO.getMberId()); + if (null != rtnMberGrdVO) { + isSuccess = true; + } + else { + msg = "종료"; + } + } + } + } } catch(Exception e) { - isSuccess = false; msg = e.getMessage(); } @@ -433,7 +442,7 @@ public class MberGrdMngController { // Step 1. 등급제 시행 ON 일경우 MberGrdVO mberGrdVO1 = new MberGrdVO(); mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO); - if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate() && mberGrdVO1.getGrdDatePrgYn().equals("Y")) { + if (mberGrdVO1.getGrdNoti().equals("Y")) { mberGrdVO.setGrdNewDate(mberGrdVO1.getGrdNewDate()); // 회원 등급 변경(환불후) => 기존등급 상관없이 업데이트 diff --git a/src/main/java/itn/let/uat/uia/web/EgovLoginController.java b/src/main/java/itn/let/uat/uia/web/EgovLoginController.java index 62f0cf26..e0006e1e 100644 --- a/src/main/java/itn/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/itn/let/uat/uia/web/EgovLoginController.java @@ -1635,9 +1635,10 @@ public class EgovLoginController { * 작업자 : 원영현 과장 */ - /*if(resultVO.getDormantYn().equals("Y") || resultVO.getDormantYn() == "Y") { - - }*/ + if(resultVO.getDormantYn().equals("Y") || resultVO.getDormantYn() == "Y") { + + return "redirect:/web/user/humanPage.do"; + } @@ -2936,12 +2937,12 @@ public class EgovLoginController { * 일 시 : 2023.07.25 * 담당자 : 원영현 과장 수정 * 내 용 : Dn 으로 회원정보 조회가 가능하도록 기능 수정 - * 변경된 핸드폰 번호로 조회시 정보조회가 안되기 때문에 무조건 true 로 변경 + * 변경된 핸드폰 번호로 조회시 정보조회가 안되기 때문에 이름과 ID를 이용하여 조건 수정 * */ - /*List usedNmList = new ArrayList<>(); + userManageVO.setMoblphonNo(""); + List usedNmList = new ArrayList<>(); usedNmList = userManageService.selectUserIdAjax2(userManageVO); - TorF = usedNmList.size() > 0 ? true : false;*/ - TorF = true; + TorF = usedNmList.size() > 0 ? true : false; } @@ -2950,7 +2951,7 @@ public class EgovLoginController { if (!TorF) { System.out.println(" In if TorF :: "+TorF); - modelAndView.addObject("message", "입력하신 아이디/이름/휴대폰 번호에 맞는 회원이 없습니다."); + modelAndView.addObject("message", "입력하신 아이디/이름에 맞는 회원이 없습니다."); modelAndView.addObject("result", "fail-check"); modelAndView.addObject("resultSts", "0"); modelAndView.addObject("resultBlockSts", "0"); diff --git a/src/main/java/itn/let/uat/uia/web/EgovMypageController.java b/src/main/java/itn/let/uat/uia/web/EgovMypageController.java index 1407da45..69db77e0 100644 --- a/src/main/java/itn/let/uat/uia/web/EgovMypageController.java +++ b/src/main/java/itn/let/uat/uia/web/EgovMypageController.java @@ -1003,8 +1003,10 @@ public class EgovMypageController { }else if("03".equals(cmpChangeManageVO.getHstSttus())) { //가장 마지막 기업회원전환이 반려 상태일 시 model.addAttribute("cmpChangeManageVO", cmpChangeManageVO); return "web/user/membershipChangeReturn"; - } - + }else if("02".equals(cmpChangeManageVO.getHstSttus())) { //가장 마지막 기업회원전환이 승인 상태일 시 + model.addAttribute("cmpChangeManageVO", cmpChangeManageVO); + return "web/user/membershipChangeOk"; + } } } diff --git a/src/main/java/itn/let/uss/umt/web/EgovMberCmpHstController.java b/src/main/java/itn/let/uss/umt/web/EgovMberCmpHstController.java index 41a8d16a..42fd91ac 100644 --- a/src/main/java/itn/let/uss/umt/web/EgovMberCmpHstController.java +++ b/src/main/java/itn/let/uss/umt/web/EgovMberCmpHstController.java @@ -329,6 +329,10 @@ public class EgovMberCmpHstController { msg = "오류 : " + e.getMessage(); } + System.out.println("############### 기업회원 승인 ###############"); + System.out.println("updtCnt : " + updtCnt); + System.out.println("mberCmpHstVO.getHstType() : " + mberCmpHstVO.getHstType()); + //심사처리 완료 시 문자 발송 - 회원가입, 기업회원전환 안내만 발송되게 수정 220613 if(updtCnt == 1 && ("01".equals(mberCmpHstVO.getHstType()) || "02".equals(mberCmpHstVO.getHstType()))) { @@ -712,6 +716,10 @@ public class EgovMberCmpHstController { msg = "오류 : " + e.getMessage(); } + System.out.println("############### 기업회원 반려 ###############"); + System.out.println("updtCnt : " + updtCnt); + System.out.println("mberCmpHstVO.getHstType() : " + mberCmpHstVO.getHstType()); + //심사처리 완료 시 문자 발송 - 회원가입, 기업회원전환 안내만 발송되게 수정 220613 if(updtCnt == 1 && ("01".equals(mberCmpHstVO.getHstType()) || "02".equals(mberCmpHstVO.getHstType()))) { diff --git a/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml index 0477dc32..60ce46ed 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml @@ -887,6 +887,7 @@ AND A.MBER_ID = #mberId# AND IFNULL(TRIM(A.MOID), '') != '' AND A.TOT_AMT > 0 + AND A.GRD_DATE >= (SELECT S.GRD_DATE FROM MJ_MBER_GRD_INFO S WHERE S.MBER_ID = #mberId#) ORDER BY A.REG_DATE DESC LIMIT #recordCountPerPage# OFFSET #firstIndex# diff --git a/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Mysql.xml index dd911457..839dde41 100644 --- a/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Mysql.xml @@ -26,6 +26,7 @@ + @@ -91,6 +95,7 @@ , CRTFC_DN_VALUE AS crtfcDnValue , '' AS dept , OUTER_CERT_YN AS outerCertYn + , '' AS dormantYn FROM LETTNEMPLYRINFO A WHERE EMPLYR_ID = #id# AND PASSWORD = #password# @@ -316,29 +321,32 @@ @@ -507,32 +515,35 @@ + - - - + 등급 + 전화번호 @@ -3461,9 +3488,8 @@ function kakaoATDelayCancel(msgGroupId){ - - - + 등급 + 전화번호 @@ -3815,7 +3841,7 @@ function kakaoATDelayCancel(msgGroupId){ - [이용정지]
+ [발송취소]
 @@ -4022,7 +4048,7 @@ function kakaoATDelayCancel(msgGroupId){ - [이용정지]
+ [발송취소]
 diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstListByType.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstListByType.jsp index 669be8b0..3b3e5a39 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstListByType.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstListByType.jsp @@ -22,14 +22,22 @@ $( document ).ready(function() { }); // PdfView -function pdfViewPop(atchFileId,mberNm,bizNo,ceoNm,hstManagerNm,hstMbtlNum) { +function pdfViewPop(docuDiv,atchFileId,workAtchFileId,mberNm,bizNo,ceoNm,hstManagerNm,hstMbtlNum,hstSttus,cmphstId,hstType,mberId,managerNm,mbtlNum) { + document.pdfForm.docuDiv.value = docuDiv; document.pdfForm.atchFileId.value = atchFileId; + document.pdfForm.workAtchFileId.value = workAtchFileId; document.pdfForm.fileSn.value = 0; document.pdfForm.mberNm.value = mberNm; document.pdfForm.bizNo.value = bizNo; document.pdfForm.ceoNm.value = ceoNm; document.pdfForm.hstManagerNm.value = hstManagerNm; document.pdfForm.hstMbtlNum.value = hstMbtlNum; + document.pdfForm.hstSttus.value = hstSttus; + document.pdfForm.cmphstId.value = cmphstId; + document.pdfForm.hstType.value = hstType; + document.pdfForm.mberId.value = mberId; + document.pdfForm.managerNm.value = managerNm; + document.pdfForm.mbtlNum.value = mbtlNum; window.open("about:blank", 'pdfPopup', 'width=1020, height=800, top=100, left=0, fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=no, location=no, scrollbars=no'); document.pdfForm.action = ""; document.pdfForm.target = "pdfPopup"; @@ -284,13 +292,21 @@ function fnSetCalMonth(val) {
+ + - + + + + + + +
@@ -469,7 +485,7 @@ function fnSetCalMonth(val) { - + @@ -481,7 +497,7 @@ function fnSetCalMonth(val) { - + diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/EgovGnrlselectedUserKakaoATDataListAjax.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/EgovGnrlselectedUserKakaoATDataListAjax.jsp index 4c74f4cc..cc5d5adc 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/EgovGnrlselectedUserKakaoATDataListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/EgovGnrlselectedUserKakaoATDataListAjax.jsp @@ -594,7 +594,7 @@ function msgDetailClose(obj){ - [이용정지]
+ [발송취소]
 diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp index 76e2033c..7855cc2f 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp @@ -554,7 +554,7 @@ function fnSmishingUpdate(flag) { - 온오프[이용정지] + 온오프[발송취소] "> diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp index c727f5b8..9dd1fc07 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp @@ -565,7 +565,7 @@ function fnAtSmishingUpdate(flag) { 온 - 오프[이용정지] + 오프[발송취소] "> diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoft/SendKakaoFTList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoft/SendKakaoFTList.jsp index 4b22d4e2..8d760bd9 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoft/SendKakaoFTList.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoft/SendKakaoFTList.jsp @@ -546,7 +546,7 @@ function fnSmishingUpdate(flag) { - 온오프[이용정지] + 온오프[발송취소] "> diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp index afcdf480..b423c9a5 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp @@ -550,7 +550,7 @@ function fnSmishingUpdate(flag) { - 온오프[이용정지] + 온오프[발송취소] "> diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendNumberList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendNumberList.jsp index c6a72652..08bb731c 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendNumberList.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendNumberList.jsp @@ -41,16 +41,18 @@ $( document ).ready(function() { }); //PdfView -function pdfViewPhonePop(atchFileId,phmId,phoneNumber,userName,managerNm,dept,nameType,phmType,authYnTxt,phmAuthTypeTxt,ownerName) { +function pdfViewPhonePop(atchFileId,phmId,phoneNumber,userId,userName,managerNm,dept,nameType,phmType,authYn,authYnTxt,phmAuthTypeTxt,ownerName) { document.pdfForm.atchFileId.value = atchFileId; document.pdfForm.fileSn.value = 0; document.pdfForm.phmId.value = phmId; document.pdfForm.phoneNumber.value = phoneNumber; + document.pdfForm.userId.value = userId; document.pdfForm.userName.value = userName; document.pdfForm.managerNm.value = managerNm; document.pdfForm.dept.value = dept; document.pdfForm.nameType.value = nameType; document.pdfForm.phmType.value = phmType; + document.pdfForm.authYn.value = authYn; document.pdfForm.authYnTxt.value = authYnTxt; document.pdfForm.phmAuthTypeTxt.value = phmAuthTypeTxt; document.pdfForm.ownerName.value = ownerName; @@ -438,7 +440,7 @@ function fnSetCalMonth(val) { - + @@ -492,11 +494,13 @@ function fnSetCalMonth(val) { + + diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp index d07a4bb6..f3237c58 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp @@ -29,7 +29,7 @@ - + @@ -40,67 +40,535 @@ html { overflow-x: hidden; overflow-y: auto; } + +input[type="checkbox"]{display: inline;} +input[type="checkbox"] { + width: 1.263rem; + height: 1.263rem; + margin-right: 25px; + border: 1px solid var(--color-gray); + border-radius: 50%; + cursor: pointer; + position: relative; + vertical-align: middle; +} +input[type="text"] { + padding: 0 7px 0 7px; + min-width: 70px; + width: 90px; +} + + + -
+
+
+

기업회원 신청 정보

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- + + --%> + + +
기업명구분사업자번호대표자담당자휴대폰유형사업자재직
${mberNm} + + + + ${bizNo}${ceoNm}${hstManagerNm}${hstMbtlNum} + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + +

+ +
+

사업자정보 검증

+
+
+ + + + + + + + + + + + +
+ + +     + + + + + + + + + + +
+
+ + + -
- -  Page: /   - - -
-
+ + +
+ + + + + + + + + + + + + + + + + +
+ + + +
+ PDF 뷰어에서 지원하지 않는 형식의 파일입니다. 첨부파일 다운로드후 확인해주세요. +
+ + + +
+ +  Page: /   + + +
+
+

+ +
+ + + + + + + + + + + + + + + + +
+ +
+ + + + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfViewPhone.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfViewPhone.jsp index 7c481cd7..4836b4bc 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfViewPhone.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfViewPhone.jsp @@ -44,6 +44,19 @@ html { -
-
-

발신번호 신청 정보

-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
발신번호대표담당자회원구분인증방식인증자인증여부다운로드
${phoneNumber}${userName}${managerNm} - - - 기업 - - - 개인 - - - - - - - - 당사 - - - 대표 - - - 직원 - - - 타사 - - - 본인 - - - 타인 - - - - - 없음 - - - - - - 휴대폰 - - - 서류 - - - - - - - - - - - - - - - - - - 발신번호 차단 - - - 인증요청 - - - - - - - -
-
- -

- -
-

승인에 필요한 서류

-
-
- - - - - - - - - - -
${requiredDocuments}
-
- - - -
- - - - - - - - - - - - - - -
- - - -
- PDF 뷰어에서 지원하지 않는 형식의 파일입니다. 첨부파일 다운로드후 확인해주세요. -
- - - -
- -  Page: /   - - -
-
- +
+
+

발신번호 신청 정보

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
발신번호대표담당자회원구분인증방식인증자인증여부다운로드
${phoneNumber}${userName}${managerNm} + + + 기업 + + + 개인 + + + + + + + + 당사 + + + 대표 + + + 직원 + + + 타사 + + + 본인 + + + 타인 + + + + + 없음 + + + + + + 휴대폰 + + + 서류 + + + + + + + + + + + + + + + + + + 발신번호 차단 + + + 인증요청 + + + + + + + +
-
- - - - - - - - - - - - -
+ +

+ +
+

승인에 필요한 서류

+
+
+ + + + + + + + + + + + +
${requiredDocuments} + + + + +
+
+ + + + + + + +
+ + + + + + + + + + + + + + +
+ + + +
+ PDF 뷰어에서 지원하지 않는 형식의 파일입니다. 첨부파일 다운로드후 확인해주세요. +
+ + + +
+ +  Page: /   + + +
+
+
+ +

+ +
+ + + +
+ +
+ + + + + + + + + + + + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp index 967dd730..a7e9ea54 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp @@ -101,8 +101,37 @@ $(document).ready(function (){ getid(); + + if(!${empty LoginVO}){ + //등급제 대상 여부(헤더) + getMberGrdChk_Header(); + } }); +//등급제 대상 여부 +function getMberGrdChk_Header() { + $.ajax({ + type: "POST", + url: "/web/grd/mberGrdChkAjax.do", + data: {}, + dataType:'json', + async: false, + success: function (data) { + if (data.isSuccess) { + // 등급제 누적결제액 세부내역 + var levelIcon = "/publish/images/level/level_icon/" + data.rtnMberGrdVO.grdSetIcon + "_icon.png"; + $("#commonHeaderGradeIcon").attr("src", levelIcon); + } + else { + //alert("Msg : " + data.msg); + } + }, + error: function (e) { + //alert("ERROR : " + JSON.stringify(e)); + } + }); +} + //남은 시간 계산해주기(화면 새로고침해도 시간은 계속 유지됨) function getTimer(date) { var _vDate = new Date(date); @@ -1534,7 +1563,7 @@ function actionLogin() {
diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp index 3d6cf07a..776b1d14 100644 --- a/src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp @@ -30,10 +30,10 @@ $(document).ready(function(){ } //등급제 시행 ON/OFF 체크 - //getMberSettingDetail(); + getMberSettingDetail(); // 등급제 대상 여부 - //getMberGrdChk(); + getMberGrdChk(); }); diff --git a/src/main/webapp/WEB-INF/jsp/web/user/mberInfoIndex.jsp b/src/main/webapp/WEB-INF/jsp/web/user/mberInfoIndex.jsp index 9fd02da2..46d7af54 100644 --- a/src/main/webapp/WEB-INF/jsp/web/user/mberInfoIndex.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/user/mberInfoIndex.jsp @@ -18,7 +18,7 @@ $(document).ready(function(){ payUserListAjax(1); // 등급제 대상 여부 - //getMberGrdChk(); + getMberGrdChk(); var date = new Date() ; //이전달 첫날/마지막날 조회 diff --git a/src/main/webapp/WEB-INF/jsp/web/user/membershipChangeOk.jsp b/src/main/webapp/WEB-INF/jsp/web/user/membershipChangeOk.jsp new file mode 100644 index 00000000..d8f3b78c --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/user/membershipChangeOk.jsp @@ -0,0 +1,122 @@ + <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="ec" uri="/WEB-INF/tld/ecnet_tld.tld"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> + + + +
+ +
+ + <%@include file="/WEB-INF/jsp/web/user/mypageHeader.jsp" %> + + +
+ + + + + + + + + + + + + +
+
+

기업회원 전환

+
+
+
+

+ 고객님이 신청한 기업회원 전환신청은 승인되었습니다.
재로그인해주세요. +

+
+ +

+
+ +
+
+
+ +
+
+ +
+ diff --git a/src/main/webapp/publish/images/content/file_view.png b/src/main/webapp/publish/images/content/file_view.png new file mode 100644 index 00000000..1d5e9415 Binary files /dev/null and b/src/main/webapp/publish/images/content/file_view.png differ diff --git a/src/main/webapp/robots.txt b/src/main/webapp/robots.txt index 308510a1..923cff4f 100644 --- a/src/main/webapp/robots.txt +++ b/src/main/webapp/robots.txt @@ -1,3 +1,13 @@ User-agent: * Disallow:/uat +Disallow:/MapUrl.do +Disallow:/web/mjon/msgdata/selectMsgDataSMLViewAjax.do +Disallow:/web/pop/testSendPop.do +Disallow:/web/addr/getAddrGroupDuplCheckAjax.do +Disallow:/web/mjon/msgdata/sendMsgDataAjax.do +Disallow:/web/com/userSessionExpendAjax.do +Disallow:/web/mjon/msgdata/selectMsgGroupNotExistInfoAjax.do +Disallow:/web/addr/getAddrGroupDuplCheckAjax.do +Disallow:/web/mjon/msgdata/selectMsgAddrListAjax.do +Disallow:/web/mjon/conf/selectMjonMsgUseConfAjax.do Sitemap: https://www.munjaon.co.kr/sitemap.xml \ No newline at end of file