1. 결제관리 > 요금 사용내역 > 사용내역서 및 거래명세서 팝업 팩스 정보 누락 수정 2. 비밀번호 찾기 휴대폰, 이메일, 본인인증 진행시 회원 상태 체크 - 이용정지, 탈퇴회원은 비밀번호 찾기 안되도록 처리 3. 발신번호 관리에서 발신번호명을 현재 회원명(기업명)으로 표시 되도록처리 4. 로그인 처리시 인터셉터에서 필터 처리 예외 적용 - id_text, userid 변수에 대한 예외 처리 적용 5. 메인메뉴 및 사이트맵 a 태그에 rel="nosublink" 태그 삭제
2. 비밀번호 찾기 휴대폰, 이메일, 본인인증 진행시 회원 상태 체크 - 이용정지, 탈퇴회원은 비밀번호 찾기 안되도록 처리 3. 발신번호 관리에서 발신번호명을 현재 회원명(기업명)으로 표시 되도록처리 4. 로그인 처리시 인터셉터에서 필터 처리 예외 적용 - id_text, userid 변수에 대한 예외 처리 적용 5. 메인메뉴 및 사이트맵 a 태그에 rel="nosublink" 태그 삭제
@de7189360ad66c799ec63362c33d9593abdcf5c7
--- src/main/java/itn/com/cmm/interceptor/InterceptorHandler.java
+++ src/main/java/itn/com/cmm/interceptor/InterceptorHandler.java
... | ... | @@ -56,6 +56,8 @@ |
| 56 | 56 |
&& !name.toLowerCase().contains("di")
|
| 57 | 57 |
&& !name.toLowerCase().contains("mbldn")
|
| 58 | 58 |
&& !name.toLowerCase().contains("mberid")
|
| 59 |
+ && !name.toLowerCase().contains("userid")
|
|
| 60 |
+ && !name.toLowerCase().contains("id_text")
|
|
| 59 | 61 |
&& !name.toLowerCase().contains("mberemailadres")
|
| 60 | 62 |
&& !name.toLowerCase().contains("recommendid")
|
| 61 | 63 |
&& !name.toLowerCase().contains("mbernm")
|
--- src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java
+++ src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java
... | ... | @@ -197,6 +197,7 @@ |
| 197 | 197 |
private int pictSendCount; |
| 198 | 198 |
private int atSendCount; |
| 199 | 199 |
private int ftSendCount; |
| 200 |
+ private int faxSendCount; |
|
| 200 | 201 |
|
| 201 | 202 |
private String searchDelayMsgYn; |
| 202 | 203 |
|
... | ... | @@ -1612,6 +1613,12 @@ |
| 1612 | 1613 |
public void setFtSendCount(int ftSendCount) {
|
| 1613 | 1614 |
this.ftSendCount = ftSendCount; |
| 1614 | 1615 |
} |
| 1616 |
+ public int getFaxSendCount() {
|
|
| 1617 |
+ return faxSendCount; |
|
| 1618 |
+ } |
|
| 1619 |
+ public void setFaxSendCount(int faxSendCount) {
|
|
| 1620 |
+ this.faxSendCount = faxSendCount; |
|
| 1621 |
+ } |
|
| 1615 | 1622 |
public int getSuccSendCnt() {
|
| 1616 | 1623 |
return succSendCnt; |
| 1617 | 1624 |
} |
--- src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataService.java
+++ src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataService.java
... | ... | @@ -173,4 +173,8 @@ |
| 173 | 173 |
//대용량 문자 전송시 사용자 마지막 PK 값 조회하기 |
| 174 | 174 |
public String selectMsgUserLastIdgen(MjonMsgVO mjonMsgVO) throws Exception; |
| 175 | 175 |
|
| 176 |
+ //팩스 거래명세서 합산 정보 |
|
| 177 |
+ public List<MjonMsgVO> selectPayUserSumFaxList(MjonMsgVO mjonMsgVO) throws Exception; |
|
| 178 |
+ |
|
| 179 |
+ |
|
| 176 | 180 |
} |
--- src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataDAO.java
+++ src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataDAO.java
... | ... | @@ -351,4 +351,9 @@ |
| 351 | 351 |
return (String) select("mjonMsgDAO.selectMsgUserLastIdgen", mjonMsgVO);
|
| 352 | 352 |
} |
| 353 | 353 |
|
| 354 |
+ @SuppressWarnings("unchecked")
|
|
| 355 |
+ public List<MjonMsgVO> selectPayUserSumFaxList(MjonMsgVO mjonMsgVO) throws Exception{
|
|
| 356 |
+ return (List<MjonMsgVO>) list("mjonMsgDAO.selectPayUserSumFaxList",mjonMsgVO);
|
|
| 357 |
+ } |
|
| 358 |
+ |
|
| 354 | 359 |
} |
--- src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java
+++ src/main/java/itn/let/mjo/msgdata/service/impl/MjonMsgDataServiceImpl.java
... | ... | @@ -3182,5 +3182,8 @@ |
| 3182 | 3182 |
return mjonMsgDataDAO.selectMsgUserLastIdgen(mjonMsgVO); |
| 3183 | 3183 |
} |
| 3184 | 3184 |
|
| 3185 |
- |
|
| 3185 |
+ @Override |
|
| 3186 |
+ public List<MjonMsgVO> selectPayUserSumFaxList(MjonMsgVO mjonMsgVO) throws Exception {
|
|
| 3187 |
+ return mjonMsgDataDAO.selectPayUserSumFaxList(mjonMsgVO); |
|
| 3188 |
+ } |
|
| 3186 | 3189 |
} |
--- src/main/java/itn/let/mjo/pay/web/MjonPayController.java
+++ src/main/java/itn/let/mjo/pay/web/MjonPayController.java
... | ... | @@ -4793,31 +4793,54 @@ |
| 4793 | 4793 |
Date maxRegDate = null; |
| 4794 | 4794 |
int i = 0; |
| 4795 | 4795 |
|
| 4796 |
+ String pageType = mjonMsgVO.getPageType(); |
|
| 4797 |
+ |
|
| 4796 | 4798 |
SimpleDateFormat transFormat = new SimpleDateFormat("yyyy-MM-dd");
|
| 4797 |
- List<MjonMsgVO> payUserSumList = mjonMsgDataService.selectPayUserSumList(mjonMsgVO); |
|
| 4798 |
- for(MjonMsgVO item : payUserSumList) {
|
|
| 4799 |
- sendSumCount = sendSumCount + (item.getShtSendCount() + item.getLongSendCount() + item.getPictSendCount() + item.getAtSendCount() + item.getFtSendCount()); |
|
| 4800 |
- supplySumPrice += item.getSupplyPrice(); |
|
| 4801 |
- vatSumPrice += item.getVatPrice(); |
|
| 4802 |
- totalSumPrice += item.getTotalPrice(); |
|
| 4799 |
+ List<MjonMsgVO> payUserSumList = new ArrayList<MjonMsgVO>(); |
|
| 4800 |
+ |
|
| 4801 |
+ if(!pageType.equals("fax")) {
|
|
| 4802 |
+ payUserSumList = mjonMsgDataService.selectPayUserSumList(mjonMsgVO); |
|
| 4803 |
+ for(MjonMsgVO item : payUserSumList) {
|
|
| 4804 |
+ sendSumCount = sendSumCount + (item.getShtSendCount() + item.getLongSendCount() + item.getPictSendCount() + item.getAtSendCount() + item.getFtSendCount() + item.getFaxSendCount()); |
|
| 4805 |
+ supplySumPrice += item.getSupplyPrice(); |
|
| 4806 |
+ vatSumPrice += item.getVatPrice(); |
|
| 4807 |
+ totalSumPrice += item.getTotalPrice(); |
|
| 4803 | 4808 |
|
| 4804 |
- // 시작일, 종료일 |
|
| 4805 |
- if (i == 0) {
|
|
| 4806 |
- minRegDate = transFormat.parse(item.getMinRegDate()); |
|
| 4807 |
- maxRegDate = transFormat.parse(item.getMaxRegDate()); |
|
| 4808 |
- } |
|
| 4809 |
- else {
|
|
| 4810 |
- if(minRegDate.after(transFormat.parse(item.getMinRegDate()))) {
|
|
| 4811 |
- minRegDate = transFormat.parse(item.getMinRegDate()); |
|
| 4812 |
- } |
|
| 4813 |
- |
|
| 4814 |
- if(maxRegDate.before(transFormat.parse(item.getMaxRegDate()))) {
|
|
| 4815 |
- maxRegDate = transFormat.parse(item.getMaxRegDate()); |
|
| 4816 |
- } |
|
| 4817 |
- } |
|
| 4809 |
+ // 시작일, 종료일 |
|
| 4810 |
+ if (i == 0) {
|
|
| 4811 |
+ minRegDate = transFormat.parse(item.getMinRegDate()); |
|
| 4812 |
+ maxRegDate = transFormat.parse(item.getMaxRegDate()); |
|
| 4813 |
+ } |
|
| 4814 |
+ else {
|
|
| 4815 |
+ if(minRegDate.after(transFormat.parse(item.getMinRegDate()))) {
|
|
| 4816 |
+ minRegDate = transFormat.parse(item.getMinRegDate()); |
|
| 4817 |
+ } |
|
| 4818 |
+ |
|
| 4819 |
+ if(maxRegDate.before(transFormat.parse(item.getMaxRegDate()))) {
|
|
| 4820 |
+ maxRegDate = transFormat.parse(item.getMaxRegDate()); |
|
| 4821 |
+ } |
|
| 4822 |
+ } |
|
| 4823 |
+ |
|
| 4824 |
+ i++; |
|
| 4825 |
+ } |
|
| 4826 |
+ } |
|
| 4827 |
+ |
|
| 4828 |
+ //팩스 내용 불러오기 |
|
| 4829 |
+ List<MjonMsgVO> payUserSumFaxList = new ArrayList<MjonMsgVO>(); |
|
| 4830 |
+ |
|
| 4831 |
+ if(pageType.equals("") || pageType.equals("fax")) {
|
|
| 4832 |
+ //팩스 정보 불러오기 |
|
| 4833 |
+ payUserSumFaxList = mjonMsgDataService.selectPayUserSumFaxList(mjonMsgVO); |
|
| 4818 | 4834 |
|
| 4819 |
- i++; |
|
| 4835 |
+ //총 사용금액에 팩스 금액 합산해주기 |
|
| 4836 |
+ for(MjonMsgVO item : payUserSumFaxList) {
|
|
| 4837 |
+ supplySumPrice += item.getSupplyPrice(); |
|
| 4838 |
+ totalSumPrice += item.getTotalPrice(); |
|
| 4839 |
+ |
|
| 4840 |
+ } |
|
| 4820 | 4841 |
} |
| 4842 |
+ |
|
| 4843 |
+ model.addAttribute("payUserSumFaxList", payUserSumFaxList);
|
|
| 4821 | 4844 |
|
| 4822 | 4845 |
// 현재 날짜 구하기 (시스템 시계, 시스템 타임존) |
| 4823 | 4846 |
LocalDate now = LocalDate.now(); |
... | ... | @@ -4893,7 +4916,7 @@ |
| 4893 | 4916 |
|
| 4894 | 4917 |
model.addAttribute("addTax", decFormat.format(addTax));
|
| 4895 | 4918 |
model.addAttribute("addTaxSumPrice", decFormat.format(addTax+totalSumPrice));
|
| 4896 |
- |
|
| 4919 |
+ model.addAttribute("pageType", mjonMsgVO.getPageType());
|
|
| 4897 | 4920 |
|
| 4898 | 4921 |
return "/web/pay/MsgPrintUsageDetailsPopUp"; |
| 4899 | 4922 |
} |
... | ... | @@ -4947,7 +4970,7 @@ |
| 4947 | 4970 |
|
| 4948 | 4971 |
i++; |
| 4949 | 4972 |
} |
| 4950 |
- |
|
| 4973 |
+ |
|
| 4951 | 4974 |
// 현재 날짜 구하기 (시스템 시계, 시스템 타임존) |
| 4952 | 4975 |
LocalDate now = LocalDate.now(); |
| 4953 | 4976 |
int year = now.getYear(); |
... | ... | @@ -5011,7 +5034,6 @@ |
| 5011 | 5034 |
model.addAttribute("mberNm", mberNm);
|
| 5012 | 5035 |
model.addAttribute("managerNm", managerNm);
|
| 5013 | 5036 |
model.addAttribute("moblphonNo", moblphonNo);
|
| 5014 |
- |
|
| 5015 | 5037 |
|
| 5016 | 5038 |
return "/web/pay/MsgPrintUsageDetailsPopUp"; |
| 5017 | 5039 |
} |
... | ... | @@ -5040,31 +5062,56 @@ |
| 5040 | 5062 |
Date maxRegDate = null; |
| 5041 | 5063 |
int i = 0; |
| 5042 | 5064 |
|
| 5065 |
+ String pageType = mjonMsgVO.getPageType(); |
|
| 5066 |
+ |
|
| 5043 | 5067 |
SimpleDateFormat transFormat = new SimpleDateFormat("yyyy-MM-dd");
|
| 5044 |
- List<MjonMsgVO> payUserSumList = mjonMsgDataService.selectPayUserSumList(mjonMsgVO); |
|
| 5045 |
- for(MjonMsgVO item : payUserSumList) {
|
|
| 5046 |
- sendSumCount = sendSumCount + (item.getShtSendCount() + item.getLongSendCount() + item.getPictSendCount() + item.getAtSendCount() + item.getFtSendCount()); |
|
| 5047 |
- supplySumPrice += item.getSupplyPrice(); |
|
| 5048 |
- vatSumPrice += item.getVatPrice(); |
|
| 5049 |
- totalSumPrice += item.getTotalPrice(); |
|
| 5050 |
- |
|
| 5051 |
- // 시작일, 종료일 |
|
| 5052 |
- if (i == 0) {
|
|
| 5053 |
- minRegDate = transFormat.parse(item.getMinRegDate()); |
|
| 5054 |
- maxRegDate = transFormat.parse(item.getMaxRegDate()); |
|
| 5055 |
- } |
|
| 5056 |
- else {
|
|
| 5057 |
- if(minRegDate.after(transFormat.parse(item.getMinRegDate()))) {
|
|
| 5058 |
- minRegDate = transFormat.parse(item.getMinRegDate()); |
|
| 5059 |
- } |
|
| 5068 |
+ List<MjonMsgVO> payUserSumList = new ArrayList<MjonMsgVO>(); |
|
| 5069 |
+ |
|
| 5070 |
+ if(!pageType.equals("fax")) {
|
|
| 5071 |
+ |
|
| 5072 |
+ payUserSumList = mjonMsgDataService.selectPayUserSumList(mjonMsgVO); |
|
| 5073 |
+ for(MjonMsgVO item : payUserSumList) {
|
|
| 5074 |
+ sendSumCount = sendSumCount + (item.getShtSendCount() + item.getLongSendCount() + item.getPictSendCount() + item.getAtSendCount() + item.getFtSendCount()); |
|
| 5075 |
+ supplySumPrice += item.getSupplyPrice(); |
|
| 5076 |
+ vatSumPrice += item.getVatPrice(); |
|
| 5077 |
+ totalSumPrice += item.getTotalPrice(); |
|
| 5060 | 5078 |
|
| 5061 |
- if(maxRegDate.before(transFormat.parse(item.getMaxRegDate()))) {
|
|
| 5079 |
+ // 시작일, 종료일 |
|
| 5080 |
+ if (i == 0) {
|
|
| 5081 |
+ minRegDate = transFormat.parse(item.getMinRegDate()); |
|
| 5062 | 5082 |
maxRegDate = transFormat.parse(item.getMaxRegDate()); |
| 5063 |
- } |
|
| 5083 |
+ } |
|
| 5084 |
+ else {
|
|
| 5085 |
+ if(minRegDate.after(transFormat.parse(item.getMinRegDate()))) {
|
|
| 5086 |
+ minRegDate = transFormat.parse(item.getMinRegDate()); |
|
| 5087 |
+ } |
|
| 5088 |
+ |
|
| 5089 |
+ if(maxRegDate.before(transFormat.parse(item.getMaxRegDate()))) {
|
|
| 5090 |
+ maxRegDate = transFormat.parse(item.getMaxRegDate()); |
|
| 5091 |
+ } |
|
| 5092 |
+ } |
|
| 5093 |
+ |
|
| 5094 |
+ i++; |
|
| 5064 | 5095 |
} |
| 5065 | 5096 |
|
| 5066 |
- i++; |
|
| 5097 |
+ } |
|
| 5098 |
+ |
|
| 5099 |
+ //팩스 내용 불러오기 |
|
| 5100 |
+ List<MjonMsgVO> payUserSumFaxList = new ArrayList<MjonMsgVO>(); |
|
| 5101 |
+ |
|
| 5102 |
+ if(pageType.equals("") || pageType.equals("fax")) {
|
|
| 5103 |
+ //팩스 정보 불러오기 |
|
| 5104 |
+ payUserSumFaxList = mjonMsgDataService.selectPayUserSumFaxList(mjonMsgVO); |
|
| 5105 |
+ |
|
| 5106 |
+ //총 사용금액에 팩스 금액 합산해주기 |
|
| 5107 |
+ for(MjonMsgVO item : payUserSumFaxList) {
|
|
| 5108 |
+ supplySumPrice += item.getSupplyPrice(); |
|
| 5109 |
+ totalSumPrice += item.getTotalPrice(); |
|
| 5110 |
+ |
|
| 5111 |
+ } |
|
| 5067 | 5112 |
} |
| 5113 |
+ |
|
| 5114 |
+ model.addAttribute("payUserSumFaxList", payUserSumFaxList);
|
|
| 5068 | 5115 |
|
| 5069 | 5116 |
// 현재 날짜 구하기 (시스템 시계, 시스템 타임존) |
| 5070 | 5117 |
LocalDate now = LocalDate.now(); |
... | ... | @@ -5141,6 +5188,7 @@ |
| 5141 | 5188 |
|
| 5142 | 5189 |
model.addAttribute("addTax", decFormat.format(addTax));
|
| 5143 | 5190 |
model.addAttribute("addTaxSumPrice", decFormat.format(addTax+totalSumPrice));
|
| 5191 |
+ model.addAttribute("pageType", mjonMsgVO.getPageType());
|
|
| 5144 | 5192 |
|
| 5145 | 5193 |
return "/web/pay/MsgPrintStatementPopUp"; |
| 5146 | 5194 |
} |
--- src/main/java/itn/let/uat/uia/web/EgovLoginController.java
+++ src/main/java/itn/let/uat/uia/web/EgovLoginController.java
... | ... | @@ -2682,15 +2682,10 @@ |
| 2682 | 2682 |
|
| 2683 | 2683 |
boolean TorF = usedNmList.size() > 0 ? true : false; |
| 2684 | 2684 |
|
| 2685 |
- System.out.println(TorF); |
|
| 2686 |
- System.out.println(TorF); |
|
| 2687 |
- System.out.println(TorF); |
|
| 2688 | 2685 |
|
| 2689 | 2686 |
if (!TorF) {
|
| 2690 |
- System.out.println(TorF); |
|
| 2691 |
- System.out.println(TorF); |
|
| 2692 | 2687 |
|
| 2693 |
- modelAndView.addObject("message", "입력하신 아이디/이름/휴대폰 번호 정보에 맞는 회원이 없습니다.");
|
|
| 2688 |
+ modelAndView.addObject("message", "입력하신 아이디/이름/휴대폰 번호에 맞는 회원 정보가 없습니다.");
|
|
| 2694 | 2689 |
modelAndView.addObject("result", "fail-check");
|
| 2695 | 2690 |
modelAndView.addObject("resultSts", "0");
|
| 2696 | 2691 |
modelAndView.addObject("resultBlockSts", "0");
|
... | ... | @@ -2700,7 +2695,17 @@ |
| 2700 | 2695 |
|
| 2701 | 2696 |
|
| 2702 | 2697 |
if(!usedNmList.get(0).getMberSttus().equals("Y")) {
|
| 2703 |
- modelAndView.addObject("message", "입력하신 아이디/이름/휴대폰 번호 정보에 맞는 회원이 없습니다.");
|
|
| 2698 |
+ |
|
| 2699 |
+ String mberSttus = usedNmList.get(0).getMberSttus(); |
|
| 2700 |
+ String message = ""; |
|
| 2701 |
+ if(mberSttus.equals("B")) {
|
|
| 2702 |
+ message = "문자온 이용이 정지 된 회원 정보입니다."; |
|
| 2703 |
+ |
|
| 2704 |
+ }else {
|
|
| 2705 |
+ message = "문자온에서 탈퇴한 회원 정보입니다."; |
|
| 2706 |
+ } |
|
| 2707 |
+ |
|
| 2708 |
+ modelAndView.addObject("message", message);
|
|
| 2704 | 2709 |
modelAndView.addObject("result", "fail-check");
|
| 2705 | 2710 |
modelAndView.addObject("resultSts", "0");
|
| 2706 | 2711 |
modelAndView.addObject("resultBlockSts", "0");
|
... | ... | @@ -3373,15 +3378,10 @@ |
| 3373 | 3378 |
|
| 3374 | 3379 |
boolean TorF = usedNmList.size() > 0 ? true : false; |
| 3375 | 3380 |
|
| 3376 |
- System.out.println(TorF); |
|
| 3377 |
- System.out.println(TorF); |
|
| 3378 |
- System.out.println(TorF); |
|
| 3379 | 3381 |
|
| 3380 | 3382 |
if (!TorF) {
|
| 3381 |
- System.out.println(TorF); |
|
| 3382 |
- System.out.println(TorF); |
|
| 3383 | 3383 |
|
| 3384 |
- modelAndView.addObject("message", "입력하신 아이디/이름/이메일 정보에 맞는 회원이 없습니다.");
|
|
| 3384 |
+ modelAndView.addObject("message", "입력하신 아이디/이름/휴대폰 번호에 맞는 회원 정보가 없습니다.");
|
|
| 3385 | 3385 |
modelAndView.addObject("result", "fail-check");
|
| 3386 | 3386 |
modelAndView.addObject("resultSts", "0");
|
| 3387 | 3387 |
modelAndView.addObject("resultBlockSts", "0");
|
... | ... | @@ -3390,7 +3390,17 @@ |
| 3390 | 3390 |
} |
| 3391 | 3391 |
|
| 3392 | 3392 |
if(!usedNmList.get(0).getMberSttus().equals("Y")) {
|
| 3393 |
- modelAndView.addObject("message", "입력하신 아이디/이름/휴대폰 번호 정보에 맞는 회원이 없습니다.");
|
|
| 3393 |
+ |
|
| 3394 |
+ String mberSttus = usedNmList.get(0).getMberSttus(); |
|
| 3395 |
+ String message = ""; |
|
| 3396 |
+ if(mberSttus.equals("B")) {
|
|
| 3397 |
+ message = "문자온 이용이 정지 된 회원 정보입니다."; |
|
| 3398 |
+ |
|
| 3399 |
+ }else {
|
|
| 3400 |
+ message = "문자온에서 탈퇴한 회원 정보입니다."; |
|
| 3401 |
+ } |
|
| 3402 |
+ |
|
| 3403 |
+ modelAndView.addObject("message", message);
|
|
| 3394 | 3404 |
modelAndView.addObject("result", "fail-check");
|
| 3395 | 3405 |
modelAndView.addObject("resultSts", "0");
|
| 3396 | 3406 |
modelAndView.addObject("resultBlockSts", "0");
|
--- src/main/java/itn/let/uat/uia/web/EgovMypageController.java
+++ src/main/java/itn/let/uat/uia/web/EgovMypageController.java
... | ... | @@ -1629,6 +1629,9 @@ |
| 1629 | 1629 |
model.addAttribute("rejectCnt", rejectCnt);
|
| 1630 | 1630 |
model.addAttribute("compCnt", compCnt);
|
| 1631 | 1631 |
|
| 1632 |
+ MberManageVO mberManageVO = mjonMsgDataService.selectMberManageInfo(userId); |
|
| 1633 |
+ model.addAttribute("mberManageVO", mberManageVO);
|
|
| 1634 |
+ |
|
| 1632 | 1635 |
return "web/user/sendNumberListAjax"; |
| 1633 | 1636 |
} |
| 1634 | 1637 |
|
--- src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
... | ... | @@ -3617,6 +3617,47 @@ |
| 3617 | 3617 |
ORDER BY M.orderByCode |
| 3618 | 3618 |
</select> |
| 3619 | 3619 |
|
| 3620 |
+ <select id="mjonMsgDAO.selectPayUserSumFaxList" parameterClass="mjonMsgVO" resultClass="mjonMsgVO"> |
|
| 3621 |
+ |
|
| 3622 |
+ SELECT |
|
| 3623 |
+ MAX(DATE_FORMAT(M.REQ_DATE, '%Y-%m-%d' )) AS maxRegDate |
|
| 3624 |
+ , MIN(DATE_FORMAT(M.REQ_DATE, '%Y-%m-%d' )) AS minRegDate |
|
| 3625 |
+ , M.msgTypeName |
|
| 3626 |
+ , SUM(SentEA) AS ftSendCount |
|
| 3627 |
+ <!-- , SUM(M.MSG_GROUP_CNT) AS sendCount --> |
|
| 3628 |
+ , ifnull(TRUNCATE(SUM(supplyPrice) , 0), 0) AS supplyPrice |
|
| 3629 |
+ , 0 AS vatPrice |
|
| 3630 |
+ , ifnull(TRUNCATE(SUM(M.TOT_PRICE) , 0), 0) AS totalPrice |
|
| 3631 |
+ FROM ( |
|
| 3632 |
+ SELECT pf.ReqDate AS REGDATE |
|
| 3633 |
+ , pf.ReqDate AS REQ_DATE |
|
| 3634 |
+ , mjf.FAX_GROUP_CNT AS MSG_GROUP_CNT |
|
| 3635 |
+ , SentEA |
|
| 3636 |
+ , (mjf.EACH_PRICE * mjf.FAX_GROUP_CNT) AS supplyPrice |
|
| 3637 |
+ , mjf.EACH_PRICE |
|
| 3638 |
+ , mjf.TOT_PRICE |
|
| 3639 |
+ , "팩스" AS msgTypeName |
|
| 3640 |
+ FROM pgi_faxtran pf |
|
| 3641 |
+ LEFT JOIN mj_fax_group_data mjf |
|
| 3642 |
+ ON pf.seq = mjf.PGI_FAXTRAN_SEQ |
|
| 3643 |
+ LEFT JOIN mj_fax_convert_mng mjc |
|
| 3644 |
+ ON mjf.CONVERT_MNG_SEQ = mjc.CONVERT_MNG_SEQ |
|
| 3645 |
+ WHERE 1 = 1 |
|
| 3646 |
+ AND pf.SentEA > 0 |
|
| 3647 |
+ AND mjf.USER_ID = #userId# |
|
| 3648 |
+ <isNotEmpty property="startDate"> |
|
| 3649 |
+ AND <![CDATA[ DATE_FORMAT(pf.ReqDate, '%Y-%m-%d') >= DATE_FORMAT(#startDate#, '%Y-%m-%d') ]]> |
|
| 3650 |
+ </isNotEmpty> |
|
| 3651 |
+ <isNotEmpty property="endDate"> |
|
| 3652 |
+ AND <![CDATA[ DATE_FORMAT(pf.ReqDate, '%Y-%m-%d') <= DATE_FORMAT(#endDate#, '%Y-%m-%d') ]]> |
|
| 3653 |
+ </isNotEmpty> |
|
| 3654 |
+ )M |
|
| 3655 |
+ WHERE 1=1 |
|
| 3656 |
+ </select> |
|
| 3657 |
+ |
|
| 3658 |
+ |
|
| 3659 |
+ |
|
| 3660 |
+ |
|
| 3620 | 3661 |
<insert id="mjonMsgDAO.insertSysMsgLog" parameterClass="SendLogVO"> |
| 3621 | 3662 |
INSERT |
| 3622 | 3663 |
INTO mj_system_send |
--- src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
+++ src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
... | ... | @@ -963,15 +963,15 @@ |
| 963 | 963 |
<ul> |
| 964 | 964 |
<li> |
| 965 | 965 |
<div class="img_box"><img src="/publish/images/content/junk_agency001.png" alt="SK telecom" /></div> |
| 966 |
- <a href="http://www.tworld.co.kr/normal.do?serviceId=S_PROD2001&viewId=V_PROD7070&prod_id=NA00002121&uCode=u1_2" target="_blank" rel="nosublink">T월드 문자 스팸필터링 바로가기</a> |
|
| 966 |
+ <a href="http://www.tworld.co.kr/normal.do?serviceId=S_PROD2001&viewId=V_PROD7070&prod_id=NA00002121&uCode=u1_2" target="_blank" >T월드 문자 스팸필터링 바로가기</a> |
|
| 967 | 967 |
</li> |
| 968 | 968 |
<li> |
| 969 | 969 |
<div class="img_box"><img src="/publish/images/content/junk_agency002.png" alt="olleh KT" /></div> |
| 970 |
- <a href="https://product.kt.com/wDic/productDetail.do?ItemCode=479" target="_blank" rel="nosublink">KT (안심)스팸차단 바로가기</a> |
|
| 970 |
+ <a href="https://product.kt.com/wDic/productDetail.do?ItemCode=479" target="_blank" >KT (안심)스팸차단 바로가기</a> |
|
| 971 | 971 |
</li> |
| 972 | 972 |
<li> |
| 973 | 973 |
<div class="img_box"><img src="/publish/images/content/junk_agency003.png" alt="LG U+" /></div> |
| 974 |
- <a href="https://www.lguplus.com/plan/addon/addon-call-msg/LRZ0000277" target="_blank" rel="nosublink">U+ 스팸차단 바로가기</a> |
|
| 974 |
+ <a href="https://www.lguplus.com/plan/addon/addon-call-msg/LRZ0000277" target="_blank" >U+ 스팸차단 바로가기</a> |
|
| 975 | 975 |
</li> |
| 976 | 976 |
</ul> |
| 977 | 977 |
</li> |
... | ... | @@ -979,7 +979,7 @@ |
| 979 | 979 |
<dl> |
| 980 | 980 |
<dt><img src="/publish/images/content/junk_agency001_01.png" alt="T world" /></dt> |
| 981 | 981 |
<dd> |
| 982 |
- <p>Tworld<a href="https://www.tworld.co.kr" target="_blank" rel="nosublink">(www.tworld.co.kr)</a> 홈페이지 접속 → 로그인 → [스팸필터링] 검색<br>→ 부가서비스 - 문자 스팸필터링 → 설정 → SMS인증 → 스팸차단 메시지 확인</p> |
|
| 982 |
+ <p>Tworld<a href="https://www.tworld.co.kr" target="_blank" >(www.tworld.co.kr)</a> 홈페이지 접속 → 로그인 → [스팸필터링] 검색<br>→ 부가서비스 - 문자 스팸필터링 → 설정 → SMS인증 → 스팸차단 메시지 확인</p> |
|
| 983 | 983 |
</dd> |
| 984 | 984 |
</dl> |
| 985 | 985 |
</li> |
... | ... | @@ -987,7 +987,7 @@ |
| 987 | 987 |
<dl> |
| 988 | 988 |
<dt><img src="/publish/images/content/junk_agency002_01.png" alt="olleh O" /></dt> |
| 989 | 989 |
<dd> |
| 990 |
- <p>KT<a href="https://www.kt.com/" target="_blank" rel="nosublink">(www.kt.com)</a> 홈페이지 접속 → 로그인 →[스팸차단서비스] 검색<br>→ 스팸차단서비스 → 스팸메시지함 → 스팸차단 메시지 확인</p> |
|
| 990 |
+ <p>KT<a href="https://www.kt.com/" target="_blank" >(www.kt.com)</a> 홈페이지 접속 → 로그인 →[스팸차단서비스] 검색<br>→ 스팸차단서비스 → 스팸메시지함 → 스팸차단 메시지 확인</p> |
|
| 991 | 991 |
</dd> |
| 992 | 992 |
</dl> |
| 993 | 993 |
</li> |
... | ... | @@ -995,7 +995,7 @@ |
| 995 | 995 |
<dl> |
| 996 | 996 |
<dt><img src="/publish/images/content/junk_agency003_01.png" alt="LG U+" /></dt> |
| 997 | 997 |
<dd> |
| 998 |
- <p>U+<a href="https://www.uplus.co.kr" target="_blank" rel="nosublink">(www.uplus.co.kr)</a> 홈페이지 접속 → 로그인 → [스팸차단] 검색<br>→ 부가서비스 - 스팸차단 → 스팸내역 조회 → SMS인증 → 스팸차단 메시지 확인</p> |
|
| 998 |
+ <p>U+<a href="https://www.uplus.co.kr" target="_blank" >(www.uplus.co.kr)</a> 홈페이지 접속 → 로그인 → [스팸차단] 검색<br>→ 부가서비스 - 스팸차단 → 스팸내역 조회 → SMS인증 → 스팸차단 메시지 확인</p> |
|
| 999 | 999 |
</dd> |
| 1000 | 1000 |
</dl> |
| 1001 | 1001 |
</li> |
... | ... | @@ -1062,15 +1062,15 @@ |
| 1062 | 1062 |
<ul> |
| 1063 | 1063 |
<li> |
| 1064 | 1064 |
<div class="img_box"><img src="/publish/images/content/junk_agency001.png" alt="SKT" /></div> |
| 1065 |
- <a href="http://www.tworld.co.kr/normal.do?serviceId=S_PROD2001&viewId=V_PROD7070&prod_id=NA00004406&uCode=u1_2" target="_blank" rel="nosublink">T번호도용문자차단 바로가기</a> |
|
| 1065 |
+ <a href="http://www.tworld.co.kr/normal.do?serviceId=S_PROD2001&viewId=V_PROD7070&prod_id=NA00004406&uCode=u1_2" target="_blank" >T번호도용문자차단 바로가기</a> |
|
| 1066 | 1066 |
</li> |
| 1067 | 1067 |
<li> |
| 1068 | 1068 |
<div class="img_box"><img src="/publish/images/content/junk_agency002.png" alt="KT" /></div> |
| 1069 |
- <a href="https://product.kt.com/wDic/productDetail.do?ItemCode=1047" target="_blank" rel="nosublink">KT번호도용문자차단 바로가기</a> |
|
| 1069 |
+ <a href="https://product.kt.com/wDic/productDetail.do?ItemCode=1047" target="_blank" >KT번호도용문자차단 바로가기</a> |
|
| 1070 | 1070 |
</li> |
| 1071 | 1071 |
<li> |
| 1072 | 1072 |
<div class="img_box"><img src="/publish/images/content/junk_agency003.png" alt="Uplus" /></div> |
| 1073 |
- <a href="https://www.lguplus.com/plan/addon/addon-call-msg/LRZ0002297" target="_blank" rel="nosublink">U+ 번호도용문자차단 바로가기</a> |
|
| 1073 |
+ <a href="https://www.lguplus.com/plan/addon/addon-call-msg/LRZ0002297" target="_blank" >U+ 번호도용문자차단 바로가기</a> |
|
| 1074 | 1074 |
</li> |
| 1075 | 1075 |
</ul> |
| 1076 | 1076 |
</li> |
... | ... | @@ -1078,7 +1078,7 @@ |
| 1078 | 1078 |
<dl> |
| 1079 | 1079 |
<dt><img src="/publish/images/content/junk_agency001_01.png" alt="tworld" /></dt> |
| 1080 | 1080 |
<dd> |
| 1081 |
- <p>Tworld<a href="https://www.tworld.co.kr" target="_blank" rel="nosublink">(www.tworld.co.kr)</a> 홈페이지 접속 → 로그인<br>→ [번호도용문자차단] 검색 → 부가서비스 → 번호도용문자차단 → 해지</p> |
|
| 1081 |
+ <p>Tworld<a href="https://www.tworld.co.kr" target="_blank" >(www.tworld.co.kr)</a> 홈페이지 접속 → 로그인<br>→ [번호도용문자차단] 검색 → 부가서비스 → 번호도용문자차단 → 해지</p> |
|
| 1082 | 1082 |
</dd> |
| 1083 | 1083 |
</dl> |
| 1084 | 1084 |
</li> |
... | ... | @@ -1086,7 +1086,7 @@ |
| 1086 | 1086 |
<dl> |
| 1087 | 1087 |
<dt><img src="/publish/images/content/junk_agency002_01.png" alt="kt" /></dt> |
| 1088 | 1088 |
<dd> |
| 1089 |
- <p>KT<a href="https://www.kt.com" target="_blank" rel="nosublink">(www.kt.com)</a> 홈페이지 접속 → 로그인<br>→ [번호도용문자차단] 검색 → 부가서비스 → 번호도용문자차단 → 해지</p> |
|
| 1089 |
+ <p>KT<a href="https://www.kt.com" target="_blank" >(www.kt.com)</a> 홈페이지 접속 → 로그인<br>→ [번호도용문자차단] 검색 → 부가서비스 → 번호도용문자차단 → 해지</p> |
|
| 1090 | 1090 |
</dd> |
| 1091 | 1091 |
</dl> |
| 1092 | 1092 |
</li> |
... | ... | @@ -1094,7 +1094,7 @@ |
| 1094 | 1094 |
<dl> |
| 1095 | 1095 |
<dt><img src="/publish/images/content/junk_agency003_01.png" alt="LGuplus" /></dt> |
| 1096 | 1096 |
<dd> |
| 1097 |
- <p>U+<a href="https://www.uplus.co.kr" target="_blank" rel="nosublink">(www.uplus.co.kr)</a> 홈페이지 접속 → 로그인 → [번호도용문자차단] 검색<br>→ 부가서비스 → 번호도용문자차단 → 해지</p> |
|
| 1097 |
+ <p>U+<a href="https://www.uplus.co.kr" target="_blank" >(www.uplus.co.kr)</a> 홈페이지 접속 → 로그인 → [번호도용문자차단] 검색<br>→ 부가서비스 → 번호도용문자차단 → 해지</p> |
|
| 1098 | 1098 |
</dd> |
| 1099 | 1099 |
</dl> |
| 1100 | 1100 |
</li> |
... | ... | @@ -1127,7 +1127,7 @@ |
| 1127 | 1127 |
|
| 1128 | 1128 |
<!-- skip 메뉴 --> |
| 1129 | 1129 |
<div class="skip_menu"> |
| 1130 |
- <a href="#cont" title="본문 바로가기" class="contGo" rel="nosublink">본문 바로가기</a> |
|
| 1130 |
+ <a href="#cont" title="본문 바로가기" class="contGo" >본문 바로가기</a> |
|
| 1131 | 1131 |
</div><!--// skip 메뉴 --> |
| 1132 | 1132 |
|
| 1133 | 1133 |
<!-- 요금안내 top 배너 시작 --> |
... | ... | @@ -1157,20 +1157,20 @@ |
| 1157 | 1157 |
<ul class="quickMenuIn"> |
| 1158 | 1158 |
<!-- |
| 1159 | 1159 |
<li> |
| 1160 |
- <a href="#" rel="nosublink"><i class="quick2"></i><span>카톡상담</span></a> |
|
| 1160 |
+ <a href="#" ><i class="quick2"></i><span>카톡상담</span></a> |
|
| 1161 | 1161 |
<div class="hover_cont">카톡상담</div> |
| 1162 | 1162 |
</li> |
| 1163 | 1163 |
<li> |
| 1164 |
- <a href="#" rel="nosublink"><i class="quick3"></i><span>원격지원</span></a> |
|
| 1164 |
+ <a href="#" ><i class="quick3"></i><span>원격지원</span></a> |
|
| 1165 | 1165 |
<div class="hover_cont">원격지원</div> |
| 1166 | 1166 |
</li> |
| 1167 | 1167 |
--> |
| 1168 | 1168 |
<li id="quickPayGuide"> |
| 1169 |
- <a href="/web/mjon/custom/selectMsgCustomView.do" rel="nosublink"><i class="quick4"></i><span>맞춤제작</span></a> |
|
| 1169 |
+ <a href="/web/mjon/custom/selectMsgCustomView.do" ><i class="quick4"></i><span>맞춤제작</span></a> |
|
| 1170 | 1170 |
<div class="hover_cont">맞춤제작</div> |
| 1171 | 1171 |
</li> |
| 1172 | 1172 |
<li> |
| 1173 |
- <a href="/web/mjon/addr/selectAddrList.do" rel="nosublink"><i class="quick10"></i><span>주소록 관리</span></a> |
|
| 1173 |
+ <a href="/web/mjon/addr/selectAddrList.do" ><i class="quick10"></i><span>주소록 관리</span></a> |
|
| 1174 | 1174 |
<div class="hover_cont">주소록 관리</div> |
| 1175 | 1175 |
</li> |
| 1176 | 1176 |
<li> |
... | ... | @@ -1182,25 +1182,25 @@ |
| 1182 | 1182 |
<div class="hover_cont">엑셀 대량전송</div> |
| 1183 | 1183 |
</li> |
| 1184 | 1184 |
<li> |
| 1185 |
- <a href="/web/api/intrdView.do" rel="nosublink"><i class="quick7"></i><span>문자연동</span></a> |
|
| 1185 |
+ <a href="/web/api/intrdView.do" ><i class="quick7"></i><span>문자연동</span></a> |
|
| 1186 | 1186 |
<div class="hover_cont">문자연동</div> |
| 1187 | 1187 |
</li> |
| 1188 | 1188 |
<li> |
| 1189 |
- <a href="/web/member/pay/PayList.do" rel="nosublink"><i class="quick8"></i><span>결제관리</span></a> |
|
| 1189 |
+ <a href="/web/member/pay/PayList.do" ><i class="quick8"></i><span>결제관리</span></a> |
|
| 1190 | 1190 |
<div class="hover_cont">결제관리</div> |
| 1191 | 1191 |
</li> |
| 1192 | 1192 |
<!-- |
| 1193 | 1193 |
<li> |
| 1194 |
- <a href="/web/member/pay/BillPub.do" rel="nosublink"><i class="quick9"></i><span>계산서/영수증</span></a> |
|
| 1194 |
+ <a href="/web/member/pay/BillPub.do" ><i class="quick9"></i><span>계산서/영수증</span></a> |
|
| 1195 | 1195 |
<div class="hover_cont">계산서/영수증</div> |
| 1196 | 1196 |
</li> |
| 1197 | 1197 |
--> |
| 1198 | 1198 |
<li> |
| 1199 |
- <a href="/web/member/pay/BillPub.do" rel="nosublink"><i class="quick9"></i><span>세금계산서</span></a> |
|
| 1199 |
+ <a href="/web/member/pay/BillPub.do" ><i class="quick9"></i><span>세금계산서</span></a> |
|
| 1200 | 1200 |
<div class="hover_cont">세금계산서</div> |
| 1201 | 1201 |
</li> |
| 1202 | 1202 |
<li class="cscenter"> |
| 1203 |
- <a href="/web/cop/bbs/NoticeList.do" rel="nosublink"><i class="quick11"></i><span>고객센터</span></a> |
|
| 1203 |
+ <a href="/web/cop/bbs/NoticeList.do" ><i class="quick11"></i><span>고객센터</span></a> |
|
| 1204 | 1204 |
<div class="hover_cont"> |
| 1205 | 1205 |
<div class="title">고객센터</div> |
| 1206 | 1206 |
<div class="number">1551-8011</div> |
... | ... | @@ -1211,15 +1211,15 @@ |
| 1211 | 1211 |
<li>· 토, 일요일 및 법정공휴일 휴무</li> |
| 1212 | 1212 |
</ul> |
| 1213 | 1213 |
<div class="cskakao"> |
| 1214 |
- <a href="http://pf.kakao.com/_PxoTtb/chat" class="kakao" target="_blank" rel="nosublink">카톡 상담</a> |
|
| 1215 |
- <a href="javascript:void(0);" class="remote" onclick="remotePop('https://939.co.kr/munjaon/');" rel="nosublink">원격지원</a>
|
|
| 1214 |
+ <a href="http://pf.kakao.com/_PxoTtb/chat" class="kakao" target="_blank" >카톡 상담</a> |
|
| 1215 |
+ <a href="javascript:void(0);" class="remote" onclick="remotePop('https://939.co.kr/munjaon/');" >원격지원</a>
|
|
| 1216 | 1216 |
</div> |
| 1217 | 1217 |
</div> |
| 1218 | 1218 |
</li> |
| 1219 | 1219 |
</ul> |
| 1220 | 1220 |
<button type="button" class="goTop" title="맨 위로 이동">TOP<i></i></button> |
| 1221 | 1221 |
</div> |
| 1222 |
- <div class="quick_kakaobtn<c:if test="${fn:contains(pageContext.request.requestURL , 'web/main/mainPage.do')}"> main</c:if>"><a href="http://pf.kakao.com/_PxoTtb/chat" target="_blank" rel="nosublink">카카오톡 상담</a></div>
|
|
| 1222 |
+ <div class="quick_kakaobtn<c:if test="${fn:contains(pageContext.request.requestURL , 'web/main/mainPage.do')}"> main</c:if>"><a href="http://pf.kakao.com/_PxoTtb/chat" target="_blank" >카카오톡 상담</a></div>
|
|
| 1223 | 1223 |
</div><!--// quick 메뉴 --> |
| 1224 | 1224 |
<!-- header 영역 --> |
| 1225 | 1225 |
|
... | ... | @@ -1282,16 +1282,16 @@ |
| 1282 | 1282 |
<div class="header_top"> |
| 1283 | 1283 |
<div class="inner"> |
| 1284 | 1284 |
<ul class="menu_left"> |
| 1285 |
- <li><a href="#" id="favorite" rel="nosublink"><i class="hdTop_fav"></i>즐겨찾기추가</a></li> |
|
| 1286 |
- <li><a href="<c:out value='/web/user/mberInfoIndex.do'/>" rel="nosublink"><i class="hdTop_mypage"></i>마이페이지</a></li> |
|
| 1287 |
- <li><a href="<c:out value='/web/cop/bbs/NoticeList.do'/>" rel="nosublink"><i class="hdTop_center"></i>고객센터</a></li> |
|
| 1285 |
+ <li><a href="#" id="favorite" ><i class="hdTop_fav"></i>즐겨찾기추가</a></li> |
|
| 1286 |
+ <li><a href="<c:out value='/web/user/mberInfoIndex.do'/>" ><i class="hdTop_mypage"></i>마이페이지</a></li> |
|
| 1287 |
+ <li><a href="<c:out value='/web/cop/bbs/NoticeList.do'/>" ><i class="hdTop_center"></i>고객센터</a></li> |
|
| 1288 | 1288 |
</ul> |
| 1289 | 1289 |
<ul class="menu_right"> |
| 1290 |
- <li><a href="#" onclick="location.href='/web/member/pay/PayView.do'" rel="nosublink">충전하기</a></li> |
|
| 1291 |
- <li class="SortLine"><a href="/web/pay/PayGuide.do" rel="nosublink">요금안내</a></li> |
|
| 1292 |
- <li class="SortLine"><a href="/web/cop/bbs/FaqList.do" rel="nosublink">이용안내</a></li> |
|
| 1293 |
- <li class="SortLine"><a href="/web/cop/bbs/QnaList.do" rel="nosublink">1:1 문의</a></li> |
|
| 1294 |
- <li class="SortLine"><a href="/web/cop/bbs/SuggestList.do" rel="nosublink">불편신고</a></li> |
|
| 1290 |
+ <li><a href="#" onclick="location.href='/web/member/pay/PayView.do'" >충전하기</a></li> |
|
| 1291 |
+ <li class="SortLine"><a href="/web/pay/PayGuide.do" >요금안내</a></li> |
|
| 1292 |
+ <li class="SortLine"><a href="/web/cop/bbs/FaqList.do" >이용안내</a></li> |
|
| 1293 |
+ <li class="SortLine"><a href="/web/cop/bbs/QnaList.do" >1:1 문의</a></li> |
|
| 1294 |
+ <li class="SortLine"><a href="/web/cop/bbs/SuggestList.do" >불편신고</a></li> |
|
| 1295 | 1295 |
</ul> |
| 1296 | 1296 |
</div> |
| 1297 | 1297 |
</div><!-- header top 영역 --> |
... | ... | @@ -1320,26 +1320,26 @@ |
| 1320 | 1320 |
<c:choose> |
| 1321 | 1321 |
<c:when test="${fn:contains(resultListOne.url, '/web/mjon/msgcampain/selectMsgDataView.do')}">
|
| 1322 | 1322 |
<c:if test="${userCandidateYn eq 'Y'}">
|
| 1323 |
- <a href="${empty resultListOne.url ? '#' : resultListOne.url }" rel="nosublink">${resultListOne.menuNm}</a>
|
|
| 1323 |
+ <a href="${empty resultListOne.url ? '#' : resultListOne.url }" >${resultListOne.menuNm}</a>
|
|
| 1324 | 1324 |
</c:if> |
| 1325 | 1325 |
</c:when> |
| 1326 | 1326 |
<c:when test="${fn:contains(resultListOne.url, '/web/mjon/alimtalk/kakaoAlimtalkMsgDataView.do')}">
|
| 1327 |
- <a href="${empty resultListOne.url ? '#' : resultListOne.url }" rel="nosublink">${resultListOne.menuNm}</a>
|
|
| 1327 |
+ <a href="${empty resultListOne.url ? '#' : resultListOne.url }" >${resultListOne.menuNm}</a>
|
|
| 1328 | 1328 |
</c:when> |
| 1329 | 1329 |
<c:when test="${fn:contains(resultListOne.url, '/web/mjon/fax/faxDataView.do')}">
|
| 1330 |
- <a href="${empty resultListOne.url ? '#' : resultListOne.url }" rel="nosublink">${resultListOne.menuNm}</a>
|
|
| 1330 |
+ <a href="${empty resultListOne.url ? '#' : resultListOne.url }" >${resultListOne.menuNm}</a>
|
|
| 1331 | 1331 |
</c:when> |
| 1332 | 1332 |
<c:when test="${fn:contains(resultListOne.url, '/web/mjon/custom/selectMsgCustomView.do')}">
|
| 1333 |
- <a href="${empty resultListOne.url ? '#' : resultListOne.url }" rel="nosublink">${resultListOne.menuNm}</a>
|
|
| 1333 |
+ <a href="${empty resultListOne.url ? '#' : resultListOne.url }" >${resultListOne.menuNm}</a>
|
|
| 1334 | 1334 |
</c:when> |
| 1335 | 1335 |
<c:when test="${fn:contains(resultListOne.url, '/web/mjon/addr/selectAddrList.do')}">
|
| 1336 |
- <a href="${empty resultListOne.url ? '#' : resultListOne.url }" rel="nosublink">${resultListOne.menuNm}</a>
|
|
| 1336 |
+ <a href="${empty resultListOne.url ? '#' : resultListOne.url }" >${resultListOne.menuNm}</a>
|
|
| 1337 | 1337 |
</c:when> |
| 1338 | 1338 |
<c:when test="${fn:contains(resultListOne.url, '/web/mjon/reservmsg/selectReservMsgView.do')}">
|
| 1339 |
- <a href="${empty resultListOne.url ? '#' : resultListOne.url }" rel="nosublink">${resultListOne.menuNm}</a>
|
|
| 1339 |
+ <a href="${empty resultListOne.url ? '#' : resultListOne.url }" >${resultListOne.menuNm}</a>
|
|
| 1340 | 1340 |
</c:when> |
| 1341 | 1341 |
<c:when test="${fn:contains(resultListOne.url, '/web/member/pay/PayList.do')}">
|
| 1342 |
- <a href="${empty resultListOne.url ? '#' : resultListOne.url }" rel="nosublink">${resultListOne.menuNm}</a>
|
|
| 1342 |
+ <a href="${empty resultListOne.url ? '#' : resultListOne.url }" >${resultListOne.menuNm}</a>
|
|
| 1343 | 1343 |
</c:when> |
| 1344 | 1344 |
<c:otherwise> |
| 1345 | 1345 |
<a href="${empty resultListOne.url ? '#' : resultListOne.url }">${resultListOne.menuNm}</a>
|
... | ... | @@ -1388,17 +1388,17 @@ |
| 1388 | 1388 |
<p><i></i>인기검색어</p> |
| 1389 | 1389 |
<!-- |
| 1390 | 1390 |
<ul class="popular_tag"> |
| 1391 |
- <li onClick="javascript:fnFavoritMsgSearch('5월'); return false;" rel="nosublink"><a href="#">#5월</a></li>
|
|
| 1392 |
- <li onClick="javascript:fnFavoritMsgSearch('경조사'); return false;" rel="nosublink"><a href="#">#경조사</a></li>
|
|
| 1393 |
- <li onClick="javascript:fnFavoritMsgSearch('사랑'); return false;" rel="nosublink"><a href="#">#사랑</a></li>
|
|
| 1394 |
- <li onClick="javascript:fnFavoritMsgSearch('봄'); return false;" rel="nosublink"><a href="#">#봄</a></li>
|
|
| 1391 |
+ <li onClick="javascript:fnFavoritMsgSearch('5월'); return false;" ><a href="#">#5월</a></li>
|
|
| 1392 |
+ <li onClick="javascript:fnFavoritMsgSearch('경조사'); return false;" ><a href="#">#경조사</a></li>
|
|
| 1393 |
+ <li onClick="javascript:fnFavoritMsgSearch('사랑'); return false;" ><a href="#">#사랑</a></li>
|
|
| 1394 |
+ <li onClick="javascript:fnFavoritMsgSearch('봄'); return false;" ><a href="#">#봄</a></li>
|
|
| 1395 | 1395 |
</ul> |
| 1396 | 1396 |
--> |
| 1397 | 1397 |
|
| 1398 | 1398 |
|
| 1399 | 1399 |
<ul class="popular_tag"> |
| 1400 | 1400 |
<c:forEach var="favoritWord" items="${resultSearchWordList}" varStatus="status">
|
| 1401 |
- <li onClick="javascript:fnFavoritMsgSearch('${favoritWord.searchWord}'); return false;" rel="nosublink"><a href="#">#${favoritWord.searchWord}</a></li>
|
|
| 1401 |
+ <li onClick="javascript:fnFavoritMsgSearch('${favoritWord.searchWord}'); return false;" ><a href="#">#${favoritWord.searchWord}</a></li>
|
|
| 1402 | 1402 |
</c:forEach> |
| 1403 | 1403 |
</ul> |
| 1404 | 1404 |
|
... | ... | @@ -1425,11 +1425,11 @@ |
| 1425 | 1425 |
</dl> |
| 1426 | 1426 |
<c:if test="${userCandidateYn eq 'Y' }">
|
| 1427 | 1427 |
<dl> |
| 1428 |
- <dt><a href="<c:out value='/web/mjon/msgcampain/selectMsgDataView.do'/>" rel="nosublink">선거문자</a></dt> |
|
| 1428 |
+ <dt><a href="<c:out value='/web/mjon/msgcampain/selectMsgDataView.do'/>" >선거문자</a></dt> |
|
| 1429 | 1429 |
<dd> |
| 1430 | 1430 |
<ul> |
| 1431 | 1431 |
<li><a href="<c:out value='/web/mjon/msgcampain/selectMsgDataView.do'/>">단체문자</a></li> |
| 1432 |
- <li><a href="<c:out value='/web/mjon/msgcampain/selectMsgTWDataView.do'/>" rel="nosublink">20건 문자</a></li> |
|
| 1432 |
+ <li><a href="<c:out value='/web/mjon/msgcampain/selectMsgTWDataView.do'/>" >20건 문자</a></li> |
|
| 1433 | 1433 |
</ul> |
| 1434 | 1434 |
</dd> |
| 1435 | 1435 |
</dl> |
... | ... | @@ -1439,52 +1439,52 @@ |
| 1439 | 1439 |
<dd> |
| 1440 | 1440 |
<ul> |
| 1441 | 1441 |
<li><a href="<c:out value='/web/mjon/alimtalk/kakaoAlimtalkMsgDataView.do'/>">알림톡</a></li> |
| 1442 |
- <li><a href="<c:out value='/web/mjon/kakao/stepinfo/selectKaKaoStepInfo.do'/>" rel="nosublink">카카오톡 설정</a></li> |
|
| 1443 |
- <li><a href="<c:out value='/web/mjon/kakao/alimtalk/kakaoAlimtalkIntrdView.do'/>" rel="nosublink">알림톡 소개</a></li> |
|
| 1442 |
+ <li><a href="<c:out value='/web/mjon/kakao/stepinfo/selectKaKaoStepInfo.do'/>" >카카오톡 설정</a></li> |
|
| 1443 |
+ <li><a href="<c:out value='/web/mjon/kakao/alimtalk/kakaoAlimtalkIntrdView.do'/>" >알림톡 소개</a></li> |
|
| 1444 | 1444 |
</ul> |
| 1445 | 1445 |
</dd> |
| 1446 | 1446 |
</dl> |
| 1447 | 1447 |
</li> |
| 1448 | 1448 |
<li> |
| 1449 | 1449 |
<dl> |
| 1450 |
- <dt><a href="<c:out value='/web/mjon/custom/selectMsgCustomView.do'/>" rel="nosublink">맞춤제작</a></dt> |
|
| 1450 |
+ <dt><a href="<c:out value='/web/mjon/custom/selectMsgCustomView.do'/>" >맞춤제작</a></dt> |
|
| 1451 | 1451 |
<dd> |
| 1452 | 1452 |
<ul> |
| 1453 |
- <li><a href="<c:out value='/web/mjon/custom/selectMsgCustomView.do'/>" rel="nosublink">맞춤제작 샘플</a></li> |
|
| 1454 |
- <li><a href="<c:out value='/web/mjon/custom/selectMsgCustomView.do?tap=2'/>" rel="nosublink">제작방법 및 이용안내</a></li> |
|
| 1455 |
- <li><a href="<c:out value='/web/mjon/custom/selectMsgCustomView.do?tap=3'/>" rel="nosublink">내보관함</a></li> |
|
| 1453 |
+ <li><a href="<c:out value='/web/mjon/custom/selectMsgCustomView.do'/>" >맞춤제작 샘플</a></li> |
|
| 1454 |
+ <li><a href="<c:out value='/web/mjon/custom/selectMsgCustomView.do?tap=2'/>" >제작방법 및 이용안내</a></li> |
|
| 1455 |
+ <li><a href="<c:out value='/web/mjon/custom/selectMsgCustomView.do?tap=3'/>" >내보관함</a></li> |
|
| 1456 | 1456 |
</ul> |
| 1457 | 1457 |
</dd> |
| 1458 | 1458 |
</dl> |
| 1459 | 1459 |
<dl> |
| 1460 |
- <dt><a href="/web/info/mjonInfo.do" rel="nosublink">문자온소개</a></dt> |
|
| 1460 |
+ <dt><a href="/web/info/mjonInfo.do" >문자온소개</a></dt> |
|
| 1461 | 1461 |
<dd> |
| 1462 | 1462 |
<ul> |
| 1463 |
- <li><a href="/web/info/mjonInfo.do" rel="nosublink">서비스 소개</a></li> |
|
| 1464 |
- <li><a href="/web/info/mjonFunc.do" rel="nosublink">주요기능</a></li> |
|
| 1465 |
- <li><a href="/web/mjon/msgdata/selectBestMsgDataView.do" rel="nosublink">베스트문자샘플</a></li> |
|
| 1463 |
+ <li><a href="/web/info/mjonInfo.do" >서비스 소개</a></li> |
|
| 1464 |
+ <li><a href="/web/info/mjonFunc.do" >주요기능</a></li> |
|
| 1465 |
+ <li><a href="/web/mjon/msgdata/selectBestMsgDataView.do" >베스트문자샘플</a></li> |
|
| 1466 | 1466 |
</ul> |
| 1467 | 1467 |
</dd> |
| 1468 | 1468 |
</dl> |
| 1469 | 1469 |
<dl> |
| 1470 |
- <dt><a href="/web/info/mjonInfo.do" rel="nosublink">팩스전송</a></dt> |
|
| 1470 |
+ <dt><a href="/web/info/mjonInfo.do" >팩스전송</a></dt> |
|
| 1471 | 1471 |
<dd> |
| 1472 | 1472 |
<ul> |
| 1473 | 1473 |
<li><a href="/web/mjon/fax/faxDataView.do">팩스전송</a></li> |
| 1474 |
- <li><a href="/web/mjon/fax/faxSendList.do" rel="nosublink">팩스전송내역</a></li> |
|
| 1474 |
+ <li><a href="/web/mjon/fax/faxSendList.do" >팩스전송내역</a></li> |
|
| 1475 | 1475 |
</ul> |
| 1476 | 1476 |
</dd> |
| 1477 | 1477 |
</dl> |
| 1478 | 1478 |
</li> |
| 1479 | 1479 |
<li> |
| 1480 | 1480 |
<dl> |
| 1481 |
- <dt><a href="<c:out value='/web/mjon/addr/selectAddrList.do'/>" rel="nosublink">주소록관리</a></dt> |
|
| 1481 |
+ <dt><a href="<c:out value='/web/mjon/addr/selectAddrList.do'/>" >주소록관리</a></dt> |
|
| 1482 | 1482 |
<dd> |
| 1483 | 1483 |
<ul> |
| 1484 |
- <li><a href="<c:out value='/web/mjon/addr/selectAddrList.do'/>" rel="nosublink">주소록관리</a></li> |
|
| 1485 |
- <li><a href="<c:out value='/web/mjon/addrBlock/selectBlockList.do'/>" rel="nosublink">수신거부</a></li> |
|
| 1486 |
- <li><a href="<c:out value='/web/mjon/addr/addrMobGuide.do'/>" rel="nosublink">폰주소록 등록</a></li> |
|
| 1487 |
- <li><a href="<c:out value='/web/mjon/addragency/selectAddrAgencyList.do'/>" rel="nosublink">주소록 입력 대행(무료)</a></li> |
|
| 1484 |
+ <li><a href="<c:out value='/web/mjon/addr/selectAddrList.do'/>" >주소록관리</a></li> |
|
| 1485 |
+ <li><a href="<c:out value='/web/mjon/addrBlock/selectBlockList.do'/>" >수신거부</a></li> |
|
| 1486 |
+ <li><a href="<c:out value='/web/mjon/addr/addrMobGuide.do'/>" >폰주소록 등록</a></li> |
|
| 1487 |
+ <li><a href="<c:out value='/web/mjon/addragency/selectAddrAgencyList.do'/>" >주소록 입력 대행(무료)</a></li> |
|
| 1488 | 1488 |
</ul> |
| 1489 | 1489 |
</dd> |
| 1490 | 1490 |
</dl> |
... | ... | @@ -1509,51 +1509,51 @@ |
| 1509 | 1509 |
</li> |
| 1510 | 1510 |
<li> |
| 1511 | 1511 |
<dl> |
| 1512 |
- <dt><a href="<c:out value='/web/user/mberInfoIndex.do'/>" rel="nosublink">마이페이지</a></dt> |
|
| 1512 |
+ <dt><a href="<c:out value='/web/user/mberInfoIndex.do'/>" >마이페이지</a></dt> |
|
| 1513 | 1513 |
<dd> |
| 1514 | 1514 |
<ul> |
| 1515 |
- <li><a href="<c:out value='/web/user/mberInfoChange.do'/>" rel="nosublink">회원정보 변경</a></li> |
|
| 1515 |
+ <li><a href="<c:out value='/web/user/mberInfoChange.do'/>" >회원정보 변경</a></li> |
|
| 1516 | 1516 |
<!-- 개인회원 일때만 노출되는 영역 --> |
| 1517 | 1517 |
<c:if test="${not empty LoginVO && LoginVO.dept eq 'p'}">
|
| 1518 |
- <li><a href="<c:out value='/web/user/membershipChange.do'/>" rel="nosublink">기업회원 전환</a></li> |
|
| 1518 |
+ <li><a href="<c:out value='/web/user/membershipChange.do'/>" >기업회원 전환</a></li> |
|
| 1519 | 1519 |
</c:if> |
| 1520 |
- <li><a href="<c:out value='/web/user/passwordChange.do'/>" rel="nosublink">비밀번호 변경</a></li> |
|
| 1521 |
- <li><a href="<c:out value='/web/user/sendNumberManage.do'/>" rel="nosublink">발신번호 관리</a></li> |
|
| 1522 |
- <li><a href="<c:out value='/web/user/notifyManage.do'/>" rel="nosublink">알림설정</a></li> |
|
| 1523 |
- <%-- <li><a href="<c:out value='/web/user/mberSecession.do'/>" rel="nosublink">회원탈퇴</a></li> --%> |
|
| 1524 |
- <li><a href="<c:out value='/web/user/kisaReport.do'/>" rel="nosublink">KISA 신고</a></li> |
|
| 1520 |
+ <li><a href="<c:out value='/web/user/passwordChange.do'/>" >비밀번호 변경</a></li> |
|
| 1521 |
+ <li><a href="<c:out value='/web/user/sendNumberManage.do'/>" >발신번호 관리</a></li> |
|
| 1522 |
+ <li><a href="<c:out value='/web/user/notifyManage.do'/>" >알림설정</a></li> |
|
| 1523 |
+ <%-- <li><a href="<c:out value='/web/user/mberSecession.do'/>" >회원탈퇴</a></li> --%> |
|
| 1524 |
+ <li><a href="<c:out value='/web/user/kisaReport.do'/>" >KISA 신고</a></li> |
|
| 1525 | 1525 |
</ul> |
| 1526 | 1526 |
</dd> |
| 1527 | 1527 |
</dl> |
| 1528 | 1528 |
</li> |
| 1529 | 1529 |
<li> |
| 1530 | 1530 |
<dl> |
| 1531 |
- <dt><a href="<c:out value='/web/member/pay/PayList.do'/>" rel="nosublink">결제관리</a></dt> |
|
| 1531 |
+ <dt><a href="<c:out value='/web/member/pay/PayList.do'/>" >결제관리</a></dt> |
|
| 1532 | 1532 |
<dd> |
| 1533 | 1533 |
<ul> |
| 1534 |
- <li><a href="<c:out value='/web/pay/PayGuide.do'/>" rel="nosublink">요금안내/견적내기</a></li> |
|
| 1535 |
- <li><a href="<c:out value='/web/member/pay/PayView.do'/>" rel="nosublink">결제하기</a></li> |
|
| 1536 |
- <li><a href="<c:out value='/web/member/pay/PayList.do'/>" rel="nosublink">요금 결제내역</a></li> |
|
| 1537 |
- <li><a href="<c:out value='/web/member/pay/PayUserSWList.do'/>" rel="nosublink">요금 사용내역</a></li> |
|
| 1534 |
+ <li><a href="<c:out value='/web/pay/PayGuide.do'/>" >요금안내/견적내기</a></li> |
|
| 1535 |
+ <li><a href="<c:out value='/web/member/pay/PayView.do'/>" >결제하기</a></li> |
|
| 1536 |
+ <li><a href="<c:out value='/web/member/pay/PayList.do'/>" >요금 결제내역</a></li> |
|
| 1537 |
+ <li><a href="<c:out value='/web/member/pay/PayUserSWList.do'/>" >요금 사용내역</a></li> |
|
| 1538 | 1538 |
<!-- 현금영수증 자동발행 주석 --> |
| 1539 |
- <%-- <li><a href="<c:out value='/web/member/pay/BillPub.do'/>" rel="nosublink">계산서/현금영수증 발행 등록</a></li> --%> |
|
| 1540 |
- <li><a href="<c:out value='/web/member/pay/BillPub.do'/>" rel="nosublink">세금계산서 발행</a></li> |
|
| 1539 |
+ <%-- <li><a href="<c:out value='/web/member/pay/BillPub.do'/>" >계산서/현금영수증 발행 등록</a></li> --%> |
|
| 1540 |
+ <li><a href="<c:out value='/web/member/pay/BillPub.do'/>" >세금계산서 발행</a></li> |
|
| 1541 | 1541 |
</ul> |
| 1542 | 1542 |
</dd> |
| 1543 | 1543 |
</dl> |
| 1544 | 1544 |
</li> |
| 1545 | 1545 |
<li> |
| 1546 | 1546 |
<dl> |
| 1547 |
- <dt><a href="<c:out value='/web/cop/bbs/NoticeList.do'/>" rel="nosublink">고객센터</a></dt> |
|
| 1547 |
+ <dt><a href="<c:out value='/web/cop/bbs/NoticeList.do'/>" >고객센터</a></dt> |
|
| 1548 | 1548 |
<dd> |
| 1549 | 1549 |
<ul> |
| 1550 |
- <li><a href="<c:out value='/web/cop/bbs/NoticeList.do'/>" rel="nosublink">공지사항</a></li> |
|
| 1551 |
- <li><a href="<c:out value='/web/cop/bbs/TermsList.do'/>" rel="nosublink">이용약관</a></li> |
|
| 1552 |
- <li><a href="<c:out value='/web/cop/bbs/FaqList.do'/>" rel="nosublink">자주하는 질문</a></li> |
|
| 1553 |
- <li><a href="<c:out value='/web/cop/bbs/QnaList.do'/>" rel="nosublink">1:1 문의</a></li> |
|
| 1554 |
- <li><a href="<c:out value='/web/cop/bbs/SuggestList.do'/>" rel="nosublink">불편신고</a></li> |
|
| 1555 |
- <li><a href="<c:out value='/web/cop/bbs/EventList.do'/>" rel="nosublink">이벤트</a></li> |
|
| 1556 |
- <li><a href="javascript:void(0);" onclick="remotePop('https://939.co.kr/munjaon/');" rel="nosublink">원격지원</a></li>
|
|
| 1550 |
+ <li><a href="<c:out value='/web/cop/bbs/NoticeList.do'/>" >공지사항</a></li> |
|
| 1551 |
+ <li><a href="<c:out value='/web/cop/bbs/TermsList.do'/>" >이용약관</a></li> |
|
| 1552 |
+ <li><a href="<c:out value='/web/cop/bbs/FaqList.do'/>" >자주하는 질문</a></li> |
|
| 1553 |
+ <li><a href="<c:out value='/web/cop/bbs/QnaList.do'/>" >1:1 문의</a></li> |
|
| 1554 |
+ <li><a href="<c:out value='/web/cop/bbs/SuggestList.do'/>" >불편신고</a></li> |
|
| 1555 |
+ <li><a href="<c:out value='/web/cop/bbs/EventList.do'/>" >이벤트</a></li> |
|
| 1556 |
+ <li><a href="javascript:void(0);" onclick="remotePop('https://939.co.kr/munjaon/');" >원격지원</a></li>
|
|
| 1557 | 1557 |
</ul> |
| 1558 | 1558 |
</dd> |
| 1559 | 1559 |
</dl> |
... | ... | @@ -1595,9 +1595,9 @@ |
| 1595 | 1595 |
<label for="save_id">아이디 저장</label> |
| 1596 | 1596 |
</div> |
| 1597 | 1597 |
<div class="login_find"> |
| 1598 |
- <a href="<c:url value='/web/user/findUserId.do'/>" rel="nosublink">아이디찾기</a> |
|
| 1598 |
+ <a href="<c:url value='/web/user/findUserId.do'/>" >아이디찾기</a> |
|
| 1599 | 1599 |
/ |
| 1600 |
- <a href="<c:url value='/web/user/rePassword.do'/>" rel="nosublink">비밀번호 재설정</a> |
|
| 1600 |
+ <a href="<c:url value='/web/user/rePassword.do'/>" >비밀번호 재설정</a> |
|
| 1601 | 1601 |
</div> |
| 1602 | 1602 |
<div> |
| 1603 | 1603 |
<button type="button" class="btnType btnType2" onclick="location.href='/web/user/login/selectUserDept.do'">회원가입</button> |
--- src/main/webapp/WEB-INF/jsp/web/login/findUserId.jsp
+++ src/main/webapp/WEB-INF/jsp/web/login/findUserId.jsp
... | ... | @@ -151,15 +151,15 @@ |
| 151 | 151 |
if(data.userSttus =="Y"){
|
| 152 | 152 |
kmcPopUp(); |
| 153 | 153 |
}else if(data.userSttus =="N"){
|
| 154 |
- alert("탈퇴한 회원입니다.");
|
|
| 154 |
+ alert("문자온에서 탈퇴한 회원 정보입니다.");
|
|
| 155 | 155 |
userCheck = false; |
| 156 | 156 |
return userCheck; |
| 157 | 157 |
}else if(data.userSttus == "B"){
|
| 158 |
- alert("이용정지 회원입니다.");
|
|
| 158 |
+ alert("문자온 이용이 정지 된 회원 정보입니다.");
|
|
| 159 | 159 |
userCheck = false; |
| 160 | 160 |
return userCheck; |
| 161 | 161 |
}else if(data.userSttus == null){
|
| 162 |
- alert("입력하신 아이디/이름 정보에 맞는 회원이 없습니다.");
|
|
| 162 |
+ alert("입력하신 아이디/이름에 맞는 회원 정보가 없습니다.");
|
|
| 163 | 163 |
userCheck = false; |
| 164 | 164 |
return userCheck; |
| 165 | 165 |
} |
--- src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintStatementPopUp.jsp
+++ src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintStatementPopUp.jsp
... | ... | @@ -156,8 +156,7 @@ |
| 156 | 156 |
</tr> |
| 157 | 157 |
</thead> |
| 158 | 158 |
<tbody> |
| 159 |
- <c:choose> |
|
| 160 |
- <c:when test="${not empty resultList}">
|
|
| 159 |
+ <c:if test="${pageType != 'fax'}">
|
|
| 161 | 160 |
<c:forEach var="result" items="${resultList}" varStatus="status">
|
| 162 | 161 |
<tr> |
| 163 | 162 |
<td>${result.msgTypeName}</td>
|
... | ... | @@ -195,17 +194,36 @@ |
| 195 | 194 |
<fmt:formatNumber type="number" maxFractionDigits="3" value="${result.totalPrice}" var="totalPrice" />
|
| 196 | 195 |
<c:out value="${totalPrice}"/>
|
| 197 | 196 |
</td> |
| 198 |
- </tr> |
|
| 197 |
+ </tr> |
|
| 199 | 198 |
</c:forEach> |
| 200 |
- </c:when> |
|
| 201 |
- <c:otherwise> |
|
| 199 |
+ </c:if> |
|
| 200 |
+ |
|
| 201 |
+ <c:if test="${empty pageType || pageType == 'fax'}">
|
|
| 202 |
+ <c:forEach var="resultFax" items="${payUserSumFaxList}" varStatus="status">
|
|
| 203 |
+ <tr> |
|
| 204 |
+ <td>${resultFax.msgTypeName}</td>
|
|
| 205 |
+ <td> |
|
| 206 |
+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.ftSendCount}" var="ftSendCount" />
|
|
| 207 |
+ <c:out value="${ftSendCount}"/>
|
|
| 208 |
+ </td> |
|
| 209 |
+ <td> |
|
| 210 |
+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.supplyPrice}" var="supplyPrice" />
|
|
| 211 |
+ <c:out value="${supplyPrice}"/>
|
|
| 212 |
+ </td> |
|
| 213 |
+ <td> |
|
| 214 |
+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.totalPrice}" var="totalPrice" />
|
|
| 215 |
+ <c:out value="${totalPrice}"/>
|
|
| 216 |
+ </td> |
|
| 217 |
+ </tr> |
|
| 218 |
+ </c:forEach> |
|
| 219 |
+ </c:if> |
|
| 220 |
+ <c:if test="${empty resultList && empty payUserSumFaxList}">
|
|
| 202 | 221 |
<tr> |
| 203 | 222 |
<td colspan="5"> |
| 204 | 223 |
거래내역이 없습니다. |
| 205 | 224 |
</td> |
| 206 | 225 |
</tr> |
| 207 |
- </c:otherwise> |
|
| 208 |
- </c:choose> |
|
| 226 |
+ </c:if> |
|
| 209 | 227 |
</tbody> |
| 210 | 228 |
</table> |
| 211 | 229 |
</div> |
--- src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp
+++ src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp
... | ... | @@ -114,8 +114,7 @@ |
| 114 | 114 |
</tr> |
| 115 | 115 |
</thead> |
| 116 | 116 |
<tbody> |
| 117 |
- <c:choose> |
|
| 118 |
- <c:when test="${not empty resultList}">
|
|
| 117 |
+ <c:if test="${pageType != 'fax'}">
|
|
| 119 | 118 |
<c:forEach var="result" items="${resultList}" varStatus="status">
|
| 120 | 119 |
<tr> |
| 121 | 120 |
<td>${result.msgTypeName}</td>
|
... | ... | @@ -155,15 +154,33 @@ |
| 155 | 154 |
</td> |
| 156 | 155 |
</tr> |
| 157 | 156 |
</c:forEach> |
| 158 |
- </c:when> |
|
| 159 |
- <c:otherwise> |
|
| 157 |
+ </c:if> |
|
| 158 |
+ <c:if test="${empty pageType || pageType == 'fax'}">
|
|
| 159 |
+ <c:forEach var="resultFax" items="${payUserSumFaxList}" varStatus="status">
|
|
| 160 |
+ <tr> |
|
| 161 |
+ <td>${resultFax.msgTypeName}</td>
|
|
| 162 |
+ <td> |
|
| 163 |
+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.ftSendCount}" var="ftSendCount" />
|
|
| 164 |
+ <c:out value="${ftSendCount}"/>
|
|
| 165 |
+ </td> |
|
| 166 |
+ <td> |
|
| 167 |
+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.supplyPrice}" var="supplyPrice" />
|
|
| 168 |
+ <c:out value="${supplyPrice}"/>
|
|
| 169 |
+ </td> |
|
| 170 |
+ <td> |
|
| 171 |
+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.totalPrice}" var="totalPrice" />
|
|
| 172 |
+ <c:out value="${totalPrice}"/>
|
|
| 173 |
+ </td> |
|
| 174 |
+ </tr> |
|
| 175 |
+ </c:forEach> |
|
| 176 |
+ </c:if> |
|
| 177 |
+ <c:if test="${ empty resultList && empty payUserSumFaxList}">
|
|
| 160 | 178 |
<tr> |
| 161 | 179 |
<td colspan="4"> |
| 162 | 180 |
사용내역이 없습니다. |
| 163 | 181 |
</td> |
| 164 | 182 |
</tr> |
| 165 |
- </c:otherwise> |
|
| 166 |
- </c:choose> |
|
| 183 |
+ </c:if> |
|
| 167 | 184 |
</tbody> |
| 168 | 185 |
</table> |
| 169 | 186 |
</div> |
... | ... | @@ -182,7 +199,7 @@ |
| 182 | 199 |
<td><span>${supplySumPrice}</span></td>
|
| 183 | 200 |
</tr> |
| 184 | 201 |
<c:choose> |
| 185 |
- <c:when test="${not empty resultList}">
|
|
| 202 |
+ <c:when test="${not empty resultList || not empty payUserSumFaxList}">
|
|
| 186 | 203 |
<c:choose> |
| 187 | 204 |
<c:when test="${searchVO.addVatType eq 'N'}">
|
| 188 | 205 |
<tr class="total_price"> |
... | ... | @@ -203,11 +220,13 @@ |
| 203 | 220 |
</c:choose> |
| 204 | 221 |
</c:when> |
| 205 | 222 |
<c:otherwise> |
| 206 |
- <tr> |
|
| 207 |
- <td colspan="5"> |
|
| 208 |
- 사용내역이 없습니다. |
|
| 209 |
- </td> |
|
| 210 |
- </tr> |
|
| 223 |
+ <c:if test="${ empty resultList && empty payUserSumFaxList}">
|
|
| 224 |
+ <tr> |
|
| 225 |
+ <td colspan="5"> |
|
| 226 |
+ 사용내역이 없습니다. |
|
| 227 |
+ </td> |
|
| 228 |
+ </tr> |
|
| 229 |
+ </c:if> |
|
| 211 | 230 |
</c:otherwise> |
| 212 | 231 |
</c:choose> |
| 213 | 232 |
</tbody> |
--- src/main/webapp/WEB-INF/jsp/web/user/sendNumberListAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/user/sendNumberListAjax.jsp
... | ... | @@ -236,11 +236,11 @@ |
| 236 | 236 |
<caption>발신번호 관리 표</caption> |
| 237 | 237 |
<colgroup> |
| 238 | 238 |
<col style="width: 40px;"> |
| 239 |
- <col style="width: 13%;"> |
|
| 239 |
+ <col style="width: 10%;"> |
|
| 240 | 240 |
<col style="width: 11%;"> |
| 241 | 241 |
<col style="width: auto;"> |
| 242 | 242 |
<col style="width: 10%;"> |
| 243 |
- <col style="width: 15%;"> |
|
| 243 |
+ <col style="width: 10%;"> |
|
| 244 | 244 |
<col style="width: 15%;"> |
| 245 | 245 |
<col style="width: 10%;"> |
| 246 | 246 |
<col style="width: 10%;"> |
... | ... | @@ -310,7 +310,14 @@ |
| 310 | 310 |
</td> |
| 311 | 311 |
<td class="input_wrap2"> |
| 312 | 312 |
<label for="" class="label">발신번호명</label> |
| 313 |
- <input type="text" value="<c:out value="${sendNumberInfo.userName}"/>" readonly="">
|
|
| 313 |
+ <%-- |
|
| 314 |
+ - 20240822 기업회원 전환인 경우 변경된 회사명이 나와야하는 부분이 있어서 일단 화면에서만 이름을 변경해서 보여주기로 함. |
|
| 315 |
+ - 개인/기업 회원 정보의 mberNm 컬럼 값을 보여줌 , 데이터베이스를 변경하지는 않음 |
|
| 316 |
+ |
|
| 317 |
+ <input type="text" value="<c:out value="${sendNumberInfo.userName}"/>" readonly="">
|
|
| 318 |
+ --%> |
|
| 319 |
+ <input type="text" value="<c:out value="${mberManageVO.mberNm}"/>" readonly="">
|
|
| 320 |
+ |
|
| 314 | 321 |
</td> |
| 315 | 322 |
<td> |
| 316 | 323 |
<ec:code code="${sendNumberInfo.phmAuthType}" codeId="ITN027"/>
|
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?