Merge branch 'master' of http://hylee@vcs.iten.co.kr:9999/hylee/mjon_git

Conflicts:
	src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java

src/main/java/itn/com/cmm/LoginVO.java

@@ -112,6 +112,14 @@ public class LoginVO implements Serializable{
 	//관리자 SMS 문자인증 여부( Y : 문자인증함, N : 문자인증 안함)
 	private String outerCertYn;
 	
+	private String dormantYn; // 휴먼회원여부 ( N:일반회원,  Y:휴먼회원)
+	
+	public String getDormantYn() {
+		return dormantYn;
+	}
+	public void setDormantYn(String dormantYn) {
+		this.dormantYn = dormantYn;
+	}
 	public String getLoginYn() {
 		return loginYn;
 	}

src/main/java/itn/com/cmm/interceptor/IPIgnoreInterceptorHandler.java

@@ -125,7 +125,7 @@ public class IPIgnoreInterceptorHandler extends HandlerInterceptorAdapter{
 	            	Date currentTime = new Date ();
 	            	String mTime = mSimpleDateFormat.format ( currentTime );
 	        		HttpServletRequest req = ((ServletRequestAttributes)RequestContextHolder.currentRequestAttributes()).getRequest();
-	                String ip = req.getHeader("X-FORWARDED-FOR");
+	                String ip = req.getHeader("X-Forwarded-For") == null ? req.getHeader("X-Forwarded-For") : req.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim();
 	                if (ip == null){ ip = req.getRemoteAddr();}
 	                
 	                LoginLog loginLog = new LoginLog();
@@ -223,31 +223,31 @@ public class IPIgnoreInterceptorHandler extends HandlerInterceptorAdapter{
     	String ip = "";
     	
     	try {
-            ip = request.getHeader("X-Forwarded-For");
+            ip = request.getHeader("X-Forwarded-For") == null ? request.getHeader("X-Forwarded-For") : request.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim();
             //logger.info("> X-FORWARDED-FOR : " + ip);
-            //System.out.println("> X-FORWARDED-FOR : " + ip);
+            System.out.println("> X-FORWARDED-FOR : " + ip);
 
             if (ip == null) {
                 ip = request.getHeader("Proxy-Client-IP");
-                //System.out.println("> Proxy-Client-IP : " + ip);
+                System.out.println("> Proxy-Client-IP : " + ip);
             }
             if (ip == null) {
                 ip = request.getHeader("WL-Proxy-Client-IP");
-                //System.out.println(">  WL-Proxy-Client-IP : " + ip);
+                System.out.println(">  WL-Proxy-Client-IP : " + ip);
             }
             if (ip == null) {
                 ip = request.getHeader("HTTP_CLIENT_IP");
-                //System.out.println("> HTTP_CLIENT_IP : " + ip);
+                System.out.println("> HTTP_CLIENT_IP : " + ip);
             }
             if (ip == null) {
                 ip = request.getHeader("HTTP_X_FORWARDED_FOR");
-                //System.out.println("> HTTP_X_FORWARDED_FOR : " + ip);
+                System.out.println("> HTTP_X_FORWARDED_FOR : " + ip);
             }
             if (ip == null) {
                 ip = request.getRemoteAddr();
-                //System.out.println("> getRemoteAddr : "+ip);
+                System.out.println("> getRemoteAddr : "+ip);
             }
-            //System.out.println("> Result : IP Address : "+ip);    		
+            System.out.println("> Result : IP Address : "+ip);    		
     	}catch(Exception ex)
     	{
     		ex.printStackTrace();

src/main/java/itn/com/cmm/interceptor/ipCheck/IPCheckInterceptor.java

@@ -34,7 +34,7 @@ public class IPCheckInterceptor implements HandlerInterceptor, Constants {
 	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
 			throws Exception {
-		String clientIp = request.getHeader("X-Forwarded-For");
+		String clientIp = request.getHeader("X-Forwarded-For") == null ? request.getHeader("X-Forwarded-For") : request.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim();
 	    if (ObjectUtils.isEmpty(clientIp) || "unknown".equalsIgnoreCase(clientIp)) {
 	        clientIp = request.getHeader("Proxy-Client-IP");
 	    }

src/main/java/itn/com/cmm/util/IpUtil.java

@@ -22,7 +22,7 @@ import javax.servlet.http.HttpServletRequest;
 
 public class IpUtil {
 	public static String getClientIP(HttpServletRequest request) {
-        String userip = request.getHeader("X-Forwarded-For"); // 아이피 가져오기 아파치 아래에 웹로직이 있을경우
+        String userip = request.getHeader("X-Forwarded-For") == null ? request.getHeader("X-Forwarded-For") : request.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim(); // 아이피 가져오기 아파치 아래에 웹로직이 있을경우
          
         if ( userip == null  || "".equals(userip) ) { // 아이피 가져오기 , 바로 웹로직이 있을경우
             userip = request.getRemoteAddr();

src/main/java/itn/com/cmm/util/PdfUtil.java

@@ -1,12 +1,22 @@
 package itn.com.cmm.util;
 
+import java.awt.Image;
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.util.UUID;
 
+import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.io.FileUtils;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
+
 /**
  * 
  * @author 		: 이호영
@@ -88,4 +98,53 @@ public final class PdfUtil {
 	}
     
     
+	public static String makeImgPdf(String imgDir,String extsn) throws Exception {
+        PDDocument doc = new PDDocument();
+        String uuid = UUID.randomUUID().toString();
+        try {
+        	File copy1 = new File(imgDir);
+            File copy2 = new File(imgDir + "." +extsn);
+            
+            
+            FileUtils.copyFile(copy1, copy2);
+            File imgFiles = new File(imgDir + "." +extsn);
+            Image img = ImageIO.read(imgFiles);
+            
+           PDPage page = new PDPage(PDRectangle.A4);   
+            doc.addPage(page);
+             
+            PDImageXObject pdImage = PDImageXObject.createFromFile(imgFiles.toString(), doc);
+            int pageWidth = Math.round(page.getCropBox().getWidth());
+            int pageHeight = Math.round(page.getCropBox().getHeight());
+            
+            float imgRatio = 1;
+            if ( pageWidth < img.getWidth(null)) {
+                imgRatio = (float)img.getWidth(null) / (float)pageWidth;
+            }
+            
+            int imgWidth = Math.round(img.getWidth(null) / imgRatio);
+            int imgHeight = Math.round(img.getHeight(null) / imgRatio);
+            
+            int pageWidthPosition = (pageWidth - imgWidth) / 2;
+            int pageHeightPosition = (pageWidth - imgWidth) / 2;
+            
+            PDPageContentStream contents = new PDPageContentStream(doc, page);
+            contents.drawImage(pdImage, pageWidthPosition, pageHeightPosition, imgWidth, imgHeight);
+            contents.close();
+            doc.save("/usr/local/tomcat/file/sht/pdf/" + uuid + ".pdf");
+            
+        } catch (Exception e) {
+            System.out.println("Exception! : " + e.getMessage());
+        }
+     
+        try {
+            doc.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+     
+        return uuid + ".pdf";
+    }
+
+    
 }

src/main/java/itn/com/cmm/web/EgovFileDownloadController.java

@@ -452,4 +452,75 @@ public class EgovFileDownloadController {
 		}
 	}
 	
+	
+	/**
+	 * 첨부파일로 등록된 파일에 대하여 다운로드를 제공한다.
+	 *
+	 * @param commandMap
+	 * @param response
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/cmm/fms/FileDowntest.do")
+	public void FileDowntest(@RequestParam Map<String, Object> commandMap, HttpServletRequest request, HttpServletResponse response) throws Exception {
+
+		String fileNm = (String) commandMap.get("fileNm");
+			try {
+				
+			
+			File uFile = new File("/usr/local/tomcat/file/sht/pdf/", fileNm);
+			long fSize = uFile.length();
+
+			if (fSize > 0) {
+				String mimetype = "application/x-msdownload";
+
+				response.setContentType(mimetype);
+				setDisposition(fileNm, request, response);
+				//response.setContentLength(fSize);
+
+				BufferedInputStream in = null;
+				BufferedOutputStream out = null;
+
+				try {
+					in = new BufferedInputStream(new FileInputStream(uFile));
+					out = new BufferedOutputStream(response.getOutputStream());
+
+					FileCopyUtils.copy(in, out);
+					out.flush();
+				} catch (Exception ex) {
+					LOGGER.debug("IGNORED: {}", ex.getMessage());
+				} finally {
+					if (in != null) {
+						try {
+							in.close();
+						} catch (Exception ignore) {
+							LOGGER.debug("IGNORED: {}", ignore.getMessage());
+						}
+					}
+					if (out != null) {
+						try {
+							out.close();
+						} catch (Exception ignore) {
+							LOGGER.debug("IGNORED: {}", ignore.getMessage());
+						}
+					}
+				}
+
+			} else {
+				response.setContentType("application/x-msdownload");
+
+				PrintWriter printwriter = response.getWriter();
+				printwriter.println("<html>");
+				printwriter.println("<br><br><br><h2>Could not get file name:<br>" + fileNm + "</h2>");
+				printwriter.println("<br><br><br><center><h3><a href='javascript: history.go(-1)'>Back</a></h3></center>");
+				printwriter.println("<br><br><br>&copy; webAccess");
+				printwriter.println("</html>");
+				printwriter.flush();
+				printwriter.close();
+			}
+			
+			} catch (Exception e) {
+				System.out.println(e.getMessage());
+			}
+	}
+	
 }

src/main/java/itn/let/cop/bbs/web/EgovBBSManageController.java

@@ -314,7 +314,7 @@ public class EgovBBSManageController {
 		model.addAttribute("paginationInfo", paginationInfo);
 
 		//임시 데이터 이관용
-		/*String ip = request.getHeader("X-Forwarded-For");
+		/*String ip = request.getHeader("X-Forwarded-For") == null ? request.getHeader("X-Forwarded-For") : request.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim();
 		if (ip == null) ip = request.getRemoteAddr();
 		
 		String ddd = "";
@@ -809,7 +809,7 @@ public class EgovBBSManageController {
 		vo.setCodeId("ITN015");
 		model.addAttribute("codeList", cmmUseService.selectCmmCodeDetail(vo));
 		//임시 데이터 이관용
-		/*String ip = request.getHeader("X-Forwarded-For");
+		/*String ip = request.getHeader("X-Forwarded-For") == null ? request.getHeader("X-Forwarded-For") : request.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim();
 		if (ip == null) ip = request.getRemoteAddr();
 		
 		String ddd = "";
@@ -1038,7 +1038,7 @@ public class EgovBBSManageController {
 		model.addAttribute("codeList", cmmUseService.selectCmmCodeDetail(vo));
 		
 		//임시 데이터 이관용
-		String ip = request.getHeader("X-Forwarded-For");
+		String ip = request.getHeader("X-Forwarded-For") == null ? request.getHeader("X-Forwarded-For") : request.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim();
 		if (ip == null) ip = request.getRemoteAddr();
 		if("219.240.88.15".equals(ip) || "0:0:0:0:0:0:0:1".equals(ip)) {
 			model.addAttribute("Transfer", true );

src/main/java/itn/let/kakao/admin/kakaoAt/service/MjonKakaoATService.java

@@ -18,6 +18,9 @@ public interface MjonKakaoATService {
 	//알림톡 전송내역 상세
 	KakaoVO selectMjonKakaoATVO(KakaoVO mjonKakaoATVO) throws Exception;
 	
+	// 알림톡 금일/금월/금년 통계
+	KakaoVO selectMjonKakaoAtThisSum(KakaoVO mjonKakaoATVO) throws Exception;
+	
 	//알림톡 예약 발송 리스트
 	List<KakaoVO> selectReserveMjonKakaoATGroupList(KakaoVO searchVO)  throws Exception;
 	

src/main/java/itn/let/kakao/admin/kakaoAt/service/impl/MjonKakaoATDAO.java

@@ -31,6 +31,11 @@ public class MjonKakaoATDAO extends EgovAbstractDAO {
 		return (KakaoVO) select("mjonKakaoATDAO.selectMjonKakaoATVO", p_mjonKakaoATVO);
 	}
 	
+	// 알림톡 금일/금월/금년 통계
+	public KakaoVO selectMjonKakaoAtThisSum(KakaoVO p_mjonKakaoATVO) throws Exception{
+		return (KakaoVO) select("mjonKakaoATDAO.selectMjonKakaoAtThisSum", p_mjonKakaoATVO);
+	}
+	
 	@SuppressWarnings("unchecked")
 	public List<KakaoVO> selectReserveMjonKakaoATGroupList(KakaoVO p_mjonKakaoATVO) throws Exception{
 		return (List<KakaoVO>)list("mjonKakaoATDAO.selectReserveMjonKakaoATGroupList", p_mjonKakaoATVO);

src/main/java/itn/let/kakao/admin/kakaoAt/service/impl/MjonKakaoATServiceImpl.java

@@ -125,6 +125,16 @@ public class MjonKakaoATServiceImpl extends EgovAbstractServiceImpl implements M
 		return result;
 	}
 	
+	// 알림톡 금일/금월/금년 통계
+	@Override
+	public KakaoVO selectMjonKakaoAtThisSum(KakaoVO p_mjonKakaoATVO) throws Exception {
+		KakaoVO result = new KakaoVO();
+		
+		result = mjonKakaoATDAO.selectMjonKakaoAtThisSum(p_mjonKakaoATVO);
+		
+		return result;
+	}
+	
 	@Override
 	public List<KakaoVO> selectReserveMjonKakaoATGroupList(KakaoVO p_mjonKakaoATVO) throws Exception {
 		return mjonKakaoATDAO.selectReserveMjonKakaoATGroupList(p_mjonKakaoATVO);

src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java

@@ -13,6 +13,7 @@ import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.HandlerMapping;
+import org.springframework.web.servlet.ModelAndView;
 
 import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
 import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
@@ -262,6 +263,33 @@ public class MjonKakaoATController {
         
 	}
 	
+	// 알림톡 금일/금월/금년 통계
+	@RequestMapping(value = "/uss/umt/user/selectMjonKakaoAtThisSumAjax.do")
+	public ModelAndView DashBoardAdminLogAjax(
+			@ModelAttribute("kakaoVO") KakaoVO kakaoVO) throws Exception {
+
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.setViewName("jsonView");
+
+		boolean isSuccess = true;
+		String msg = "";
+		KakaoVO result = null;
+		
+        try {
+        	result  = mjonKakaoATService.selectMjonKakaoAtThisSum(kakaoVO);
+		}
+		catch(Exception e) {
+			isSuccess = false;
+			msg = e.getMessage();
+		}		
+
+        modelAndView.addObject("result", result);
+		modelAndView.addObject("isSuccess", isSuccess);
+		modelAndView.addObject("msg", msg);
+		
+		return modelAndView;
+	}		
+	
 	 /**
      * 알림톡 상세 전송 리스트 
      * @param searchVO

src/main/java/itn/let/kakao/kakaoComm/KakaoVO.java

@@ -238,6 +238,61 @@ public class KakaoVO extends MjonMsgVO{
 	private String imageTitle;						//친구톡 이미지 제목
 	private String imageLink;						//친구톡 이미지 클릭시 링크 주소
 	private String jsonText;						//json 파일 생성시 내용 저장(혹시 몰라서 내용도 별도로 저장함)
+
+	private String successDay;
+	private String successMonth;
+	private String successYear;		
+	private String successCntDay;
+	private String successCntMonth;
+	private String successCntYear;
+
+	public String getSuccessDay() {
+		return successDay;
+	}
+
+	public void setSuccessDay(String successDay) {
+		this.successDay = successDay;
+	}
+
+	public String getSuccessMonth() {
+		return successMonth;
+	}
+
+	public void setSuccessMonth(String successMonth) {
+		this.successMonth = successMonth;
+	}
+
+	public String getSuccessYear() {
+		return successYear;
+	}
+
+	public void setSuccessYear(String successYear) {
+		this.successYear = successYear;
+	}
+	
+	public String getSuccessCntDay() {
+		return successCntDay;
+	}
+
+	public void setSuccessCntDay(String successCntDay) {
+		this.successCntDay = successCntDay;
+	}
+
+	public String getSuccessCntMonth() {
+		return successCntMonth;
+	}
+
+	public void setSuccessCntMonth(String successCntMonth) {
+		this.successCntMonth = successCntMonth;
+	}
+
+	public String getSuccessCntYear() {
+		return successCntYear;
+	}
+
+	public void setSuccessCntYear(String successCntYear) {
+		this.successCntYear = successCntYear;
+	}
 	
 	public static long getSerialversionuid() {
 		return serialVersionUID;

src/main/java/itn/let/main/web/EgovMainController.java

@@ -71,6 +71,7 @@ import itn.let.sym.site.service.SiteManagerVO;
 import itn.let.uss.olp.qmc.service.EgovQustnrManageService;
 import itn.let.uss.umt.service.EgovUserManageService;
 import itn.let.uss.umt.service.MberManageVO;
+import itn.let.utl.sim.service.EgovClntInfo;
 	
 /**
  * 템플릿 메인 페이지 컨트롤러 클래스(Sample 소스)
@@ -1151,7 +1152,8 @@ public class EgovMainController {
         	Date currentTime = new Date ();
         	String mTime = mSimpleDateFormat.format ( currentTime );
     		HttpServletRequest req = ((ServletRequestAttributes)RequestContextHolder.currentRequestAttributes()).getRequest();
-            String ip = req.getHeader("X-FORWARDED-FOR");
+			/* String ip = req.getHeader("X-FORWARDED-FOR"); */
+            String ip = EgovClntInfo.getClntIP(req);
             if (ip == null){ ip = req.getRemoteAddr();}
             LoginLog loginLog = new LoginLog();
             loginLog.setLoginIp(ip);
@@ -1212,7 +1214,7 @@ public class EgovMainController {
     	Date currentTime = new Date ();
     	String mTime = mSimpleDateFormat.format ( currentTime );
 		HttpServletRequest req = ((ServletRequestAttributes)RequestContextHolder.currentRequestAttributes()).getRequest();
-        String ip = req.getHeader("X-FORWARDED-FOR");
+        String ip = req.getHeader("X-Forwarded-For") == null ? req.getHeader("X-Forwarded-For") : req.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim();
         if (ip == null){ ip = req.getRemoteAddr();}
         LoginLog loginLog = new LoginLog();
         loginLog.setLoginIp(ip);

src/main/java/itn/let/mjo/addr/web/AddrController.java

@@ -485,6 +485,43 @@ public class AddrController {
 		return "/web/addr/AddrListPrint";
 	}
 	
+	/**
+	 * 주소록 상세정보 ajax
+	 * @param addrCheck
+	 * @param request
+	 * @param addrVO
+	 * @param model
+	 * @param redirectAttributes
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping("/web/mjon/addr/selectAddrDetailAjax.do")
+	public ModelAndView selectAddrDetailAjax(HttpServletRequest request, 
+			AddrVO addrVO, Model model) throws Exception {
+		
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.setViewName("jsonView");
+
+		boolean isSuccess = true;
+		String msg = "";		
+		AddrVO addrInfo = null;
+		
+		try {
+			
+			addrInfo = addrService.selectAddrDetail(addrVO);
+
+		} catch (Exception e) {
+			isSuccess = false;
+			msg = e.getMessage();
+		}
+		
+		modelAndView.addObject("isSuccess", isSuccess);
+		modelAndView.addObject("msg", msg);
+		modelAndView.addObject("addrInfo", addrInfo);
+		
+		return modelAndView;
+		
+	}
 	
 	
 	/**

src/main/java/itn/let/mjo/event/web/MjonEventPayV2Controller.java

@@ -76,6 +76,15 @@ public class MjonEventPayV2Controller {
 			return "redirect:/web/user/login/login.do";
 		}
 		
+		// 하드코딩
+		if(!userId.equals("nobledeco")) {
+			if(!userId.equals("nobledeco2")) {
+				if(!userId.equals("nopay")) {
+					return "redirect:/web/main/mainPage.do";
+				}
+			}
+		}
+		
 		//기존 결제 내역이 있는 회원인지 확인
 		int payCnt = 0;
 		if(StringUtil.isNotEmpty(userId)) {

src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java

@@ -165,6 +165,67 @@ public class MjonMsgVO extends ComDefaultVO{
 	private String reqFullDate;
 	private String blineCode;
 	
+	private String sendKind; //문자전송 타입(H:홈페이지, A:API)
+	
+	private int aSuccessCount;		// API 문자발송 성공건수
+	private int aSendCount;			// API 문자 발송건수
+	
+	private int totalSendCount;			// 전체 문자발송 건수
+	private int totalSuccessCount;		// 전체 문자발송 성공건수
+	
+	private int rateTotalSuccessCount;	// 전체 문자발송 성공율
+	private int rateSuccessCount;		// 홈페이지 전송 성공율
+	private int rateApiSuccessCount;	// API 전송 성공율
+	
+	
+	public int getRateSuccessCount() {
+		return rateSuccessCount;
+	}
+	public void setRateSuccessCount(int rateSuccessCount) {
+		this.rateSuccessCount = rateSuccessCount;
+	}
+	public int getRateApiSuccessCount() {
+		return rateApiSuccessCount;
+	}
+	public void setRateApiSuccessCount(int rateApiSuccessCount) {
+		this.rateApiSuccessCount = rateApiSuccessCount;
+	}
+	public int getTotalSendCount() {
+		return totalSendCount;
+	}
+	public void setTotalSendCount(int totalSendCount) {
+		this.totalSendCount = totalSendCount;
+	}
+	public int getTotalSuccessCount() {
+		return totalSuccessCount;
+	}
+	public void setTotalSuccessCount(int totalSuccessCount) {
+		this.totalSuccessCount = totalSuccessCount;
+	}
+	public int getRateTotalSuccessCount() {
+		return rateTotalSuccessCount;
+	}
+	public void setRateTotalSuccessCount(int rateTotalSuccessCount) {
+		this.rateTotalSuccessCount = rateTotalSuccessCount;
+	}
+	public int getaSuccessCount() {
+		return aSuccessCount;
+	}
+	public void setaSuccessCount(int aSuccessCount) {
+		this.aSuccessCount = aSuccessCount;
+	}
+	public int getaSendCount() {
+		return aSendCount;
+	}
+	public void setaSendCount(int aSendCount) {
+		this.aSendCount = aSendCount;
+	}
+	public String getSendKind() {
+		return sendKind;
+	}
+	public void setSendKind(String sendKind) {
+		this.sendKind = sendKind;
+	}
 	public String getBlineCode() {
 		return blineCode;
 	}

src/main/java/itn/let/mjo/msg/web/MjonMsgController.java

@@ -1,5 +1,6 @@
 package itn.let.mjo.msg.web;
 
+import java.io.File;
 import java.io.OutputStream;
 import java.net.URL;
 import java.text.SimpleDateFormat;
@@ -13,6 +14,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Random;
+import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -42,12 +44,15 @@ import com.hanju.util.Authentication;
 
 import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
 import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
+import itn.com.cmm.ComDefaultCodeVO;
 import itn.com.cmm.EgovMessageSource;
 import itn.com.cmm.LoginVO;
+import itn.com.cmm.service.EgovCmmUseService;
 import itn.com.cmm.service.EgovFileMngService;
 import itn.com.cmm.service.EgovFileMngUtil;
 import itn.com.cmm.service.FileVO;
 import itn.com.cmm.util.MJUtil;
+import itn.com.cmm.util.PdfUtil;
 import itn.com.cmm.util.RedirectUrlMaker;
 import itn.com.cmm.util.StringUtil;
 import itn.com.utl.fcc.service.EgovStringUtil;
@@ -76,8 +81,10 @@ import itn.let.uat.uia.web.ClientIP;
 import itn.let.uat.uia.web.EmailVO;
 import itn.let.uat.uia.web.SendLogVO;
 import itn.let.uat.uia.web.SendMail;
+import itn.let.uss.umt.service.EgovMberCmpHstService;
 import itn.let.uss.umt.service.EgovMberManageService;
 import itn.let.uss.umt.service.EgovUserManageService;
+import itn.let.uss.umt.service.MberCmpHstVO;
 import itn.let.uss.umt.service.MberManageVO;
 import itn.let.uss.umt.service.UserDefaultVO;
 import itn.let.uss.umt.service.UserManageVO;
@@ -144,7 +151,16 @@ public class MjonMsgController {
 	
 	/** userManageService */
 	@Resource(name = "userManageService")
-	private EgovUserManageService userManageService;	
+	private EgovUserManageService userManageService;
+	
+	@Resource(name = "EgovCmmUseService")
+	private EgovCmmUseService cmmUseService;
+	
+	@Resource(name = "egovMberCmpHstService")
+	private EgovMberCmpHstService egovMberCmpHstService;
+	
+	@Resource(name = "EgovFileMngService")
+	private EgovFileMngService fileService;
 	
 	//배열 정의{"컬럼순차번호, 컬럼이름, 컬럼내용, 컬럼이름에 붙여야할 내용(엑셀코드양식다운로드시 필요)"}
 	private String[][] sendMsgExcelValue ={
@@ -4396,7 +4412,7 @@ public class MjonMsgController {
     		
     		if (resultList.size()>0) {
     			model.addAttribute("sttstDate", resultList.get(0).getRegistPnttm());
-    		}        	
+    		}
         }catch(Exception ex) {
         	ex.printStackTrace();
         }
@@ -4901,6 +4917,151 @@ public class MjonMsgController {
     	
     	return modelAndView;
    	}
+    
+    
+    @RequestMapping(value = {"/uss/ion/msg/weekendCsWorkMain.do"})
+   	public String weekendCsWorkMain() throws Exception {
+    	return "/uss/ion/msg/weekendCsWorkMain";
+    }
+    
+    /**
+     * 문자전송  등록하기 위한 전 처리(공통코드 처리)
+     * @param searchVO
+     * @param model
+     * @return	"/uss/ion/msg/SendMsgModify"
+     * @throws Exception
+     */
+    @RequestMapping(value = {"/uss/ion/msg/weekendCsWork.do"})
+   	public String weekendCsWork(@ModelAttribute("searchVO") MjPhoneMemberVO searchVO, 
+			HttpServletRequest request,
+			ModelMap model,
+			MberCmpHstVO mberCmpHstVO) throws Exception {
+    	
+    	String certType = request.getParameter("certType");
+    	model.addAttribute("certType", certType);
+    	
+		/** pageing */
+		PaginationInfo paginationInfo = new PaginationInfo();
+		paginationInfo.setCurrentPageNo(1);
+		paginationInfo.setRecordCountPerPage(100);
+		paginationInfo.setPageSize(100);
+		
+		searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
+		searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
+		searchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+		
+		if("".equals(searchVO.getSearchSortCnd())){ //최초조회시 최신것 조회List
+			searchVO.setSearchSortCnd("frstRegistPnttm");
+			searchVO.setSearchSortOrd("desc");
+		}
+		
+    	searchVO.setSearchSortAuthYN("Y");
+		
+		searchVO.setPhmType("01"); //발신조회
+        List<MjPhoneMemberVO> resultList = mjonMsgService.selectSendNumberList(searchVO);
+        List<MjPhoneMemberVO> resultList2 = new ArrayList<MjPhoneMemberVO>();
+        resultList.stream()
+		        .filter(t->t.getAuthYnTxt().equals("심사중"))
+		        .collect(Collectors.toList())
+		        .forEach(li->{resultList2.add(li);});
+        
+        model.addAttribute("resultList", resultList2);
+        paginationInfo.setTotalRecordCount(resultList.size() > 0 ? ((MjPhoneMemberVO)resultList.get(0)).getTotCnt() : 0);
+		model.addAttribute("paginationInfo", paginationInfo);
+		
+		
+    	return "/uss/ion/msg/weekendCsWork";
+    }
+    
+    /**
+     * 문자전송  등록하기 위한 전 처리(공통코드 처리)
+     * @param searchVO
+     * @param model
+     * @return	"/uss/ion/msg/SendMsgModify"
+     * @throws Exception
+     */
+    @RequestMapping(value = {"/uss/ion/msg/weekendCsWork2.do"})
+   	public String weekendCsWork2(@ModelAttribute("searchVO") MberCmpHstVO mberCmpHstVO,
+			HttpServletRequest request ,
+			ModelMap model) throws Exception {
+        
+    	LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
+		
+    	String hstSttus = request.getParameter("hstSttus");
+    	model.addAttribute("hstSttus", hstSttus);		
+		
+		//기업유형
+		ComDefaultCodeVO voComCode = new ComDefaultCodeVO();
+		voComCode.setCodeId("ITN033");
+		model.addAttribute("bizTypeList", cmmUseService.selectCmmCodeDetail(voComCode));		
+		
+		// 유형 코드조회
+		voComCode.setCodeId("ITN048");
+		model.addAttribute("hstTypeList", cmmUseService.selectCmmCodeDetail(voComCode));		
+
+		// 처리상태 코드조회
+		voComCode.setCodeId("ITN049");
+		model.addAttribute("hstSttusList", cmmUseService.selectCmmCodeDetail(voComCode));		
+		
+		if(mberCmpHstVO.getPageUnit() != 10) {
+			mberCmpHstVO.setPageUnit(mberCmpHstVO.getPageUnit());
+		}
+		
+		/** paging */
+		PaginationInfo paginationInfo = new PaginationInfo();
+		paginationInfo.setCurrentPageNo(1);
+		paginationInfo.setRecordCountPerPage(100);
+		paginationInfo.setPageSize(100);
+		
+		mberCmpHstVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
+		mberCmpHstVO.setLastIndex(paginationInfo.getLastRecordIndex());
+		mberCmpHstVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+		
+		if("".equals(mberCmpHstVO.getSearchSortCnd())){ //최초조회시 최신것 조회List
+			mberCmpHstVO.setSearchSortCnd("frstRegistPnttm");
+			mberCmpHstVO.setSearchSortOrd("desc");
+		}
+		
+		List<MberCmpHstVO> mberCmpHstList = egovMberCmpHstService.selectMberCmpHstListByType(mberCmpHstVO);
+		List<MberCmpHstVO> resultList = new ArrayList<MberCmpHstVO>();
+		mberCmpHstList.stream()
+		        .filter(t -> t.getHstSttus().equals("01"))
+		        .collect(Collectors.toList())
+		        .forEach(li -> 
+		        		{
+		        			resultList.add(li);
+		        		});
+		
+		int totCnt = 0;
+		 if(mberCmpHstList.size() > 0) {
+				totCnt = mberCmpHstList.get(0).getTotCnt();
+			}
+		model.addAttribute("mberCmpHstList", resultList);
+		paginationInfo.setTotalRecordCount(totCnt);
+		model.addAttribute("paginationInfo", paginationInfo);
+		
+    	return "/uss/ion/msg/weekendCsWork2";
+    }
+    
+    @RequestMapping(value = {"/uss/ion/msg/pdfView.do"})
+   	public String pdfView(FileVO fileVO, ModelMap model) throws Exception {
+    	
+		FileVO fvo = fileService.selectFileInf(fileVO);
+		String path = "";
+		
+		if(fvo != null) {
+			if("pdf".equals(fvo.getFileExtsn())) {
+				path = "/cmm/fms/FileDown.do?atchFileId="+ fvo.getAtchFileId() + "&fileSn=" + fvo.getFileSn();
+			}else {
+				String storePath = fvo.getFileStreCours() + fvo.getStreFileNm();
+				path = "/cmm/fms/FileDowntest.do?fileNm="+ PdfUtil.makeImgPdf(storePath, fvo.getFileExtsn());
+			}
+		}
+		
+		model.addAttribute("pdfPath", path);
+    	
+    	return "/uss/ion/msg/pdfView";
+    }
 	
 	
 	

src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java

@@ -843,7 +843,13 @@ public class MjonMsgCampainDataController {
 		if(letterVO.getPageUnit() != 10) {
 			letterVO.setPageUnit(letterVO.getPageUnit());
 		}
-
+		
+		for(int i=0 ; i < cateConfList.size(); i++) {
+			if("선거".equals(cateConfList.get(i).getCateNm())) {
+				letterVO.setCategoryCode(cateConfList.get(i).getCateCode());
+			}
+		}
+		
 		/** pageing */
 		PaginationInfo paginationInfo = new PaginationInfo();
 		paginationInfo.setCurrentPageNo(letterVO.getPageIndex());
@@ -861,6 +867,8 @@ public class MjonMsgCampainDataController {
 		paginationInfo.setTotalRecordCount( resultPhoList.size()> 0 ? ((Long)((EgovMap)resultPhoList.get(0)).get("totCnt")).intValue() : 0);
 		model.addAttribute("paginationInfo", paginationInfo);
 		
+		model.addAttribute("letterVO", letterVO);
+		
 		return "web/msgcampain/excel/MsgExcelDataView";
 	}
 	
@@ -1078,18 +1086,20 @@ public class MjonMsgCampainDataController {
 		voComCode.setCodeId("ITN031");
 		model.addAttribute("emailCode", cmmUseService.selectCmmCodeDetail(voComCode));
 		
-		
-		//아이디 발신번호 리스트 불러오기.
-		List<String> resultSendPhonList = mjonMsgDataService.selectSendPhonNumList(userId);
-		List<String> resultPhonList = new ArrayList<String>();
-		MJUtil mjUtil = new MJUtil();
-		
-		for(String phone : resultSendPhonList) {
+		if(!userId.equals("")) {//로그인 했을때만 발신번호 리스트 불러오기
 			
-			resultPhonList.add(mjUtil.addDash(phone));
+			//아이디 발신번호 리스트 불러오기.
+			List<String> resultSendPhonList = mjonMsgDataService.selectSendPhonNumList(userId);
+			List<String> resultPhonList = new ArrayList<String>();
+			MJUtil mjUtil = new MJUtil();
 			
+			for(String phone : resultSendPhonList) {
+				
+				resultPhonList.add(mjUtil.addDash(phone));
+				
+			}
+			model.addAttribute("resultPhonList", resultPhonList);
 		}
-		model.addAttribute("resultPhonList", resultPhonList);
 		
 		// 문자 카테고리 리스트 불러오기
 		List<CateCode> cateConfList = letterService.selectCateConfWithList(categoryType);
@@ -2154,6 +2164,21 @@ public class MjonMsgCampainDataController {
         	
         	System.out.println("mjonMsgVO.getMsgType2() ::: "+mjonMsgVO.getMsgType());
         	
+        	// MSG_TYPE 다시계산 
+			if(mjonMsgVO.getFileName1() != null) {
+				mjonMsgVO.setMsgType("6");
+			}else {
+				if(FrBytes < 2000) {
+					if(FrBytes > 90) {// 90Byte 초과시 장문
+						mjonMsgVO.setMsgType("6");
+					}else {// 그외 단문
+						mjonMsgVO.setMsgType("4"); 
+					}
+				}
+			}
+			
+			System.out.println("mjonMsgVO.getMsgType3() ::: "+mjonMsgVO.getMsgType());
+			
         	//각 문자 종류별 단가 셋팅해주기
     		float tmpEachPrice = 0;
     		if(mjonMsgVO.getMsgType().equals("4")) {

src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java

@@ -2316,6 +2316,21 @@ public class MjonMsgDataController {
         	
         	System.out.println("mjonMsgVO.getMsgType2() ::: "+mjonMsgVO.getMsgType());
         	
+        	// MSG_TYPE 다시계산 
+			if(mjonMsgVO.getFileName1() != null) {
+				mjonMsgVO.setMsgType("6");
+			}else {
+				if(FrBytes < 2000) {
+					if(FrBytes > 90) {// 90Byte 초과시 장문
+						mjonMsgVO.setMsgType("6");
+					}else {// 그외 단문
+						mjonMsgVO.setMsgType("4"); 
+					}
+				}
+			}
+			
+			System.out.println("mjonMsgVO.getMsgType3() ::: "+mjonMsgVO.getMsgType());
+				
         	//각 문자 종류별 단가 셋팅해주기
     		float tmpEachPrice = 0;
     		if(mjonMsgVO.getMsgType().equals("4")) {

src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java

@@ -429,6 +429,4 @@ public class MjonMsgSentVO extends UserDefaultVO{
 		this.sendKind = sendKind;
 	}
 	
-
-
 }

src/main/java/itn/let/mjo/pay/service/impl/MjonPayServiceImpl.java

@@ -38,6 +38,8 @@ import itn.let.mjo.pay.service.RefundVO;
 import itn.let.mjo.pay.service.StVcVO;
 import itn.let.mjo.tax.service.TaxVO;
 import itn.let.mjo.tax.service.impl.TaxDAO;
+import itn.let.sym.grd.service.MberGrdService;
+import itn.let.sym.grd.service.MberGrdVO;
 import itn.let.sym.site.service.JoinSettingVO;
 import itn.let.uat.uia.service.impl.MberManageDAO;
 import itn.let.uss.umt.service.MberManageVO;
@@ -81,7 +83,9 @@ public class MjonPayServiceImpl extends EgovAbstractServiceImpl implements MjonP
 	@Resource(name = "egovCryptoUtil")
 	EgovCryptoUtil egovCryptoUtil;
 	
-
+	/* 등급제 */
+	@Resource(name = "mberGrdService")
+	MberGrdService mberGrdService;
 	
 	@Override
 	public List<MjonPayVO> selectPayList(MjonPayVO mjonPayVO) throws Exception {
@@ -404,6 +408,17 @@ public class MjonPayServiceImpl extends EgovAbstractServiceImpl implements MjonP
 			
 		}
 		
+
+		// 등급제 Start
+   		// 회원별 등급 적용
+		MberGrdVO mberGrdVO = new MberGrdVO();
+		mberGrdVO.setMberId(mjonPayVO.getUserId());
+    	mberGrdVO.setAmt(mjonPayVO.getAmt());
+    	mberGrdVO.setMoid(mjonPayVO.getMoid());
+   		mberGrdService.mberGrdSaveByUser(mberGrdVO);    		
+		// End
+		
+		
 		mjonPayVO.setPaySuccess(true);
 		return mjonPayVO;
 		
@@ -709,6 +724,18 @@ public class MjonPayServiceImpl extends EgovAbstractServiceImpl implements MjonP
 				
 			}
 			
+
+    		// 등급제 Start
+       		// 회원별 등급 적용
+    		MberGrdVO mberGrdVO = new MberGrdVO();
+    		mberGrdVO.setMberId(mjonPayVO.getUserId());
+        	mberGrdVO.setAmt(mjonPayVO.getAmt());
+        	mberGrdVO.setMoid(mjonPayVO.getMoid());
+       		mberGrdService.mberGrdSaveByUser(mberGrdVO);    		
+    		// End
+    		
+    		
+    		
 			//세금계산서/현금영수증 발행 처리해주기 
 			//String uniqId = mberManageDAO.selectUniqId(mjonPayVO.getUserId());		//고유아이디(esntl) 번호 받아오기
 			
@@ -2009,6 +2036,17 @@ public class MjonPayServiceImpl extends EgovAbstractServiceImpl implements MjonP
     			
     		}
     		
+
+    		// 등급제 Start
+       		// 회원별 등급 적용
+    		MberGrdVO mberGrdVO = new MberGrdVO();
+    		mberGrdVO.setMberId(mjonPayVO.getUserId());
+        	mberGrdVO.setAmt(mjonPayVO.getAmt());
+        	mberGrdVO.setMoid(mjonPayVO.getMoid());
+       		mberGrdService.mberGrdSaveByUser(mberGrdVO);    		
+    		// End
+
+    		
     		mjonPayVO.setPaySuccess(true);
     	}
 	}	
@@ -2165,6 +2203,17 @@ public class MjonPayServiceImpl extends EgovAbstractServiceImpl implements MjonP
     				System.out.println(resultCnt);
     			}
     		}
+
+
+    		// 등급제 Start
+       		// 회원별 등급 적용
+    		MberGrdVO mberGrdVO = new MberGrdVO();
+    		mberGrdVO.setMberId(mjonPayVO.getUserId());
+        	mberGrdVO.setAmt(mjonPayVO.getAmt());
+        	mberGrdVO.setMoid(mjonPayVO.getMoid());
+       		mberGrdService.mberGrdSaveByUser(mberGrdVO);    		
+    		// End
+
     		
     		mjonPayVO.setPaySuccess(true);
     	}

src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java

@@ -123,10 +123,11 @@ public class MjonPayV2Controller {
 			return "redirect:/web/user/login/login.do";
 		}
 		
+		// 하드코딩
 		// Itm Member Id Check
-		//if(!getItnMemberId(userId)) {
-		//	return "redirect:/web/main/mainPage.do";
-		//}
+		if(!getItnMemberId(userId)) {
+			return "redirect:/web/main/mainPage.do";
+		}
 		
 		MberManageVO mberManageVO = mberManageService.selectMber(loginVO.getId());
     	model.addAttribute("mberManageVO", mberManageVO);
@@ -1470,7 +1471,7 @@ public class MjonPayV2Controller {
     
   	// Get Ip
    	public static String getClientIP(HttpServletRequest request) {
-   	    String ip = request.getHeader("X-Forwarded-For");
+   	    String ip = request.getHeader("X-Forwarded-For") == null ? request.getHeader("X-Forwarded-For") : request.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim();
    	    String ipMethod = "X-Forwarded-For";
    	    
    	    if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {

src/main/java/itn/let/sym/grd/service/MberGrdService.java

@@ -46,16 +46,28 @@ public interface MberGrdService {
 	// 회원별 등급 등록 All => 기존대상자 제외
 	public void insertMberGrdAllByExist(MberGrdVO mberGrdVO)  throws Exception;
 	
+	// 회원별 등급 히스토리 등록 All
+	public void insertMberGrdHistAll(MberGrdVO mberGrdVO)  throws Exception;
+	
 	// 회원별 등급 일괄변경
 	public int updateMberGrdAll(MberGrdVO mberGrdVO) throws Exception;
 	
 	// 회원 등급 변경(환불후) => 기존등급 상관없이 업데이트
 	public int updateMberGrdAfterRefund(MberGrdVO mberGrdVO) throws Exception;
 	
+	// 회원별 등급 초기화 By Temp
+	public int updateMberGrdWhiteByTemp(MberGrdVO mberGrdVO) throws Exception;
+
+	// 회원별 등급 초기화 All
+	public int updateMberGrdWhiteAll(MberGrdVO mberGrdVO) throws Exception;
+
 	// 문자할인, B선라인 대상자 종료
 	public int updateMberGrdEndBySale(MberGrdVO mberGrdVO) throws Exception;
 	
-	// 전체회원 등급 종료
+	// 전체회원 TEMP_YN 업데이트
+	public int updateMberGrdTempYn(MberGrdVO mberGrdVO) throws Exception;
+	
+	// 전체회원 등급 전체종료
 	public int updateMberGrdEndAll(MberGrdVO mberGrdVO) throws Exception;
 
 	// 회원 등급제 종료

src/main/java/itn/let/sym/grd/service/MberGrdVO.java

@@ -46,6 +46,8 @@ public class MberGrdVO extends UserDefaultVO {
 	private String grdNewDate;		// 시작일자, 계산기간 시작일자 중 최근날짜
 	private String grdDatePrgYn;	// 회원등급제 시작일자 진행여부(오늘보다 이전날짜이면 Y, 이후이면 N)
 	private String grdPeriod;		// 회원등급제 누적결제 계산기간
+	private String tempYn;
+	private String moid;			// 결제번호
 	
 	// 검색필터
 	private String searchGrdStatus;
@@ -268,6 +270,18 @@ public class MberGrdVO extends UserDefaultVO {
 	public void setGrdPeriod(String grdPeriod) {
 		this.grdPeriod = grdPeriod;
 	}	
+	public String getTempYn() {
+		return tempYn;
+	}
+	public void setTempYn(String tempYn) {
+		this.tempYn = tempYn;
+	}	
+	public String getMoid() {
+		return moid;
+	}
+	public void setMoid(String moid) {
+		this.moid = moid;
+	}	
 	public String getSearchGrdStatus() {
 		return searchGrdStatus;
 	}

src/main/java/itn/let/sym/grd/service/impl/MberGrdDAO.java

@@ -73,6 +73,11 @@ public class MberGrdDAO extends EgovAbstractDAO {
 		insert("mberGrdDAO.insertMberGrdAllByExist", mberGrdVO);
 	}
 	
+	// 회원별 등급 히스토리 등록 All
+	public void insertMberGrdHistAll(MberGrdVO mberGrdVO) throws Exception{
+		insert("mberGrdDAO.insertMberGrdHistAll", mberGrdVO);
+	}
+	
 	// 회원별 등급 일괄변경
 	public int updateMberGrdAll(MberGrdVO mberGrdVO) throws Exception {
 		return update("mberGrdDAO.updateMberGrdAll", mberGrdVO);
@@ -83,12 +88,27 @@ public class MberGrdDAO extends EgovAbstractDAO {
 		return update("mberGrdDAO.updateMberGrdAfterRefund", mberGrdVO);
 	}
 	
+	// 회원별 등급 초기화 By Temp
+	public int updateMberGrdWhiteByTemp(MberGrdVO mberGrdVO) throws Exception {
+		return update("mberGrdDAO.updateMberGrdWhiteByTemp", mberGrdVO);
+	}		
+
+	// 회원별 등급 초기화 All
+	public int updateMberGrdWhiteAll(MberGrdVO mberGrdVO) throws Exception {
+		return update("mberGrdDAO.updateMberGrdWhiteAll", mberGrdVO);
+	}			
+	
 	// 문자할인, B선라인 대상자 종료
 	public int updateMberGrdEndBySale(MberGrdVO mberGrdVO) throws Exception {
 		return update("mberGrdDAO.updateMberGrdEndBySale", mberGrdVO);
 	}		
 	
-	// 전체회원 등급 종료
+	// 전체회원 TEMP_YN 업데이트
+	public int updateMberGrdTempYn(MberGrdVO mberGrdVO) throws Exception {
+		return update("mberGrdDAO.updateMberGrdTempYn", mberGrdVO);
+	}		
+	
+	// 전체회원 등급 전체종료
 	public int updateMberGrdEndAll(MberGrdVO mberGrdVO) throws Exception {
 		return update("mberGrdDAO.updateMberGrdEndAll", mberGrdVO);
 	}		

src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java

@@ -1,7 +1,5 @@
 package itn.let.sym.grd.service.impl;
 
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 import javax.annotation.Resource;
@@ -9,6 +7,7 @@ import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
 
 import egovframework.rte.fdl.cmmn.EgovAbstractServiceImpl;
+import itn.let.mjo.mjocommon.MjonCommon;
 import itn.let.mjo.pay.service.MjonPayService;
 import itn.let.sym.grd.service.MberGrdService;
 import itn.let.sym.grd.service.MberGrdVO;
@@ -28,6 +27,9 @@ public class MberGrdServiceImpl extends EgovAbstractServiceImpl implements MberG
 	@Resource(name = "mberManageService")
 	private EgovMberManageService mberManageService;
 	
+	@Resource(name="MjonCommon")
+	private MjonCommon mjonCommon;
+	
 	// 등급제 단가 추출 => 시스템 단가에 적용
 	@Override
 	public JoinSettingVO selectMberGrdDefaultInfo(JoinSettingVO sysJoinSetVO, String mberId) throws Exception {
@@ -40,7 +42,7 @@ public class MberGrdServiceImpl extends EgovAbstractServiceImpl implements MberG
 			MberGrdVO mberGrdVO = new MberGrdVO();		
 			MberGrdVO mberGrdVO1 = new MberGrdVO();
 			mberGrdVO1 = selectMberSettingDetail(mberGrdVO);
-			if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate() && mberGrdVO1.getGrdDatePrgYn().equals("Y")) {
+			if (mberGrdVO1.getGrdNoti().equals("Y")) {
 				mberGrdVO = new MberGrdVO();
 				mberGrdVO = selectMberGrdInfo(mberId);
 				if (null != mberGrdVO) {
@@ -152,31 +154,47 @@ public class MberGrdServiceImpl extends EgovAbstractServiceImpl implements MberG
 		mberGrdDAO.insertMberGrdAllByExist(mberGrdVO);
 	}
 	
+	// 회원별 등급 히스토리 등록 All
+	@Override
+	public void insertMberGrdHistAll(MberGrdVO mberGrdVO) throws Exception {
+		mberGrdDAO.insertMberGrdHistAll(mberGrdVO);
+	}
+	
 	// 회원별 등급 일괄변경
 	@Override
 	public int updateMberGrdAll(MberGrdVO mberGrdVO) throws Exception {
-		int updateCnt1 = 0;
+		int updateCnt = 0;
 		int updateCnt2 = 0;
+		int updateCnt3 = 0;
 		
 		// Step 1. 등급제 시행 ON 일경우
 		MberGrdVO mberGrdVO1 = new MberGrdVO();
 		mberGrdVO1 = selectMberSettingDetail(mberGrdVO);
-		if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate() && mberGrdVO1.getGrdDatePrgYn().equals("Y")) {
+		if (mberGrdVO1.getGrdNoti().equals("Y")) {
 			mberGrdVO.setGrdNewDate(mberGrdVO1.getGrdNewDate());
 			
-			// 대상자 추가
+			// Step1. 대상자 추가
 			insertMberGrdAllByExist(mberGrdVO);
 			
-			// 문자할인, B선라인, 스팸회원 대상자 종료
-			updateCnt1 = updateMberGrdEndBySale(mberGrdVO);
+			// Step2. TEMP_YN 업데이트(N)
+			mberGrdVO.setTempYn("N");
+			updateMberGrdTempYn(mberGrdVO);
 			
-			// 등급제 정상대상자 초기화(화이트등급) 
+			// Step3. 문자할인, B선라인, 스팸회원 대상자 종료
+			updateCnt = updateMberGrdEndBySale(mberGrdVO);
 			
-			// 회원별 등급 일괄변경
+			// Step4. 회원별 등급 일괄변경
 			updateCnt2 = mberGrdDAO.updateMberGrdAll(mberGrdVO);
+			
+			// Step5. 등급제 정상대상자 초기화(화이트등급)
+			updateCnt3 = updateMberGrdWhiteByTemp(mberGrdVO);
+			
+			// Step6. 회원별 등급 히스토리 등록
+			insertMberGrdHistAll(mberGrdVO);			
+			
 		}
 		
-		return updateCnt1 + updateCnt2;
+		return updateCnt + updateCnt2 + updateCnt3;
 	}	
 	
 	// 회원 등급 변경(환불후) => 기존등급 상관없이 업데이트
@@ -185,13 +203,31 @@ public class MberGrdServiceImpl extends EgovAbstractServiceImpl implements MberG
 		return mberGrdDAO.updateMberGrdAfterRefund(mberGrdVO);
 	}	
 
+	// 회원별 등급 초기화 By Temp
+	@Override
+	public int updateMberGrdWhiteByTemp(MberGrdVO mberGrdVO) throws Exception {
+		return mberGrdDAO.updateMberGrdWhiteByTemp(mberGrdVO);
+	}	
+
+	// 회원별 등급 초기화 All
+	@Override
+	public int updateMberGrdWhiteAll(MberGrdVO mberGrdVO) throws Exception {
+		return mberGrdDAO.updateMberGrdWhiteAll(mberGrdVO);
+	}	
+	
 	// 문자할인, B선라인 대상자 종료
 	@Override
 	public int updateMberGrdEndBySale(MberGrdVO mberGrdVO) throws Exception {
 		return mberGrdDAO.updateMberGrdEndBySale(mberGrdVO);
 	}	
 
-	// 전체회원 등급 종료
+	// 전체회원 TEMP_YN 업데이트
+	@Override
+	public int updateMberGrdTempYn(MberGrdVO mberGrdVO) throws Exception {
+		return mberGrdDAO.updateMberGrdTempYn(mberGrdVO);
+	}	
+	
+	// 전체회원 등급 전체종료
 	@Override
 	public int updateMberGrdEndAll(MberGrdVO mberGrdVO) throws Exception {
 		return mberGrdDAO.updateMberGrdEndAll(mberGrdVO);
@@ -212,66 +248,78 @@ public class MberGrdServiceImpl extends EgovAbstractServiceImpl implements MberG
 	// 회원별 등급 적용
 	@Override
 	public void mberGrdSaveByUser(MberGrdVO mberGrdVO) throws Exception {
-		// 현재 날짜 구하기
-        LocalDate now = LocalDate.now();
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");	// 포맷 정의
-        String nowDate = now.format(formatter);		// 포맷 적용
-        
-		mberGrdVO.setRegId(mberGrdVO.getMberId());
-		mberGrdVO.setEditId(mberGrdVO.getMberId());
-		
-		// Step 1. 등급제 시행 ON 일경우(시행일자 진행여부 Y일경우)
-		MberGrdVO mberGrdVO1 = new MberGrdVO();
-		mberGrdVO1 = selectMberSettingDetail(mberGrdVO);
-		if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate() && mberGrdVO1.getGrdDatePrgYn().equals("Y")) {
-			mberGrdVO.setGrdNewDate(mberGrdVO1.getGrdNewDate());
-			
-			// Step 2. 문자할인, B선라인, 스팸회원 대상자 제외
-			int isMberGrd = selectMberGrdCnt(mberGrdVO.getMberId());	// 등급제 대상여부(1: 대상, 0: 미대상)
-			if(isMberGrd == 1) {
-				// Step 3. 누적결제금액(이벤트금액 제외) 추출 및 등급 조회
-				MberGrdVO mberGrdVO3 = new MberGrdVO();				
-				mberGrdVO3 = selectMberGrdAmtDetail(mberGrdVO);
-				if (null != mberGrdVO3) {
-					mberGrdVO.setTotAmt(mberGrdVO3.getTotAmt());
-					mberGrdVO.setGrdSetNo(mberGrdVO3.getGrdSetNo());
-					
-					// Step 4. 등급제 설정값 조회
-					MberGrdVO mberGrdVO4 = new MberGrdVO();
-					mberGrdVO4 = selectMberGrdSettingDetail(mberGrdVO);
-					if (null != mberGrdVO4) {
-						mberGrdVO.setAmt(mberGrdVO.getAmt());
-				    	mberGrdVO.setTotAmt(mberGrdVO.getTotAmt());
-				    	mberGrdVO.setShortPrice(mberGrdVO4.getShortPrice());
-				    	mberGrdVO.setLongPrice(mberGrdVO4.getLongPrice());
-				    	mberGrdVO.setPicturePrice(mberGrdVO4.getPicturePrice());
-				    	mberGrdVO.setPicture2Price(mberGrdVO4.getPicture2Price());
-				    	mberGrdVO.setPicture3Price(mberGrdVO4.getPicture3Price());
-				    	mberGrdVO.setGrdDate(mberGrdVO.getGrdDate());
-				    	mberGrdVO.setGrdStartDate(nowDate + " 00:00:00");
-				    	mberGrdVO.setGrdEndDate("9999:12:31 23:59:59");
-				    	mberGrdVO.setGrdStatus("Y");
-				    	
-						// Step 5. 인서트 Or 업데이트
-						MberGrdVO mberGrdVO5 = new MberGrdVO();
-						mberGrdVO5 = selectMberGrdDetail(mberGrdVO);
-						if (null != mberGrdVO5) {
-							updateMberGrd(mberGrdVO);
-								
-							// 회원별 등급 히스토리 인서트
-							insertMberGrdHist(mberGrdVO);							
-						}
-						else {
-							// 인서트
-							insertMberGrd(mberGrdVO);
-							
-							// 회원별 등급 히스토리 인서트
-							insertMberGrdHist(mberGrdVO);
-						}
-					}
-				}					
-			}			
-		}
+		/*
+    	try {
+    		// 현재 날짜 구하기
+            LocalDate now = LocalDate.now();
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");	// 포맷 정의
+            String nowDate = now.format(formatter);		// 포맷 적용
+            
+    		mberGrdVO.setRegId(mberGrdVO.getMberId());
+    		mberGrdVO.setEditId(mberGrdVO.getMberId());
+    		
+    		// Step 1. 등급제 시행 ON 일경우(시행일자 진행여부 Y일경우)
+    		MberGrdVO mberGrdVO1 = new MberGrdVO();
+    		mberGrdVO1 = selectMberSettingDetail(mberGrdVO);
+    		if (mberGrdVO1.getGrdNoti().equals("Y")) {
+    			mberGrdVO.setGrdNewDate(mberGrdVO1.getGrdNewDate());
+    			
+    			// Step 2. 문자할인, B선라인, 스팸회원 대상자 제외
+    			int isMberGrd = selectMberGrdCnt(mberGrdVO.getMberId());	// 등급제 대상여부(1: 대상, 0: 미대상)
+    			if(isMberGrd == 1) {
+    				// Step 3. 누적결제금액(이벤트금액 제외) 추출 및 등급 조회
+    				MberGrdVO mberGrdVO3 = new MberGrdVO();				
+    				mberGrdVO3 = selectMberGrdAmtDetail(mberGrdVO);
+    				if (null != mberGrdVO3) {
+    					mberGrdVO.setTotAmt(mberGrdVO3.getTotAmt());
+    					mberGrdVO.setGrdSetNo(mberGrdVO3.getGrdSetNo());
+    					
+    					// Step 4. 등급제 설정값 조회
+    					MberGrdVO mberGrdVO4 = new MberGrdVO();
+    					mberGrdVO4 = selectMberGrdSettingDetail(mberGrdVO);
+    					if (null != mberGrdVO4) {
+    						mberGrdVO.setAmt(mberGrdVO.getAmt());
+    				    	mberGrdVO.setTotAmt(mberGrdVO.getTotAmt());
+    				    	mberGrdVO.setShortPrice(mberGrdVO4.getShortPrice());
+    				    	mberGrdVO.setLongPrice(mberGrdVO4.getLongPrice());
+    				    	mberGrdVO.setPicturePrice(mberGrdVO4.getPicturePrice());
+    				    	mberGrdVO.setPicture2Price(mberGrdVO4.getPicture2Price());
+    				    	mberGrdVO.setPicture3Price(mberGrdVO4.getPicture3Price());
+    				    	mberGrdVO.setGrdDate(mberGrdVO.getGrdDate());
+    				    	mberGrdVO.setGrdStartDate(nowDate + " 00:00:00");
+    				    	mberGrdVO.setGrdEndDate("9999:12:31 23:59:59");
+    				    	mberGrdVO.setGrdStatus("Y");
+    				    	
+    						// Step 5. 인서트 Or 업데이트
+    						MberGrdVO mberGrdVO5 = new MberGrdVO();
+    						mberGrdVO5 = selectMberGrdDetail(mberGrdVO);
+    						if (null != mberGrdVO5) {
+    							updateMberGrd(mberGrdVO);
+    								
+    							// 회원별 등급 히스토리 인서트
+    							insertMberGrdHist(mberGrdVO);							
+    						}
+    						else {
+    							// 인서트
+    							insertMberGrd(mberGrdVO);
+    							
+    							// 회원별 등급 히스토리 인서트
+    							insertMberGrdHist(mberGrdVO);
+    						}
+    					}
+    				}					
+    			}			
+    		}
+    	}
+    	catch (Exception e) {
+	    	// Slack 메시지 발송(단순본문)
+	    	String msg = "[문자온] " + mberGrdVO.getMberId() + "님 결제중 회원등급 저장 오류 알림 => 개발팀에게 문의해주세요.";
+	    	mjonCommon.sendSimpleSlackMsg(msg);    		
+
+			System.out.println("#############################################################");
+			System.out.println(mberGrdVO.getMberId() + "님 결제중 회원등급 저장 오류");			    		
+    	}												
+		*/
 	}			
 	
 	// 회원별 등급제 대상여부

src/main/java/itn/let/sym/grd/web/MberGrdMngController.java

@@ -45,9 +45,39 @@ public class MberGrdMngController {
     	return "/sym/grd/mberGrdSetting";
     }
     
-	// 등급제 일괄 저장
-	@RequestMapping(value = "/sym/grd/mberGrdSettingMassUpdateAjax.do")
-	public ModelAndView mberGrdSettingMassUpdateAjax(
+	// 등급제 단가 정보
+	@RequestMapping(value = "/sym/grd/mberGrdSettingListAjax.do")
+	public ModelAndView mberGrdSettingListAjax(
+			@ModelAttribute("mberGrdVO") MberGrdVO mberGrdVO) throws Exception {
+
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.setViewName("jsonView");
+
+		boolean isSuccess = true;
+		String msg = "";
+		List<MberGrdVO> mberGrdSettingList = null;
+		
+        try{
+    	
+        	// 등급별 단가 정보
+        	mberGrdSettingList = mberGrdService.selectMberGrdSettingList(mberGrdVO);
+
+        }
+		catch(Exception e) {
+			isSuccess = false;
+			msg = e.getMessage();
+		}		
+
+		modelAndView.addObject("isSuccess", isSuccess);
+		modelAndView.addObject("msg", msg);
+		modelAndView.addObject("mberGrdSettingList", mberGrdSettingList);
+		
+		return modelAndView;
+	}
+	
+	// 등급제 설정 저장
+	@RequestMapping(value = "/sym/grd/mberGrdSettingUpdateAjax.do")
+	public ModelAndView mberGrdSettingUpdateAjax(
 			@ModelAttribute("mberGrdVO") MberGrdVO mberGrdVO) throws Exception {
 
 		ModelAndView modelAndView = new ModelAndView();
@@ -69,7 +99,44 @@ public class MberGrdMngController {
     			isSuccess = false;
     			msg = "등급제 시행여부 변경에 실패했습니다.";        		
         	}
-        	else {
+		}
+		catch(Exception e) {
+			isSuccess = false;
+			msg = e.getMessage();
+		}		
+
+		modelAndView.addObject("isSuccess", isSuccess);
+		modelAndView.addObject("msg", msg);
+		modelAndView.addObject("updateMberCnt", updateMberCnt);
+		
+		return modelAndView;
+	}
+	
+	// 등급제 일괄 저장
+	@RequestMapping(value = "/sym/grd/mberGrdSettingMassUpdateAjax.do")
+	public ModelAndView mberGrdSettingMassUpdateAjax(
+			@ModelAttribute("mberGrdVO") MberGrdVO mberGrdVO) throws Exception {
+
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.setViewName("jsonView");
+
+		boolean isSuccess = true;
+		String msg = "";
+		int updateMberCnt = 0;
+		
+    	// 로그인VO에서  사용자 정보 가져오기
+    	LoginVO	loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
+    	String frstRegisterId = loginVO == null ? "" : loginVO.getId();
+    	mberGrdVO.setEditId(frstRegisterId);		// 최초등록자ID
+
+        try{
+        	// Step1. 등급제 시행여부 변경
+        	//int updateCnt1 = mberGrdService.updateMberSetting(mberGrdVO);
+        	//if (updateCnt1 == 0) {
+        	//	isSuccess = false;
+        	//	msg = "등급제 시행여부 변경에 실패했습니다.";        		
+        	//}
+        	//else {
 	        	// Step2. 등급제 단가 업데이트
 	        	int updateCnt2 = mberGrdService.updateGrdSettingList(mberGrdVO);
 	        	if (updateCnt2 == 0) {
@@ -80,7 +147,7 @@ public class MberGrdMngController {
 	        		// Step3. 회원 등급 일괄변경
 	        		updateMberCnt = mberGrdService.updateMberGrdAll(mberGrdVO);
 	        	}
-        	}
+	        //}
 		}
 		catch(Exception e) {
 			isSuccess = false;
@@ -95,6 +162,46 @@ public class MberGrdMngController {
 	}
 	
 	// 회원별 등급 초기화
+	@RequestMapping(value = "/sym/grd/mberGrdResetMassUpdateAjax.do")
+	public ModelAndView mberGrdResetMassUpdateAjax(
+			@ModelAttribute("mberGrdVO") MberGrdVO mberGrdVO) throws Exception {
+
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.setViewName("jsonView");
+
+		boolean isSuccess = true;
+		String msg = "";
+		int updateMberCnt = 0;
+		
+    	// 로그인VO에서  사용자 정보 가져오기
+    	LoginVO	loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
+    	String frstRegisterId = loginVO == null ? "" : loginVO.getId();
+    	mberGrdVO.setEditId(frstRegisterId);		// 최초등록자ID
+
+        try{
+    		// Step 1. 등급제 시행 ON 일경우
+    		MberGrdVO mberGrdVO1 = new MberGrdVO();
+    		mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);
+    		if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate() && mberGrdVO1.getGrdDatePrgYn().equals("Y")) {
+    			mberGrdVO.setGrdNewDate(mberGrdVO1.getGrdNewDate());
+    			
+           		// 회원별 등급 초기화
+           		updateMberCnt = mberGrdService.updateMberGrdWhiteAll(mberGrdVO);
+    		}     
+		}
+		catch(Exception e) {
+			isSuccess = false;
+			msg = e.getMessage();
+		}		
+
+		modelAndView.addObject("isSuccess", isSuccess);
+		modelAndView.addObject("msg", msg);
+		modelAndView.addObject("updateMberCnt", updateMberCnt);
+		
+		return modelAndView;
+	}		
+	
+	// 회원별 등급제 전체종료
 	@RequestMapping(value = "/sym/grd/mberGrdEndMassUpdateAjax.do")
 	public ModelAndView mberGrdEndMassUpdateAjax(
 			@ModelAttribute("mberGrdVO") MberGrdVO mberGrdVO) throws Exception {
@@ -113,7 +220,7 @@ public class MberGrdMngController {
 
         try{
         	
-       		// 회원별 등급 초기화
+       		// 회원별 등급 전체종료
        		updateMberCnt = mberGrdService.updateMberGrdEndAll(mberGrdVO);
        		
 		}
@@ -257,7 +364,7 @@ public class MberGrdMngController {
         	
         	// 회원 등급제 종료
         	mberGrdService.updateMberGrdEndByUser(mberGrdVO);
-       		
+     		
 		}
 		catch(Exception e) {
 			isSuccess = false;
@@ -327,7 +434,6 @@ public class MberGrdMngController {
     		MberGrdVO mberGrdVO1 = new MberGrdVO();
     		mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);
     		if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate() && mberGrdVO1.getGrdDatePrgYn().equals("Y")) {
-    			// 회원별 등급 일괄변경
     			mberGrdVO.setGrdNewDate(mberGrdVO1.getGrdNewDate());
     			
             	// 회원 등급 변경(환불후) => 기존등급 상관없이 업데이트

src/main/java/itn/let/uat/uia/web/ClientIP.java

@@ -6,7 +6,7 @@ public class ClientIP {
 
 	public String getClientIP(HttpServletRequest request) {
 		
-		String ip = request.getHeader("X-Forwarded-For");
+		String ip = request.getHeader("X-Forwarded-For") == null ? request.getHeader("X-Forwarded-For") : request.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim();
 
 	    if (ip == null) {
 	        ip = request.getHeader("Proxy-Client-IP");

src/main/java/itn/let/uat/uia/web/EgovLoginController.java

@@ -1274,7 +1274,7 @@ public class EgovLoginController {
 
 		HttpServletRequest req = ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes())
 				.getRequest();
-		String userIp = req.getHeader("X-FORWARDED-FOR");
+		String userIp = req.getHeader("X-Forwarded-For") == null ? req.getHeader("X-Forwarded-For") : req.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim();
 		if (userIp == null) {
 			userIp = req.getRemoteAddr();
 		}
@@ -1552,9 +1552,8 @@ public class EgovLoginController {
 		if (!"admin".equals(loginVO.getId())) {
 			//아이디가 존재
 			if(passMissVO != null) {
-				if (null == resultVO.getId()
-					&& passMissVO.getPassMiss() < 5
-					) { // 로그인 실패
+				// 로그인 실패 (
+				if (null == resultVO.getId() && passMissVO.getPassMiss() < 5 ) {
 					loginService.updatePassMissPlus(loginVO);
 					alertMessage = egovMessageSource.getMessage("fail.common.login");
 	
@@ -1583,7 +1582,7 @@ public class EgovLoginController {
 						 */
 					loginService.updatePassMissReset(loginVO);
 				}
-			} 
+			}
 			//아이디 미존재
 			else {
 				alertMessage = egovMessageSource.getMessage("fail.common.login");
@@ -1602,7 +1601,19 @@ public class EgovLoginController {
 			}
 		}
 
-
+		
+		/* 일시 : 2023.07.26
+		 * 내용 : 로그인시 휴먼고객 redirect 기능 추가
+		 * 작업자 : 원영현 과장 
+		 */
+		
+		/*if(resultVO.getDormantYn().equals("Y") || resultVO.getDormantYn() == "Y") {
+		
+		}*/
+		
+		
+		
+		
 		boolean loginPolicyYn = true;
 
 		// 접속IP
@@ -1615,23 +1626,19 @@ public class EgovLoginController {
 			// 2. spring security 연동
 			request.getSession().setAttribute("LoginVO", resultVO);
 			UsernamePasswordAuthenticationFilter springSecurity = null;
-			ApplicationContext act = WebApplicationContextUtils
-					.getRequiredWebApplicationContext(request.getSession().getServletContext());
-			Map<String, UsernamePasswordAuthenticationFilter> beans = act
-					.getBeansOfType(UsernamePasswordAuthenticationFilter.class);
+			ApplicationContext act = WebApplicationContextUtils.getRequiredWebApplicationContext(request.getSession().getServletContext());
+			Map<String, UsernamePasswordAuthenticationFilter> beans = act.getBeansOfType(UsernamePasswordAuthenticationFilter.class);
+			
 			if (beans.size() > 0) {
 				springSecurity = (UsernamePasswordAuthenticationFilter) beans.values().toArray()[0];
 				springSecurity.setUsernameParameter("egov_security_username");
 				springSecurity.setPasswordParameter("egov_security_password");
-				springSecurity.setRequiresAuthenticationRequestMatcher(new AntPathRequestMatcher(
-						request.getServletContext().getContextPath() + "/egov_security_login", "POST"));
-
+				springSecurity.setRequiresAuthenticationRequestMatcher(new AntPathRequestMatcher(request.getServletContext().getContextPath() + "/egov_security_login", "POST"));
 			} else {
 				throw new IllegalStateException("No AuthenticationProcessingFilter");
 			}
 
-			springSecurity.doFilter(new RequestWrapperForSecurity(request, resultVO.getUserSe() + resultVO.getId(),
-					resultVO.getUniqId()), response, null);
+			springSecurity.doFilter(new RequestWrapperForSecurity(request, resultVO.getUserSe() + resultVO.getId(), resultVO.getUniqId()), response, null);
 			{ // 관리자 로그인 log 저장
 				String uniqId = "";
 				String ip = "";
@@ -1681,7 +1688,6 @@ public class EgovLoginController {
 				loginVO.setMessage("로그인 성공되었습니다.");
 				loginVO.setLoginYn("Y");
 				loginService.insertActionLoginLog(loginVO);
-
 			}
 
 			// 이벤트 결제 바로가기 로직 체크 Start
@@ -2889,8 +2895,7 @@ public class EgovLoginController {
 			boolean TorF = true; 
 			if("USR".equals(mberManageVO.getUserSe()))
 			{
-				TorF = userManageService.selectAdminIdAjax(userManageVO) > 0 
-																	? true : false;
+				TorF = userManageService.selectAdminIdAjax(userManageVO) > 0 ? true : false;
 				
 				mberManageVO.setMberNm("");
 				// 관리자 로그인 본인인증은 name이 null이여야함
@@ -2898,9 +2903,17 @@ public class EgovLoginController {
 			}
 			else
 			{
-				List<UserManageVO> usedNmList = new ArrayList<>();
+				
+				/*
+				 * 일   시 : 2023.07.25
+				 * 담당자 : 원영현 과장 수정
+				 * 내   용 : Dn 으로 회원정보 조회가 가능하도록 기능 수정
+				 *       변경된 핸드폰 번호로 조회시 정보조회가 안되기 때문에 무조건 true 로 변경
+				 * */
+				/*List<UserManageVO> usedNmList = new ArrayList<>();
 				usedNmList = userManageService.selectUserIdAjax2(userManageVO);
-				TorF = usedNmList.size() > 0 ? true : false;
+				TorF = usedNmList.size() > 0 ? true : false;*/ 
+				TorF = true;
 			}
 
 
@@ -3070,9 +3083,16 @@ public class EgovLoginController {
 	public Boolean findIdKmcCheck(String DI, String Name, String PhoneNo) throws Exception {
 		UserManageVO userManageVO = new UserManageVO();
 
-		userManageVO.setEmplyrNm(Name);
-		userManageVO.setMoblphonNo(PhoneNo);
-		userManageVO.setMblDn(DI);
+		/*
+		 * 일   시 : 2023.07.25
+		 * 담당자 : 원영현 과장 수정
+		 * 내   용 : Dn 으로 회원정보 조회가 가능하도록 기능 수정
+		 *        쿼리 조회시 번호를 제외한 이름과 Dn으로 조회
+		 * */
+		
+		userManageVO.setEmplyrNm(Name); 	// 이름
+//		userManageVO.setMoblphonNo(PhoneNo);
+		userManageVO.setMblDn(DI);			// Dn
 
 		List<UserManageVO> usedNmList = userManageService.selectUserIdAjax(userManageVO);
 
@@ -3101,9 +3121,18 @@ public class EgovLoginController {
 		if (isAuthenticated) {
 			return "redirect:/";
 		}
-
+		/*
+		 * 일   시 : 2023.07.25
+		 * 담당자 : 원영현 과장 수정
+		 * 내   용 : Dn 으로 회원정보 조회가 가능하도록 기능 수정
+		 *        쿼리 조회시 번호를 제외한 이름과 Dn으로 조회
+		 * */
+		UserManageVO userInfoVO = new UserManageVO();
+		userInfoVO.setEmplyrNm(userManageVO.getEmplyrNm()); // 이름
+		userInfoVO.setMblDn(userManageVO.getMblDn());		// Dn
+		
 		String isFullUserid = "Y";
-		List<UserManageVO> usedNmList = userManageService.selectUserIdAjax(userManageVO);
+		List<UserManageVO> usedNmList = userManageService.selectUserIdAjax(userInfoVO);
 		try {
 			if (!"kmc".equals(userManageVO.getFindType())) {
 				for (UserManageVO tmpVO : usedNmList) {

src/main/java/itn/let/uss/umt/web/EgovUserManageController.java

@@ -1788,10 +1788,10 @@ public class EgovUserManageController {
         paginationInfo.setTotalRecordCount(resultList.size() > 0 ? ((MjonMsgVO)resultList.get(0)).getTotCnt() : 0);
 		model.addAttribute("paginationInfo", paginationInfo);
 		
-		String msgGroupSCntSum = "0";	//정상수신 총 건수 합계
-		String totSPriceSum = "0";	//정상수신 총 금액 합계
-		String msgGroupFWCntSum = "0";	//실패대기 총 건수 합계
-		String totFWPriceSum = "0";	//실패대기 총 금액 합계
+		String msgGroupSCntSum = "0";		//정상수신 총 건수 합계
+		String totSPriceSum = "0";			//정상수신 총 금액 합계
+		String msgGroupFWCntSum = "0";		//실패대기 총 건수 합계
+		String totFWPriceSum = "0";			//실패대기 총 금액 합계
 		
 		if(resultList.size() > 0) {
 			
@@ -1809,10 +1809,10 @@ public class EgovUserManageController {
 		
 		
 		//단문 건수 및 금액 변수 처리
-		String msgSmsGroupSCntSum = "0";	//정상수신 총 건수 합계
-		String totSmsSPriceSum = "0";	//정상수신 총 금액 합계
-		String msgSmsGroupFWCntSum = "0";	//실패대기 총 건수 합계
-		String totSmsFWPriceSum = "0";	//실패대기 총 금액 합계
+		String msgSmsGroupSCntSum = "0";		//정상수신 총 건수 합계
+		String totSmsSPriceSum = "0";			//정상수신 총 금액 합계
+		String msgSmsGroupFWCntSum = "0";		//실패대기 총 건수 합계
+		String totSmsFWPriceSum = "0";			//실패대기 총 금액 합계
 		
 		if(resultSmsList.size() > 0) {
 			
@@ -1830,10 +1830,10 @@ public class EgovUserManageController {
 		
 		
 		//장문 건수 및 금액 변수 처리
-		String msgLmsGroupSCntSum = "0";	//정상수신 총 건수 합계
-		String totLmsSPriceSum = "0";	//정상수신 총 금액 합계
-		String msgLmsGroupFWCntSum = "0";	//실패대기 총 건수 합계
-		String totLmsFWPriceSum = "0";	//실패대기 총 금액 합계
+		String msgLmsGroupSCntSum = "0";		//정상수신 총 건수 합계
+		String totLmsSPriceSum = "0";			//정상수신 총 금액 합계
+		String msgLmsGroupFWCntSum = "0";		//실패대기 총 건수 합계
+		String totLmsFWPriceSum = "0";			//실패대기 총 금액 합계
 		
 		if(resultLmsList.size() > 0) {
 			
@@ -1851,10 +1851,10 @@ public class EgovUserManageController {
 		
 		
 		//그림 건수 및 금액 변수 처리
-		String msgMmsGroupSCntSum = "0";	//정상수신 총 건수 합계
-		String totMmsSPriceSum = "0";	//정상수신 총 금액 합계
-		String msgMmsGroupFWCntSum = "0";	//실패대기 총 건수 합계
-		String totMmsFWPriceSum = "0";	//실패대기 총 금액 합계
+		String msgMmsGroupSCntSum = "0";		//정상수신 총 건수 합계
+		String totMmsSPriceSum = "0";			//정상수신 총 금액 합계
+		String msgMmsGroupFWCntSum = "0";		//실패대기 총 건수 합계
+		String totMmsFWPriceSum = "0";			//실패대기 총 금액 합계
 		
 		if(resultMmsList.size() > 0) {
 			

src/main/java/itn/let/utl/sim/service/EgovClntInfo.java

@@ -32,7 +32,7 @@ public class EgovClntInfo {
 	*/
 	public static String getClntIP(HttpServletRequest request) throws Exception {
 		
-		String ip = request.getHeader("X-Forwarded-For");
+		String ip = request.getHeader("X-Forwarded-For") == null ? request.getHeader("X-Forwarded-For") : request.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim();
 		 
 	    if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
 	        ip = request.getHeader("Proxy-Client-IP");
@@ -62,7 +62,7 @@ public class EgovClntInfo {
 		// IP주소
 		//String ipAddr = request.getRemoteAddr();
 		
-		String ip = request.getHeader("X-Forwarded-For");
+		String ip = request.getHeader("X-Forwarded-For") == null ? request.getHeader("X-Forwarded-For") : request.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim();
 		 
 	    if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
 	        ip = request.getHeader("Proxy-Client-IP");

src/main/java/itn/web/ContentController.java

@@ -367,7 +367,7 @@ public class ContentController{
         StringBuilder sb = new StringBuilder();
         
 		try {
-		    String ipAddress = request.getHeader("X-Forwarded-For");
+		    String ipAddress = request.getHeader("X-Forwarded-For") == null ? request.getHeader("X-Forwarded-For") : request.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim();
 		    if (ipAddress == null) {
 		    	ipAddress = request.getRemoteAddr();
 		    }
@@ -559,7 +559,7 @@ public class ContentController{
 		int ignoreIpCnt = 0;
 
 		// 0:0:0:0:0:0:0:1
-		String ipAddress = request.getHeader("X-Forwarded-For");
+		String ipAddress = request.getHeader("X-Forwarded-For") == null ? request.getHeader("X-Forwarded-For") : request.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim();
 	    if (ipAddress == null) {
 	    	ipAddress = request.getRemoteAddr();
 	    }
@@ -598,7 +598,7 @@ public class ContentController{
 		modelAndView.setViewName("jsonView");
 
 		// 0:0:0:0:0:0:0:1
-		String ipAddress = request.getHeader("X-Forwarded-For");
+		String ipAddress = request.getHeader("X-Forwarded-For") == null ? request.getHeader("X-Forwarded-For") : request.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim();
 	    if (ipAddress == null) {
 	    	ipAddress = request.getRemoteAddr();
 	    }

src/main/java/itn/web/MainController.java

@@ -1046,7 +1046,8 @@ public class MainController {
             	Date currentTime = new Date ();
             	String mTime = mSimpleDateFormat.format ( currentTime );
         		HttpServletRequest req = ((ServletRequestAttributes)RequestContextHolder.currentRequestAttributes()).getRequest();
-                String ip = req.getHeader("X-FORWARDED-FOR");
+				/* String ip = req.getHeader("X-FORWARDED-FOR"); */
+                String ip = EgovClntInfo.getClntIP(req);
                 if (ip == null){ ip = req.getRemoteAddr();}
                 
                 loginLog.setLoginIp(ip);
@@ -1235,7 +1236,8 @@ public class MainController {
             	Date currentTime = new Date ();
             	String mTime = mSimpleDateFormat.format ( currentTime );
         		HttpServletRequest req = ((ServletRequestAttributes)RequestContextHolder.currentRequestAttributes()).getRequest();
-                String ip = req.getHeader("X-FORWARDED-FOR");
+				/* String ip = req.getHeader("X-FORWARDED-FOR"); */
+        		String ip = EgovClntInfo.getClntIP(req);
                 if (ip == null){ ip = req.getRemoteAddr();}
                 
                 loginLog.setLoginIp(ip);
@@ -1292,7 +1294,7 @@ public class MainController {
 		// 차단IP 체크 START
 		{
 			int ignoreIpCnt = 0;
-			String ipAddress = request.getHeader("X-Forwarded-For");
+			String ipAddress = request.getHeader("X-Forwarded-For") == null ? request.getHeader("X-Forwarded-For") : request.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim();
 		    if (ipAddress == null) {
 		    	ipAddress = request.getRemoteAddr();
 		    }
@@ -2628,7 +2630,7 @@ public class MainController {
 		
 		try {
 			
-			String ipAddress = request.getHeader("X-Forwarded-For");
+			String ipAddress = request.getHeader("X-Forwarded-For") == null ? request.getHeader("X-Forwarded-For") : request.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim();
 		    if (ipAddress == null) {
 		    	ipAddress = request.getRemoteAddr();
 		    	System.out.println("+++++++++++++ ipAddress ::: "+ipAddress);
@@ -2724,7 +2726,7 @@ public class MainController {
     	String ip = "";
     	
     	try {
-            ip = request.getHeader("X-Forwarded-For");
+            ip = request.getHeader("X-Forwarded-For") == null ? request.getHeader("X-Forwarded-For") : request.getHeader("X-Forwarded-For").replaceAll("10.12.107.11", "").replaceAll(",", "").trim();
             //logger.info("> X-FORWARDED-FOR : " + ip);
             //System.out.println("> X-FORWARDED-FOR : " + ip);
 

src/main/resources/egovframework/egovProps/globals_local.properties

@@ -28,7 +28,8 @@ Globals.Env = local
 
 # mysql
 Globals.DriverClassName=com.mysql.jdbc.Driver
-Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon
+#Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon
+Globals.Url=jdbc:mysql://119.193.215.98:3306/mjon
 Globals.UserName= mjonUr
 #Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon_20230221
 #Globals.UserName= mjonUr_20230221

src/main/resources/egovframework/spring/com/context-datasource.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
+	   xmlns:util="http://www.springframework.org/schema/util"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
+    					http://www.springframework.org/schema/util
+				        http://www.springframework.org/schema/util/spring-util-4.0.xsd">
     
     <!-- 환경설정 기본정보를 globals.properties 에서 참조하도록 propertyConfigurer 설정  -->
     <bean id="propertyConfigurer"
@@ -11,6 +14,7 @@
             </list>
         </property>
     </bean>
+    <util:properties id="property" location="classpath:/egovframework/egovProps/globals_#{systemProperties['spring.profiles.active']}.properties" />
     
     <!-- datasource 설정(propertyConfigurer 활용) -->
     <alias name="dataSource-${Globals.DbType}" alias="dataSource" />

src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml

@@ -1043,6 +1043,47 @@
 			
 	</select>		
 	
+	<!-- 알림톡 금일/금월/금년 통계 -->
+	<select id="mjonKakaoATDAO.selectMjonKakaoAtThisSum" parameterClass="kakaoVO" resultClass="kakaoVO">
+	<![CDATA[
+		SELECT
+			DATE_FORMAT(NOW(), '%m-%d') AS successDay
+			, DATE_FORMAT(NOW(), '%c') AS successMonth
+			, DATE_FORMAT(NOW(), '%Y') AS successYear 		
+			, (SELECT 
+				FORMAT(COUNT(0), 0)
+			FROM MJ_MSG_DATA C
+			WHERE
+				C.RESERVE_C_YN = 'N'
+				AND C.RSLT_CODE = '7000'
+				AND C.MSG_TYPE = '8'
+				AND C.SENT_DATE >= DATE_FORMAT(NOW(), '%Y-%m-%d')
+				AND C.SENT_DATE < DATE_FORMAT(DATE_ADD(NOW(), INTERVAL 1 DAY), '%Y-%m-%d')
+			) successCntDay
+			, (SELECT 
+				FORMAT(COUNT(0), 0)
+			FROM MJ_MSG_DATA C
+			WHERE
+				C.RESERVE_C_YN = 'N'
+				AND C.RSLT_CODE = '7000'
+				AND C.MSG_TYPE = '8'
+				AND C.SENT_DATE >= CONCAT(DATE_FORMAT(NOW(), '%Y-%m'), '-01')
+				AND C.SENT_DATE < DATE_FORMAT(DATE_ADD(NOW(), INTERVAL 1 DAY), '%Y-%m-%d')
+			) successCntMonth
+			, (SELECT 
+				FORMAT(COUNT(0), 0)
+		FROM MJ_MSG_DATA C
+			WHERE
+				C.RESERVE_C_YN = 'N'
+				AND C.RSLT_CODE = '7000'
+				AND C.MSG_TYPE = '8'
+				AND C.SENT_DATE >= CONCAT(DATE_FORMAT(NOW(), '%Y'), '-01-01')
+				AND C.SENT_DATE < DATE_FORMAT(DATE_ADD(NOW(), INTERVAL 1 DAY), '%Y-%m-%d')
+			) successCntYear
+		FROM DUAL
+	]]>
+	</select>		
+		
 	<!-- 알림톡 예약 발송 리스트 -->
 	<select id="mjonKakaoATDAO.selectReserveMjonKakaoATGroupList" parameterClass="kakaoVO" resultClass="kakaoVO">
 	/*	mjonKakaoATDAO.selectMjonKakaoATGroupList - 알림톡 예약조회	*/

src/main/resources/egovframework/sqlmap/let/mjo/apikey/ApiCallInfoMng_SQL_Mysql.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://www.ibatis.com/dtd/sql-map-2.dtd">
+<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://ibatis.apache.org/dtd/sql-map-2.dtd">
 
 <sqlMap namespace="ApiCallInfoMng">
 

src/main/resources/egovframework/sqlmap/let/mjo/apikey/ApiKeyMng_SQL_Mysql.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://www.ibatis.com/dtd/sql-map-2.dtd">
+<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://ibatis.apache.org/dtd/sql-map-2.dtd">
 
 <sqlMap namespace="ApiKeyMng">
 

src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoStatistics_SQL_Mysql.xml

@@ -112,6 +112,7 @@
 					ON md.MSG_GROUP_ID = bkp.MSG_GROUP_ID
 					WHERE
 						md.MSG_TYPE = '8'
+						AND md.RESERVE_C_YN = 'N'
 						AND md.SENT_DATE >= DATE_FORMAT(#statStartDate#, '%Y-%m-%d') 
 						AND	DATE_FORMAT(#statStandardDate#, '%Y-%m-%d') > md.SENT_DATE
 						AND	md.AGENT_CODE = '04'
@@ -174,8 +175,9 @@
 						md.USER_ID = mbr.mber_id
 					where
 						md.BIZ_KAKAO_RESEND_YN = 'Y'
-					AND md.SENT_DATE >= DATE_FORMAT(#statStartDate#, '%Y-%m-%d') 
-					AND	DATE_FORMAT(#statStandardDate#, '%Y-%m-%d') > md.SENT_DATE
+						AND md.RESERVE_C_YN = 'N'
+						AND md.SENT_DATE >= DATE_FORMAT(#statStartDate#, '%Y-%m-%d') 
+						AND	DATE_FORMAT(#statStandardDate#, '%Y-%m-%d') > md.SENT_DATE
 				) B
 				left outer join MJ_MSG_COST AGENT 
 				on	B.AGENT_CODE = AGENT.AGENT_CODE

src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml

@@ -4451,6 +4451,7 @@
 			, msgGroupId
 			, callFrom
 			, callTo
+			, sendKind
 			, smsTxt
 			, fileCnt
 			, msgType
@@ -4475,50 +4476,84 @@
 			, smiId
 			, delayYn
 			, delayCompleteYn
- 			,(
-				SELECT
-					CONCAT(
-					(
-					  	IF(B.FILE_PATH1 IS NOT NULL, (SELECT
-	 	 	 	 			ATCH_FILE_ID
-	 	 	 	 		FROM LETTNFILEDETAIL 
-	 	 	 	 		WHERE CONCAT(STRE_FILE_NM, '.', FILE_EXTSN) = CONCAT(SUBSTRING_INDEX(B.FILE_PATH1, '/', -1))
-	 	 	 	 		LIMIT 1), '')
-	 	 	 	 	)
-	 	 	 	 	,'^',
-					(
-					  	IF(B.FILE_PATH2 IS NOT NULL, (SELECT
-	 	 	 	 			ATCH_FILE_ID
-	 	 	 	 		FROM LETTNFILEDETAIL 
-	 	 	 	 		WHERE CONCAT(STRE_FILE_NM, '.', FILE_EXTSN) = CONCAT(SUBSTRING_INDEX(B.FILE_PATH2, '/', -1))
-	 	 	 	 		LIMIT 1), '')
-	 	 	 	 	)
-	 	 	 	 	,'^',
-					(
-					  	IF(B.FILE_PATH3 IS NOT NULL, (SELECT
-	 	 	 	 			ATCH_FILE_ID
-	 	 	 	 		FROM LETTNFILEDETAIL 
-	 	 	 	 		WHERE CONCAT(STRE_FILE_NM, '.', FILE_EXTSN) = CONCAT(SUBSTRING_INDEX(B.FILE_PATH3, '/', -1))
-	 	 	 	 		LIMIT 1), '')
-	 	 	 	 	))	 	 	 		 	 	 	 	
-				FROM
-					MJ_MSG_DATA B
-				WHERE 
-					B.MSG_GROUP_ID = msgGroupId
-					LIMIT 1
-			) AS atchFiles				
+ 			,(SELECT
+				CONCAT(
+					(IF(B.FILE_PATH1 IS NOT NULL
+						, (SELECT
+								ATCH_FILE_ID
+							FROM
+								LETTNFILEDETAIL 
+							WHERE 1=1
+								AND CONCAT(STRE_FILE_NM, '.', FILE_EXTSN) = CONCAT(SUBSTRING_INDEX(B.FILE_PATH1, '/', -1))
+							LIMIT 1)
+						, '')
+					)
+					, '^'
+					, (IF(B.FILE_PATH2 IS NOT NULL
+						, (SELECT 
+								ATCH_FILE_ID
+							FROM
+								LETTNFILEDETAIL 
+							WHERE 1=1
+								AND CONCAT(STRE_FILE_NM, '.', FILE_EXTSN) = CONCAT(SUBSTRING_INDEX(B.FILE_PATH2, '/', -1))
+							LIMIT 1)
+						, '')
+					)
+					, '^'
+					, (IF(B.FILE_PATH3 IS NOT NULL
+						, (SELECT
+								ATCH_FILE_ID
+							FROM
+								LETTNFILEDETAIL
+							WHERE 1=1
+								AND CONCAT(STRE_FILE_NM, '.', FILE_EXTSN) = CONCAT(SUBSTRING_INDEX(B.FILE_PATH3, '/', -1))
+							LIMIT 1)
+						, '')
+					)
+				)
+			FROM
+				MJ_MSG_DATA B
+			WHERE 1=1
+				AND B.MSG_GROUP_ID = msgGroupId
+			LIMIT 1
+			) AS atchFiles
 		FROM
 			(SELECT
-				(SELECT	count(1) 
-					 FROM
-						(SELECT
-								(<include refid="MjonMsgSentDAO.selectAgentResultQuery_MD"/>) AS resultCodeTxt,
-								MGD.MSG_GROUP_ID
-						FROM	MJ_MSG_GROUP_DATA MGD
+				(SELECT
+					count(1) 
+				FROM
+					(SELECT
+						(<include refid="MjonMsgSentDAO.selectAgentResultQuery_MD"/>) AS resultCodeTxt
+						, MGD.MSG_GROUP_ID
+					FROM
+						MJ_MSG_GROUP_DATA MGD
 						LEFT JOIN MJ_MSG_DATA MD
 						ON	MD.MSG_GROUP_ID = MGD.MSG_GROUP_ID
-						WHERE	MGD.USER_ID = #userId#
+					WHERE 1=1
+						AND MGD.USER_ID = #userId#
 						AND DATE_FORMAT(MGD.REQ_DATE, '%Y-%m-%d') BETWEEN #ntceBgnde# AND #ntceEndde#
+						
+						<isNotEmpty property="sendKind">
+							<isEqual property="sendKind" compareValue="H">
+								AND MGD.SEND_KIND = 'H'
+							</isEqual>
+							<isEqual property="sendKind" compareValue="A">
+								AND MGD.SEND_KIND = 'A'
+							</isEqual>
+						</isNotEmpty>
+						
+						<isNotEmpty property="searchKeyword">
+							<isEqual prepend="AND" property="searchCondition" compareValue="">
+								( MD.CALL_FROM LIKE CONCAT('%' , #searchKeyword#, '%')  OR  MD.SMS_TXT LIKE CONCAT('%' , #searchKeyword#, '%') )
+							</isEqual>
+							<isEqual prepend="AND" property="searchCondition" compareValue="1">
+								MD.CALL_FROM LIKE CONCAT('%' , #searchKeyword#, '%')
+							</isEqual>
+							<isEqual prepend="AND" property="searchCondition" compareValue="2">
+								MD.SMS_TXT LIKE CONCAT('%' , #searchKeyword#, '%')
+							</isEqual>
+						</isNotEmpty>
+						
 						<isNotEmpty property="reserveType">
 							<isEqual property="reserveType" compareValue="D">
 								<![CDATA[ 
@@ -4533,20 +4568,24 @@
 								]]>
 							</isEqual>
 						</isNotEmpty>
-							) sub2
-						WHERE	sub2.resultCodeTxt = 'S'
-						AND		sub2.MSG_GROUP_ID = IN1.MSG_GROUP_ID
-					) AS msgGroupSCnt
+					) sub2
+				WHERE 1=1
+					AND sub2.resultCodeTxt = 'S'
+					AND sub2.MSG_GROUP_ID = IN1.MSG_GROUP_ID
+				) AS msgGroupSCnt
 				, COUNT(MSG_GROUP_ID) * EACH_PRICE	AS totSPrice
-				, (SELECT	count(1) 
-					 FROM
+				, (SELECT
+						count(1)
+					FROM
 						(SELECT
-								(<include refid="MjonMsgSentDAO.selectAgentResultQuery_MD"/>) AS resultCodeTxt,
-								MGD.MSG_GROUP_ID
-							FROM	MJ_MSG_GROUP_DATA MGD
+							(<include refid="MjonMsgSentDAO.selectAgentResultQuery_MD"/>) AS resultCodeTxt
+							, MGD.MSG_GROUP_ID
+						FROM
+							MJ_MSG_GROUP_DATA MGD
 							LEFT JOIN MJ_MSG_DATA MD
-							ON	MD.MSG_GROUP_ID = MGD.MSG_GROUP_ID
-							WHERE	MGD.USER_ID = #userId#
+							ON MD.MSG_GROUP_ID = MGD.MSG_GROUP_ID
+						WHERE 1=1
+							AND MGD.USER_ID = #userId#
 							AND DATE_FORMAT(MGD.REQ_DATE, '%Y-%m-%d') BETWEEN #ntceBgnde# AND #ntceEndde#
 							<isNotEmpty property="reserveType">
 								<isEqual property="reserveType" compareValue="D">
@@ -4562,15 +4601,17 @@
 									]]>
 								</isEqual>
 							</isNotEmpty>
-							) sub2
-						WHERE	<![CDATA[ sub2.resultCodeTxt <> 'S' ]]>
-						AND		sub2.MSG_GROUP_ID = IN1.MSG_GROUP_ID
+						) sub2
+						WHERE 1=1
+							AND <![CDATA[ sub2.resultCodeTxt <> 'S' ]]>
+							AND sub2.MSG_GROUP_ID = IN1.MSG_GROUP_ID
 					) AS msgGroupFWCnt
 				, '0'								AS totFWPrice
 				, MSG_GROUP_ID						AS msgGroupId
 				, USER_ID							AS userId
 				, CALL_FROM							AS callFrom
 				, CALL_TO							AS callTo
+				, SEND_KIND							AS sendKind
 				, SMS_TXT							AS smsTxt
 				, FILE_CNT							AS fileCnt
 				, MSG_TYPE							AS msgType
@@ -4601,6 +4642,7 @@
 					, MGD.USER_ID
 					, MGD.CALL_FROM
 					, MD.CALL_TO
+					, MGD.SEND_KIND
 					, MGD.SMS_TXT
 					, MGD.FILE_CNT
 					, MD.MSG_TYPE
@@ -4657,6 +4699,26 @@
 					</isEqual>
 					AND DATE_FORMAT(MGD.REQ_DATE, '%Y-%m-%d') BETWEEN #ntceBgnde# AND #ntceEndde#
 					
+					<isNotEmpty property="sendKind">
+						<isEqual property="sendKind" compareValue="H">
+							AND MGD.SEND_KIND = 'H'
+						</isEqual>
+						<isEqual property="sendKind" compareValue="A">
+							AND MGD.SEND_KIND = 'A'
+						</isEqual>
+					</isNotEmpty>
+					
+					<isNotEmpty property="searchKeyword">
+						<isEqual prepend="AND" property="searchCondition" compareValue="">
+							( MD.CALL_FROM LIKE CONCAT('%' , #searchKeyword#, '%')  OR  MD.SMS_TXT LIKE CONCAT('%' , #searchKeyword#, '%') )
+						</isEqual>
+						<isEqual prepend="AND" property="searchCondition" compareValue="1">
+							MD.CALL_FROM LIKE CONCAT('%' , #searchKeyword#, '%')
+						</isEqual>
+						<isEqual prepend="AND" property="searchCondition" compareValue="2">
+							MD.SMS_TXT LIKE CONCAT('%' , #searchKeyword#, '%')
+						</isEqual>
+					</isNotEmpty>
 					<isNotEmpty property="reserveType">
 						<isEqual property="reserveType" compareValue="D">
 						<![CDATA[ 
@@ -4670,18 +4732,18 @@
 						AND MGD.RESERVE_YN = 'Y'
 						]]>
 						/**30분 지연이 아니거나 지연 처리가 완료된 건들 불러오기*/
-		                 AND
-	                         (
-	                                 (
-	                                         MGD.DELAY_YN          = 'N'
-	                                 AND     MGD.DELAY_COMPLETE_YN = 'N'
-	                                 )
-	                         OR
-	                                 (
-	                                         MGD.DELAY_YN          = 'Y'
-	                                 AND     MGD.DELAY_COMPLETE_YN = 'Y'
-	                                 )
-	                         )
+						AND
+						(
+							(
+								MGD.DELAY_YN = 'N'
+								AND MGD.DELAY_COMPLETE_YN = 'N'
+							)
+							OR
+							(
+								MGD.DELAY_YN = 'Y'
+								AND MGD.DELAY_COMPLETE_YN = 'Y'
+							)
+						)
 						</isEqual>
 					</isNotEmpty>
 					
@@ -4803,8 +4865,8 @@
 						ON MD.MSG_GROUP_ID = MGD.MSG_GROUP_ID
 					LEFT JOIN (SELECT CODE_NM  ,CODE , CODE_DC FROM LETTCCMMNDETAILCODE WHERE USE_AT  = 'Y' AND CODE_ID = 'ITN019' )B
 						ON MD.AGENT_CODE = B.CODE
-				WHERE
-					MGD.USER_ID = #userId#
+				WHERE 1=1
+					AND MGD.USER_ID = #userId#
 					AND MGD.MSG_TYPE IN (4, 6)
 					<isNotEmpty property="msgType">
 					AND MGD.MSG_TYPE = #msgType#
@@ -4816,6 +4878,28 @@
 					AND MGD.FILE_CNT = 0
 					</isEqual>
 					AND DATE_FORMAT(MGD.REQ_DATE, '%Y-%m-%d') BETWEEN #ntceBgnde# AND #ntceEndde#
+					
+					<isNotEmpty property="sendKind">
+						<isEqual property="sendKind" compareValue="H">
+							AND MGD.SEND_KIND = 'H'
+						</isEqual>
+						<isEqual property="sendKind" compareValue="A">
+							AND MGD.SEND_KIND = 'A'
+						</isEqual>
+					</isNotEmpty>
+					
+					<isNotEmpty property="searchKeyword">
+						<isEqual prepend="AND" property="searchCondition" compareValue="">
+							( MD.CALL_FROM LIKE CONCAT('%' , #searchKeyword#, '%')  OR  MD.SMS_TXT LIKE CONCAT('%' , #searchKeyword#, '%') )
+						</isEqual>
+						<isEqual prepend="AND" property="searchCondition" compareValue="1">
+							MD.CALL_FROM LIKE CONCAT('%' , #searchKeyword#, '%')
+						</isEqual>
+						<isEqual prepend="AND" property="searchCondition" compareValue="2">
+							MD.SMS_TXT LIKE CONCAT('%' , #searchKeyword#, '%')
+						</isEqual>
+					</isNotEmpty>
+					
 					<isNotEmpty property="reserveType">
 						<isEqual property="reserveType" compareValue="D">
 						<![CDATA[ 
@@ -4924,6 +5008,27 @@
 					</isEqual>
 					AND DATE_FORMAT(MGD.REQ_DATE, '%Y-%m-%d') BETWEEN #ntceBgnde# AND #ntceEndde#
 					
+					<isNotEmpty property="sendKind">
+						<isEqual property="sendKind" compareValue="H">
+							AND MGD.SEND_KIND = 'H'
+						</isEqual>
+						<isEqual property="sendKind" compareValue="A">
+							AND MGD.SEND_KIND = 'A'
+						</isEqual>
+					</isNotEmpty>
+					
+					<isNotEmpty property="searchKeyword">
+						<isEqual prepend="AND" property="searchCondition" compareValue="">
+							( MD.CALL_FROM LIKE CONCAT('%' , #searchKeyword#, '%')  OR  MD.SMS_TXT LIKE CONCAT('%' , #searchKeyword#, '%') )
+						</isEqual>
+						<isEqual prepend="AND" property="searchCondition" compareValue="1">
+							MD.CALL_FROM LIKE CONCAT('%' , #searchKeyword#, '%')
+						</isEqual>
+						<isEqual prepend="AND" property="searchCondition" compareValue="2">
+							MD.SMS_TXT LIKE CONCAT('%' , #searchKeyword#, '%')
+						</isEqual>
+					</isNotEmpty>
+					
 					<isNotEmpty property="reserveType">
 						<isEqual property="reserveType" compareValue="D">
 						<![CDATA[ 
@@ -5017,25 +5122,47 @@
 	<!-- 일별 문자발송 건수 -->
 	<select id="mjonMsgDAO.selectMsgDayChart_230125" parameterClass="mjonMsgVO" resultClass="mjonMsgVO">
 	
-		SELECT a.SEND_DATE	AS regDate
-			, a.send_cnt	AS	sendCount
-			, a.success_cnt	AS	successCount
-			, DATE_FORMAT(a.regist_pnttm, '%H:%i:%s')	AS	registPnttm
-			/*
-			, a.regist_pnttm	AS	registPnttm
-			*/
-			, COUNT(a.SEND_DATE) OVER()				AS totCnt			 /** 전체 건수 */
-		FROM mj_sttst_msg a
-		WHERE 1=1
-		   AND <![CDATA[ a.send_date <= DATE_FORMAT(NOW(), '%Y-%m-%d') ]]>
+		SELECT
+			a.SEND_DATE														AS regDate
+			, IFNULL(a.send_cnt, 0)											AS sendCount
+			, IFNULL(a.API_SEND_CNT, 0)										AS aSendCount
+			, IFNULL(a.send_cnt, 0) + IFNULL(a.API_SEND_CNT, 0)				AS totalSendCount
+			
+			, IFNULL(a.success_cnt, 0)										AS successCount
+			, IFNULL(a.API_SUCCESS_CNT, 0)									AS aSuccessCount
+			, IFNULL(a.success_cnt, 0) + IFNULL(a.API_SUCCESS_CNT, 0)		AS totalSuccessCount
 
-        <isNotEmpty property="ntceBgnde">
-	        AND <![CDATA[ a.send_date  >=   #ntceBgnde# ]]>
-		</isNotEmpty>
-        <isNotEmpty property="ntceEndde">
+			, IFNULL(ROUND(((IFNULL(a.success_cnt, 0) + IFNULL(a.API_SUCCESS_CNT, 0)) / (IFNULL(a.send_cnt, 0) + IFNULL(a.API_SEND_CNT, 0))) * 100), 0) AS rateTotalSuccessCount
+			, IFNULL(ROUND((a.success_cnt / a.send_cnt ) * 100), 0)			AS rateSuccessCount
+			, IFNULL(ROUND((a.API_SUCCESS_CNT / a.API_SEND_CNT ) * 100), 0) AS rateApiSuccessCount
+			
+			, DATE_FORMAT(a.regist_pnttm, '%H:%i:%s')						AS registPnttm
+			, COUNT(a.SEND_DATE) OVER()										AS totCnt			 /** 전체 건수 */
+		FROM
+			mj_sttst_msg a
+		WHERE 1=1
+			AND <![CDATA[ a.send_date <= DATE_FORMAT(NOW(), '%Y-%m-%d') ]]>
+
+			<isNotEmpty property="ntceBgnde">
+			AND <![CDATA[ a.send_date  >=   #ntceBgnde# ]]>
+			</isNotEmpty>
+			
+			<isNotEmpty property="ntceEndde">
 			AND <![CDATA[ a.send_date <= #ntceEndde# ]]>
-		</isNotEmpty>
-						   
+			</isNotEmpty>
+			
+			<isNotEmpty property="sendKind">
+				<isEqual property="sendKind" compareValue="H">
+					AND a.send_cnt != 0
+				</isEqual>
+				<isEqual property="sendKind" compareValue="A">
+					AND a.API_SEND_CNT != 0
+				</isEqual>
+			</isNotEmpty>
+			<isEmpty property="sendKind">
+				AND (a.send_cnt != 0 || a.API_SEND_CNT != 0)
+			</isEmpty>
+			
 		ORDER BY a.SEND_DATE DESC
 		LIMIT  #recordCountPerPage# OFFSET #firstIndex#
 	</select>
@@ -5085,16 +5212,29 @@
 	
 	<!-- 월별 문자발송 건수 -->
 	<select id="mjonMsgDAO.selectMsgMonthChart_230125" parameterClass="mjonMsgVO" resultClass="mjonMsgVO">
-		SELECT substring(a.send_date,1,7)	AS regDate
-			, sum(a.send_cnt)	AS	sendCount
-			, sum(a.success_cnt)	AS	successCount
+		SELECT
+			substring(a.send_date,1,7)													AS regDate
+			
+			, IFNULL(sum(a.send_cnt), 0)												AS sendCount
+			, IFNULL(sum(a.API_SEND_CNT), 0)											AS aSendCount
+			, IFNULL(sum(a.send_cnt), 0) + IFNULL(sum(a.API_SEND_CNT), 0)				AS totalSendCount
+			
+			, IFNULL(sum(a.success_cnt), 0)												AS successCount
+			, IFNULL(sum(a.API_SUCCESS_CNT), 0)											AS aSuccessCount
+			, IFNULL(sum(a.success_cnt), 0) + IFNULL(sum(a.API_SUCCESS_CNT), 0)			AS totalSuccessCount
+			
+			, IFNULL(ROUND((IFNULL(sum(a.success_cnt), 0) / IFNULL(sum(a.send_cnt), 0)) * 100), 0)			AS rateSuccessCount
+			, IFNULL(ROUND((IFNULL(sum(a.API_SUCCESS_CNT), 0) / IFNULL(sum(a.API_SEND_CNT), 0)) * 100), 0)	AS rateApiSuccessCount
+			, IFNULL(ROUND((IFNULL(sum(a.success_cnt), 0) + IFNULL(sum(a.API_SUCCESS_CNT), 0)) / (IFNULL(sum(a.send_cnt), 0) + IFNULL(sum(a.API_SEND_CNT), 0)) * 100), 0) AS rateTotalSuccessCount
+			
+			
 			, max(DATE_FORMAT(a.regist_pnttm, '%H:%i:%s'))	AS	registPnttm
-		FROM mj_sttst_msg a
+		FROM
+			mj_sttst_msg a
 		WHERE 1=1
 		   AND a.send_date like concat(#ntceBgnde#,'%')
 		   AND <![CDATA[ a.send_date <= DATE_FORMAT(NOW(), '%Y-%m-%d') ]]>
- 
-		group by substring(a.send_date,1,7)           
+		group by substring(a.send_date,1,7)
 		order by send_date desc
 
 	</select>	

src/main/resources/egovframework/sqlmap/let/sttst/MjonSttstData_SQL_mysql.xml

@@ -8,176 +8,251 @@
 	<typeAlias  alias="mjonMsgVO" type="itn.let.mjo.msg.service.MjonMsgVO"/>
 	
 	<insert id="mjonSttst.insertMjSttstMsgBulk" parameterClass="mjonMsgVO">
-		INSERT	INTO   mj_sttst_msg
-		(send_date, send_cnt, success_cnt, regist_pnttm)
+		INSERT INTO MJ_STTST_MSG
+		(
+			send_date
+			, send_cnt
+			, success_cnt
+			, API_SEND_CNT
+			, API_SUCCESS_CNT
+			, regist_pnttm
+		)
 		
-		select aa.regDate
-			, aa.sendCount
-			, aa.successCount
+		SELECT
+			aa.regDate
+			, aa.hSendCount
+			, aa.hSuccessCount
+			, aa.aSendCount
+			, aa.aSuccessCount
 			, now()
-			
-		from (
-		        SELECT   
-		                 M2.regDate ,
-		                 SUM(M2.sendCount)    AS sendCount ,
-		                 SUM(M2.successCount) AS successCount
-		                 
-		        FROM     ( SELECT
-		                         M.REQ_DATE AS regDate
-		                         /*발송일*/
-		                         
-		                         , IFNULL(M.MSG_GROUP_CNT, 0) AS sendCount
-		                         /*발송건수*/
-		                         
-		                         , MSG_GROUP_ID
-		                          
-		                         ,
-		                         (SELECT COUNT(0)
-		                         FROM    MJ_MSG_DATA A
-		                         WHERE   A.USER_ID NOT IN ('hftest',
-		                                                   'itntest',
-		                                                   'imotest',
-		                                                   'itntestBatch')
-		                         AND     A.RESERVE_C_YN = 'N'
-		                         AND     A.MSG_GROUP_ID = M.MSG_GROUP_ID
-		                         AND     (CASE
-		                         			WHEN A.AGENT_CODE = '01' AND (A.RSLT_CODE = '100' AND (A.RSLT_CODE2 = '0'))
-		                         			THEN 'S'
-		                         			WHEN A.AGENT_CODE = '02' AND (A.RSLT_CODE = '0')
-		                         			THEN 'S'
-		                         			WHEN A.AGENT_CODE = '03' AND (A.RSLT_CODE = '100' OR A.RSLT_CODE = '101' OR A.RSLT_CODE = '110' OR A.RSLT_CODE = '800')
-		                         			THEN 'S'
-		                         			WHEN A.AGENT_CODE = '04' AND (A.RSLT_CODE = '4100' OR A.RSLT_CODE = '6600')
-                                            THEN 'S'
-                                            WHEN A.AGENT_CODE = '05' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
-                                            THEN 'S'
-                                            WHEN A.AGENT_CODE = '07' AND (A.RSLT_CODE = '6' OR A.RSLT_CODE = '1000')
-                                            THEN 'S'
-                                            WHEN A.AGENT_CODE = '08' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
-                                            THEN 'S'
-                                            WHEN A.AGENT_CODE = '09' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
-                                            THEN 'S'                                                                                        
-                                            WHEN (
-                                            	A.RSLT_CODE  IS NULL
-                                            	AND A.RSLT_CODE2 IS NULL
-                                            	AND A.SENT_DATE IS NULL
-                                            	AND A.RSLT_DATE IS NULL
-                                            )
-                                            THEN 'W'
-                                            ELSE 'F'
-									END ) = 'S'
-		                         )
-		                         AS successCount
-		                         /*성공건수*/
-		                         
-		                 FROM    ( SELECT  DATE_FORMAT(P.REQ_DATE, '%Y-%m-%d') AS REQ_DATE ,
-		                                  SUM(P.MSG_GROUP_CNT)                 AS MSG_GROUP_CNT ,
-		                                  P.MSG_GROUP_ID
-		                         FROM     MJ_MSG_GROUP_DATA P
-		                         WHERE    USER_ID NOT IN ('hftest',
-		                                                  'itntest',
-		                                                  'imotest',
-		                                                  'itntestBatch')
-		                         AND      P.RESERVE_C_YN                       = 'N'
-		                         AND  	  P.req_date > DATE_ADD(now(), interval -14 day)
-		                         GROUP BY P.MSG_GROUP_ID
-		                         )
-		                         M
-		                 )
-		                 M2
-		        GROUP BY M2.regDate
-		        )aa
-		on DUPLICATE KEY UPDATE
-		send_cnt=aa.sendCount
-		, success_cnt=aa.successCount
-		, regist_pnttm=now()
-       	
+		FROM(
+			SELECT
+				M2.regDate
+				, SUM(M2.hSendCount)		AS hSendCount
+				, SUM(M2.hSuccessCount)		AS hSuccessCount
+				, SUM(M2.aSendCount)		AS aSendCount
+				, SUM(M2.aSuccessCount)		AS aSuccessCount 
+				
+			FROM(
+				SELECT
+					M.REQ_DATE						AS regDate		/*발송일*/
+					, IFNULL(M.MSG_GROUP_CNT, 0)	AS sendCount	/*발송건수*/
+					, M.aSendCount									/*API 발송건수*/
+					, M.hSendCount									/*홈페이지 발송건수*/
+					, MSG_GROUP_ID 
+					, (SELECT
+							COUNT(0)
+						FROM
+							MJ_MSG_DATA A
+						WHERE 1=1
+							AND A.USER_ID NOT IN ('hftest','itntest','imotest','itntestBatch')
+							AND A.RESERVE_C_YN = 'N'
+							AND A.MSG_GROUP_ID = M.MSG_GROUP_ID
+							AND M.SEND_KIND = 'H'
+							AND (
+								CASE
+									WHEN A.AGENT_CODE = '01' AND (A.RSLT_CODE = '100' AND (A.RSLT_CODE2 = '0'))
+									THEN 'S'
+									WHEN A.AGENT_CODE = '02' AND (A.RSLT_CODE = '0')
+									THEN 'S'
+									WHEN A.AGENT_CODE = '03' AND (A.RSLT_CODE = '100' OR A.RSLT_CODE = '101' OR A.RSLT_CODE = '110' OR A.RSLT_CODE = '800')
+									THEN 'S'
+									WHEN A.AGENT_CODE = '04' AND (A.RSLT_CODE = '4100' OR A.RSLT_CODE = '6600')
+									THEN 'S'
+									WHEN A.AGENT_CODE = '05' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
+									THEN 'S'
+									WHEN A.AGENT_CODE = '07' AND (A.RSLT_CODE = '6' OR A.RSLT_CODE = '1000')
+									THEN 'S'
+									WHEN A.AGENT_CODE = '08' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
+									THEN 'S'
+									WHEN A.AGENT_CODE = '09' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
+									THEN 'S'
+									WHEN (A.RSLT_CODE  IS NULL AND A.RSLT_CODE2 IS NULL AND A.SENT_DATE IS NULL AND A.RSLT_DATE IS NULL )
+									THEN 'W'
+									ELSE 'F'
+								END 
+								) = 'S'
+					)	AS hSuccessCount /*홈페이지 성공건수*/
+					, (SELECT
+							COUNT(0)
+						FROM
+							MJ_MSG_DATA A
+						WHERE 1=1
+							AND A.USER_ID NOT IN ('hftest','itntest','imotest','itntestBatch')
+							AND A.RESERVE_C_YN = 'N'
+							AND A.MSG_GROUP_ID = M.MSG_GROUP_ID
+							AND M.SEND_KIND = 'A'
+							AND (
+								CASE
+									WHEN A.AGENT_CODE = '01' AND (A.RSLT_CODE = '100' AND (A.RSLT_CODE2 = '0'))
+									THEN 'S'
+									WHEN A.AGENT_CODE = '02' AND (A.RSLT_CODE = '0')
+									THEN 'S'
+									WHEN A.AGENT_CODE = '03' AND (A.RSLT_CODE = '100' OR A.RSLT_CODE = '101' OR A.RSLT_CODE = '110' OR A.RSLT_CODE = '800')
+									THEN 'S'
+									WHEN A.AGENT_CODE = '04' AND (A.RSLT_CODE = '4100' OR A.RSLT_CODE = '6600')
+									THEN 'S'
+									WHEN A.AGENT_CODE = '05' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
+									THEN 'S'
+									WHEN A.AGENT_CODE = '07' AND (A.RSLT_CODE = '6' OR A.RSLT_CODE = '1000')
+									THEN 'S'
+									WHEN A.AGENT_CODE = '08' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
+									THEN 'S'
+									WHEN A.AGENT_CODE = '09' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
+									THEN 'S'
+									WHEN (A.RSLT_CODE  IS NULL AND A.RSLT_CODE2 IS NULL AND A.SENT_DATE IS NULL AND A.RSLT_DATE IS NULL )
+									THEN 'W'
+									ELSE 'F'
+								END ) = 'S'
+					)	AS aSuccessCount /*API 성공건수*/
+				FROM(
+					SELECT
+						DATE_FORMAT(P.REQ_DATE, '%Y-%m-%d') AS REQ_DATE
+						, SUM(P.MSG_GROUP_CNT)				AS MSG_GROUP_CNT 
+						, P.MSG_GROUP_ID
+						, P.SEND_KIND
+						, IF(P.SEND_KIND = 'A', SUM(P.MSG_GROUP_CNT), 0) AS aSendCount
+						, IF(P.SEND_KIND = 'H', SUM(P.MSG_GROUP_CNT), 0) AS hSendCount
+					FROM
+						MJ_MSG_GROUP_DATA P
+					WHERE 1=1
+						AND USER_ID NOT IN ('hftest', 'itntest', 'imotest', 'itntestBatch')
+						AND P.RESERVE_C_YN = 'N'
+						AND P.req_date > DATE_ADD(now(), interval -14 day)
+					GROUP BY
+						P.MSG_GROUP_ID
+					)M
+				)M2
+				GROUP BY M2.regDate
+			)aa
+		ON DUPLICATE KEY UPDATE
+			send_cnt				=aa.hSendCount
+			, success_cnt			=aa.hSuccessCount
+			, API_SEND_CNT			=aa.aSendCount
+			, API_SUCCESS_CNT		=aa.aSuccessCount
+			, regist_pnttm			=now()
 	</insert>
 	
 	<insert id="mjonSttst.insertMjSttstMsgDayBulk" parameterClass="mjonMsgVO">
-		INSERT	INTO   mj_sttst_msg
-		(send_date, send_cnt, success_cnt, regist_pnttm)
+		INSERT	INTO   MJ_STTST_MSG
+		(
+			send_date
+			, send_cnt
+			, success_cnt
+			, API_SEND_CNT
+			, API_SUCCESS_CNT
+			, regist_pnttm
+		)
 		
-		select aa.regDate
-			, aa.sendCount
-			, aa.successCount
+		SELECT
+			aa.regDate
+			, aa.hSendCount
+			, aa.hSuccessCount
+			, aa.aSendCount
+			, aa.aSuccessCount
 			, now()
-			
-		from (
-		        SELECT   
-		                 M2.regDate ,
-		                 SUM(M2.sendCount)    AS sendCount ,
-		                 SUM(M2.successCount) AS successCount
-		                 
-		        FROM     ( SELECT
-		                         M.REQ_DATE AS regDate
-		                         /*발송일*/
-		                         
-		                         , IFNULL(M.MSG_GROUP_CNT, 0) AS sendCount
-		                         /*발송건수*/
-		                         
-		                         , MSG_GROUP_ID
-		                          
-		                         , (SELECT COUNT(0)
-		                         FROM    MJ_MSG_DATA A
-		                         WHERE   A.USER_ID NOT IN ('hftest',
-		                                                   'itntest',
-		                                                   'imotest',
-		                                                   'itntestBatch')
-		                         AND     A.RESERVE_C_YN = 'N'
-		                         AND     A.MSG_GROUP_ID = M.MSG_GROUP_ID
-		                         AND     (
-									CASE
-										WHEN A.AGENT_CODE = '01' AND (A.RSLT_CODE = '100' AND(A.RSLT_CODE2 = '0'))
-										THEN 'S' 
-										WHEN A.AGENT_CODE = '02' AND (A.RSLT_CODE = '0')
-										THEN 'S'
-										WHEN A.AGENT_CODE = '03' AND (A.RSLT_CODE = '100' OR A.RSLT_CODE = '101' OR A.RSLT_CODE = '110' OR A.RSLT_CODE = '800')
-										THEN 'S'
-										WHEN A.AGENT_CODE = '04' AND (A.RSLT_CODE = '4100' OR A.RSLT_CODE = '6600')
-										THEN 'S'
-										WHEN A.AGENT_CODE = '05' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
-										THEN 'S'
-										WHEN A.AGENT_CODE = '07' AND (A.RSLT_CODE = '6' OR A.RSLT_CODE = '1000')
-										THEN 'S'
-										WHEN A.AGENT_CODE = '08' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
-										THEN 'S'
-										WHEN A.AGENT_CODE = '09' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
-										THEN 'S'																				
-										WHEN (
-											A.RSLT_CODE  IS NULL
-											AND A.RSLT_CODE2 IS NULL
-											AND A.SENT_DATE  IS NULL
-											AND A.RSLT_DATE  IS NULL
-										)
-										THEN 'W'
-										ELSE 'F'
-									END ) = 'S'
-		                         )
-		                         AS successCount
-		                         /*성공건수*/
-		                         
-		                 FROM    ( SELECT  DATE_FORMAT(P.REQ_DATE, '%Y-%m-%d') AS REQ_DATE ,
-		                                  SUM(P.MSG_GROUP_CNT)                 AS MSG_GROUP_CNT ,
-		                                  P.MSG_GROUP_ID
-		                         FROM     MJ_MSG_GROUP_DATA P
-		                         WHERE    USER_ID NOT IN ('hftest',
-		                                                  'itntest',
-		                                                  'imotest',
-		                                                  'itntestBatch')
-		                         AND      P.RESERVE_C_YN                       = 'N'		                         
-		                         GROUP BY P.MSG_GROUP_ID
-		                         )
-		                         M
-		                 )
-		                 M2
-		        GROUP BY M2.regDate
-		        )aa
-		on DUPLICATE KEY UPDATE
-		send_cnt=aa.sendCount
-		, success_cnt=aa.successCount
-		, regist_pnttm=now()
-       	
+		FROM(
+			SELECT
+				M2.regDate
+				, SUM(M2.sendCount)    AS sendCount
+				, SUM(M2.successCount) AS successCount
+			FROM(
+				SELECT
+					M.REQ_DATE							AS regDate /*발송일*/
+					, IFNULL(M.MSG_GROUP_CNT, 0)		AS sendCount /*발송건수*/
+					, M.aSendCount									/*API 발송건수*/
+					, M.hSendCount									/*홈페이지 발송건수*/
+					, MSG_GROUP_ID
+					, (SELECT
+							COUNT(0)
+						FROM
+							MJ_MSG_DATA A
+						WHERE 1=1
+							AND A.USER_ID NOT IN ('hftest','itntest','imotest','itntestBatch')
+							AND A.RESERVE_C_YN = 'N'
+							AND A.MSG_GROUP_ID = M.MSG_GROUP_ID
+							AND M.SEND_KIND = 'H'
+							AND (
+								CASE
+									WHEN A.AGENT_CODE = '01' AND (A.RSLT_CODE = '100' AND (A.RSLT_CODE2 = '0'))
+									THEN 'S'
+									WHEN A.AGENT_CODE = '02' AND (A.RSLT_CODE = '0')
+									THEN 'S'
+									WHEN A.AGENT_CODE = '03' AND (A.RSLT_CODE = '100' OR A.RSLT_CODE = '101' OR A.RSLT_CODE = '110' OR A.RSLT_CODE = '800')
+									THEN 'S'
+									WHEN A.AGENT_CODE = '04' AND (A.RSLT_CODE = '4100' OR A.RSLT_CODE = '6600')
+									THEN 'S'
+									WHEN A.AGENT_CODE = '05' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
+									THEN 'S'
+									WHEN A.AGENT_CODE = '07' AND (A.RSLT_CODE = '6' OR A.RSLT_CODE = '1000')
+									THEN 'S'
+									WHEN A.AGENT_CODE = '08' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
+									THEN 'S'
+									WHEN A.AGENT_CODE = '09' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
+									THEN 'S'
+									WHEN (A.RSLT_CODE  IS NULL AND A.RSLT_CODE2 IS NULL AND A.SENT_DATE IS NULL AND A.RSLT_DATE IS NULL )
+									THEN 'W'
+									ELSE 'F'
+								END 
+								) = 'S'
+					)	AS hSuccessCount /*홈페이지 성공건수*/
+					, (SELECT
+							COUNT(0)
+						FROM
+							MJ_MSG_DATA A
+						WHERE 1=1
+							AND A.USER_ID NOT IN ('hftest','itntest','imotest','itntestBatch')
+							AND A.RESERVE_C_YN = 'N'
+							AND A.MSG_GROUP_ID = M.MSG_GROUP_ID
+							AND M.SEND_KIND = 'A'
+							AND (
+								CASE
+									WHEN A.AGENT_CODE = '01' AND (A.RSLT_CODE = '100' AND (A.RSLT_CODE2 = '0'))
+									THEN 'S'
+									WHEN A.AGENT_CODE = '02' AND (A.RSLT_CODE = '0')
+									THEN 'S'
+									WHEN A.AGENT_CODE = '03' AND (A.RSLT_CODE = '100' OR A.RSLT_CODE = '101' OR A.RSLT_CODE = '110' OR A.RSLT_CODE = '800')
+									THEN 'S'
+									WHEN A.AGENT_CODE = '04' AND (A.RSLT_CODE = '4100' OR A.RSLT_CODE = '6600')
+									THEN 'S'
+									WHEN A.AGENT_CODE = '05' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
+									THEN 'S'
+									WHEN A.AGENT_CODE = '07' AND (A.RSLT_CODE = '6' OR A.RSLT_CODE = '1000')
+									THEN 'S'
+									WHEN A.AGENT_CODE = '08' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
+									THEN 'S'
+									WHEN A.AGENT_CODE = '09' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
+									THEN 'S'
+									WHEN (A.RSLT_CODE  IS NULL AND A.RSLT_CODE2 IS NULL AND A.SENT_DATE IS NULL AND A.RSLT_DATE IS NULL )
+									THEN 'W'
+									ELSE 'F'
+								END ) = 'S'
+					)	AS aSuccessCount /*API 성공건수*/
+				FROM(
+					SELECT
+						DATE_FORMAT(P.REQ_DATE, '%Y-%m-%d') AS REQ_DATE
+						, SUM(P.MSG_GROUP_CNT)				AS MSG_GROUP_CNT
+						, P.MSG_GROUP_ID
+						, P.SEND_KIND
+						, IF(P.SEND_KIND = 'A', SUM(P.MSG_GROUP_CNT), 0) AS aSendCount
+						, IF(P.SEND_KIND = 'H', SUM(P.MSG_GROUP_CNT), 0) AS hSendCount
+					FROM
+						MJ_MSG_GROUP_DATA P
+					WHERE 1=1
+						AND USER_ID NOT IN ('hftest','itntest','imotest','itntestBatch')
+						AND P.RESERVE_C_YN = 'N'
+					GROUP BY
+						P.MSG_GROUP_ID
+					)M
+				)M2
+				GROUP BY M2.regDate
+			)aa
+		ON DUPLICATE KEY UPDATE
+			send_cnt				=aa.hSendCount
+			, success_cnt			=aa.hSuccessCount
+			, API_SEND_CNT			=aa.aSendCount
+			, API_SUCCESS_CNT		=aa.aSuccessCount
+			, regist_pnttm			=now()
 	</insert>
 	
 	<insert id="mjonSttst.insertMjSttstMsgRankBulk" parameterClass="mjonMsgVO">

src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml

@@ -247,7 +247,7 @@
 				WHEN M.grdSetNo = 9 THEN 'orange'
 				WHEN M.grdSetNo = 10 THEN 'green'
 				WHEN M.grdSetNo = 11 THEN 'yellow'
-				WHEN M.grdSetNo = 112 THEN 'white'
+				WHEN M.grdSetNo = 12 THEN 'white'
 			END grdSetIcon		
 			, M.grdDate		
 			, M.totAmt
@@ -319,7 +319,7 @@
 				, IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) AS REFUND_SUM
 				, (SUM(S.AMT) - IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0)) AS AMT_SUM
 				, (
-					SELECT IFNULL(MIN(S1.GRD_SET_NO), 12) FROM MJ_MBER_GRD_SETTING S1 WHERE S1.STD_AMT <= (SUM(S.AMT) - IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0))
+					SELECT IFNULL(MIN(S1.GRD_SET_NO), (SELECT MAX(GRD_SET_NO) FROM MJ_MBER_GRD_SETTING)) FROM MJ_MBER_GRD_SETTING S1 WHERE S1.STD_AMT <= (SUM(S.AMT) - IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0))
 				 ) GRD_SET_NO 
 			FROM MJ_PG S 
 			LEFT OUTER JOIN MJ_EVENT_MBER_INFO SS
@@ -371,7 +371,7 @@
 			, #picture3Price#
 			, #amt#
 			, #totAmt#
-			, #grdDate#
+			, #grdNewDate#
 			, #grdStartDate#
 			, #grdEndDate#
 			, #grdStatus#
@@ -394,6 +394,7 @@
 			, PICTURE3_PRICE		= #picture3Price#
 			, AMT					= #amt#
 			, TOT_AMT				= #totAmt#
+			, GRD_DATE				= #grdNewDate#
 			, EDIT_ID				= #editId#
 			, EDIT_DATE				= NOW()
 		WHERE 
@@ -402,7 +403,7 @@
 	
 	<!-- 회원별 등급 등록 All => 기존대상자 제외 -->
 	<insert id="mberGrdDAO.insertMberGrdAllByExist" parameterClass="mberGrdVO">	
-			INSERT INTO MJ_MBER_GRD_INFO 
+		INSERT INTO MJ_MBER_GRD_INFO 
 		(
 			MBER_ID
 			, GRD_SET_NO
@@ -423,13 +424,13 @@
 			, EDIT_DATE
 		)
 		SELECT
-			A.MBER_ID
-			, S.GRD_SET_NO
-			, S.SHORT_PRICE
-			, S.LONG_PRICE
-			, S.PICTURE_PRICE
-			, S.PICTURE2_PRICE
-			, S.PICTURE3_PRICE
+			M.MBER_ID
+			, M.GRD_SET_NO
+			, M.SHORT_PRICE
+			, M.LONG_PRICE
+			, M.PICTURE_PRICE
+			, M.PICTURE2_PRICE
+			, M.PICTURE3_PRICE
 			, 0
 			, 0
 			, #grdNewDate#
@@ -439,19 +440,81 @@
 			, ''
 			, NOW()
 			, ''
-			, NOW()
-		FROM LETTNGNRLMBER A
-		INNER JOIN MJ_MBER_GRD_SETTING S
-			ON S.GRD_SET_NO = 12
-		WHERE A.MBER_STTUS = 'Y'
-			AND MBER_ID NOT IN (SELECT MBER_ID FROM MJ_MBER_GRD_INFO)
+			, NOW()	
+		FROM (
+			SELECT
+				A.MBER_ID
+				, S.GRD_SET_NO
+				, S.SHORT_PRICE
+				, S.LONG_PRICE
+				, S.PICTURE_PRICE
+				, S.PICTURE2_PRICE
+				, S.PICTURE3_PRICE
+				, IFNULL(A.BLINE_CODE, 'N') 	AS blineCode
+				, IFNULL(A.SPAM_YN, 'N') 		AS spamYn
+				, CASE
+					WHEN 
+						(A.SHORT_PRICE > 0 
+							AND (B.SHORT_PRICE > A.SHORT_PRICE 
+								OR B.LONG_PRICE > A.LONG_PRICE 
+								OR B.PICTURE_PRICE > A.PICTURE_PRICE 
+								OR B.PICTURE2_PRICE > A.PICTURE2_PRICE 
+								OR B.PICTURE3_PRICE > A.PICTURE3_PRICE)
+						)
+					THEN 'Y'
+					ELSE 'N'
+				END isSalePrice			
+			FROM LETTNGNRLMBER A
+			INNER JOIN MJ_MBER_GRD_SETTING S
+				ON S.GRD_SET_NO = (SELECT MAX(GRD_SET_NO) FROM MJ_MBER_GRD_SETTING)
+			JOIN MJ_MBER_SETTING B			
+			WHERE A.MBER_STTUS = 'Y'
+				AND MBER_ID NOT IN (SELECT MBER_ID FROM MJ_MBER_GRD_INFO)
+		) M
+		WHERE M.isSalePrice = 'N'
+			AND M.blineCode = 'N'
+			AND M.spamYn = 'N'	
 	</insert>			
 	
-	<!-- 
-		회원별 등급 일괄변경
-		=> 기존등급보다 상위등급 대상만 업데이트 됨.
-		=> 기존등급과 같거나 좋지않은 경우 제외됨.
-	 -->
+	<!-- 회원별 등급 히스토리 등록 All -->
+	<insert id="mberGrdDAO.insertMberGrdHistAll" parameterClass="mberGrdVO">	
+		INSERT INTO MJ_MBER_GRD_HIST
+		(
+			MBER_ID
+			, GRD_SET_NO
+			, SHORT_PRICE
+			, LONG_PRICE
+			, PICTURE_PRICE
+			, PICTURE2_PRICE
+			, PICTURE3_PRICE
+			, AMT
+			, TOT_AMT
+			, GRD_DATE
+			, REG_ID
+			, REG_DATE
+			, EDIT_ID
+			, EDIT_DATE
+		)
+		SELECT
+			MBER_ID
+			, GRD_SET_NO
+			, SHORT_PRICE
+			, LONG_PRICE
+			, PICTURE_PRICE
+			, PICTURE2_PRICE
+			, PICTURE3_PRICE
+			, AMT
+			, TOT_AMT
+			, GRD_DATE
+			, REG_ID
+			, REG_DATE
+			, EDIT_ID
+			, EDIT_DATE
+		FROM MJ_MBER_GRD_INFO
+		WHERE GRD_STATUS = 'Y'
+	</insert>			
+
+	<!-- 회원별 등급 일괄변경 -->
 	<update id="mberGrdDAO.updateMberGrdAll" parameterClass="mberGrdVO">
 	<![CDATA[
 		UPDATE MJ_MBER_GRD_INFO A
@@ -469,7 +532,7 @@
 					, IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) AS REFUND_SUM
 					, (SUM(S.AMT) - IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0)) AS AMT_SUM
 					, (
-						SELECT IFNULL(MIN(S1.GRD_SET_NO), 12) FROM MJ_MBER_GRD_SETTING S1 WHERE S1.STD_AMT <= (SUM(S.AMT) - IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0))
+						SELECT IFNULL(MIN(S1.GRD_SET_NO), (SELECT MAX(GRD_SET_NO) FROM MJ_MBER_GRD_SETTING)) FROM MJ_MBER_GRD_SETTING S1 WHERE S1.STD_AMT <= (SUM(S.AMT) - IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0))
 					 ) GRD_SET_NO 
 				FROM MJ_PG S 
 				LEFT OUTER JOIN MJ_EVENT_MBER_INFO SS
@@ -495,9 +558,11 @@
 			, A.PICTURE_PRICE = C.PICTURE_PRICE
 			, A.PICTURE2_PRICE = C.PICTURE2_PRICE
 			, A.PICTURE3_PRICE = C.PICTURE3_PRICE
+			, A.AMT = B.AMT_SUM
 			, A.TOT_AMT = B.AMT_SUM
 			, A.GRD_DATE = CONCAT(DATE_FORMAT(#grdNewDate#, '%Y-%m-%d'), ' ', '00:00:00')
 			, A.EDIT_DATE = NOW()
+			, A.TEMP_YN = 'Y'
 		WHERE B.GRD_SET_NO IS NOT NULL
 			AND A.GRD_STATUS = 'Y'
 			AND NOW() BETWEEN A.GRD_START_DATE AND A.GRD_END_DATE
@@ -525,7 +590,7 @@
 					, IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) AS REFUND_SUM
 					, (SUM(S.AMT) - IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0)) AS AMT_SUM
 					, (
-						SELECT IFNULL(MIN(S1.GRD_SET_NO), 12) FROM MJ_MBER_GRD_SETTING S1 WHERE S1.STD_AMT <= (SUM(S.AMT) - IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0))
+						SELECT IFNULL(MIN(S1.GRD_SET_NO), (SELECT MAX(GRD_SET_NO) FROM MJ_MBER_GRD_SETTING)) FROM MJ_MBER_GRD_SETTING S1 WHERE S1.STD_AMT <= (SUM(S.AMT) - IFNULL(ROUND(SUM(R.TRNSF_CASH)), 0) - IFNULL(SS.EVENT_FRST_CASH + ROUND(SS.EVENT_FRST_CASH / 10), 0))
 					 ) GRD_SET_NO 
 				FROM MJ_PG S 
 				LEFT OUTER JOIN MJ_EVENT_MBER_INFO SS
@@ -551,6 +616,7 @@
 			, A.PICTURE_PRICE = C.PICTURE_PRICE
 			, A.PICTURE2_PRICE = C.PICTURE2_PRICE
 			, A.PICTURE3_PRICE = C.PICTURE3_PRICE
+			, A.AMT = B.AMT_SUM
 			, A.TOT_AMT = B.AMT_SUM
 			, A.GRD_DATE = CONCAT(DATE_FORMAT(#grdNewDate#, '%Y-%m-%d'), ' ', '00:00:00')
 			, A.EDIT_ID	= #editId#
@@ -562,6 +628,48 @@
 	]]>
 	</update>	
 	
+	<!-- 회원별 등급 초기화 By Temp -->
+	<update id="mberGrdDAO.updateMberGrdWhiteByTemp" parameterClass="mberGrdVO">
+	<![CDATA[
+		UPDATE MJ_MBER_GRD_INFO A
+		JOIN MJ_MBER_GRD_SETTING C
+		SET
+			A.GRD_SET_NO = C.GRD_SET_NO
+			, A.SHORT_PRICE = C.SHORT_PRICE
+			, A.LONG_PRICE = C.LONG_PRICE
+			, A.PICTURE_PRICE = C.PICTURE_PRICE
+			, A.PICTURE2_PRICE = C.PICTURE2_PRICE
+			, A.PICTURE3_PRICE = C.PICTURE3_PRICE
+			, A.AMT = 0
+			, A.TOT_AMT = 0
+			, A.GRD_DATE = CONCAT(DATE_FORMAT(#grdNewDate#, '%Y-%m-%d'), ' ', '00:00:00')
+			, A.EDIT_DATE = NOW()
+			, A.TEMP_YN = 'Y'
+		WHERE A.TEMP_YN = 'N'
+			AND C.GRD_SET_NO = (SELECT MAX(GRD_SET_NO) FROM MJ_MBER_GRD_SETTING)
+	]]>
+	</update>	
+
+	<!-- 회원별 등급 초기화 All -->
+	<update id="mberGrdDAO.updateMberGrdWhiteAll" parameterClass="mberGrdVO">
+	<![CDATA[
+		UPDATE MJ_MBER_GRD_INFO A
+		JOIN MJ_MBER_GRD_SETTING C
+		SET
+			A.GRD_SET_NO = C.GRD_SET_NO
+			, A.SHORT_PRICE = C.SHORT_PRICE
+			, A.LONG_PRICE = C.LONG_PRICE
+			, A.PICTURE_PRICE = C.PICTURE_PRICE
+			, A.PICTURE2_PRICE = C.PICTURE2_PRICE
+			, A.PICTURE3_PRICE = C.PICTURE3_PRICE
+			, A.AMT = 0
+			, A.TOT_AMT = 0
+			, A.GRD_DATE = CONCAT(DATE_FORMAT(#grdNewDate#, '%Y-%m-%d'), ' ', '00:00:00')
+			, A.EDIT_DATE = NOW()
+		WHERE C.GRD_SET_NO = (SELECT MAX(GRD_SET_NO) FROM MJ_MBER_GRD_SETTING)
+	]]>
+	</update>	
+		
 	<!-- 문자할인, B선라인, 스팸회원 대상자 종료 -->
 	<update id="mberGrdDAO.updateMberGrdEndBySale" parameterClass="mberGrdVO">
 	<![CDATA[
@@ -604,6 +712,12 @@
 	]]>
 	</update>	
 	
+	<!-- 전체회원 TEMP_YN 업데이트 -->
+	<update id="mberGrdDAO.updateMberGrdTempYn" parameterClass="mberGrdVO">
+		UPDATE MJ_MBER_GRD_INFO SET
+			TEMP_YN		= #tempYn#
+	</update>	
+		
 	<!-- 전체회원 등급 종료 -->
 	<update id="mberGrdDAO.updateMberGrdEndAll" parameterClass="mberGrdVO">
 		UPDATE MJ_MBER_GRD_INFO SET
@@ -719,6 +833,7 @@
 			, AMT
 			, TOT_AMT
 			, GRD_DATE
+			, MOID
 			, REG_ID
 			, REG_DATE
 			, EDIT_ID
@@ -735,7 +850,8 @@
 			, #picture3Price#
 			, #amt#
 			, #totAmt#
-			, #grdDate#
+			, #grdNewDate#
+			, #moid#			
 			, #regId#
 			, NOW()
 			, #editId#
@@ -744,6 +860,7 @@
 	</insert>
 		
 	<!-- 회원별 등급 히스토리 목록 => 등급제 시행일이후 목록(사용자화면용) -->
+	<!-- AND A.GRD_DATE >= (SELECT S.GRD_DATE FROM MJ_MBER_GRD_INFO S WHERE S.MBER_ID = #mberId#) -->
 	<select id="mberGrdDAO.selectMberGrdHistByGrdDateList" parameterClass="mberGrdVO" resultClass="mberGrdVO">
 		SELECT
 			COUNT(MBER_ID) OVER() 	AS totCnt
@@ -758,6 +875,7 @@
 			, A.AMT					AS amt
 			, A.TOT_AMT				AS totAmt
 			, A.GRD_DATE			AS grdDate
+			, A.MOID				AS moid
 			, A.REG_ID				AS regId
 			, DATE_FORMAT(A.REG_DATE, '%Y-%m-%d %H:%i')			AS regDate
 			, A.EDIT_ID				AS editId
@@ -767,7 +885,8 @@
 			ON A.GRD_SET_NO = B.GRD_SET_NO		
 		WHERE 1=1 
 		AND A.MBER_ID = #mberId#
-		AND A.GRD_DATE >= (SELECT S.GRD_DATE FROM MJ_MBER_GRD_INFO S WHERE S.MBER_ID = #mberId#)
+		AND IFNULL(TRIM(A.MOID), '') != ''
+		AND A.TOT_AMT > 0
 		ORDER BY A.REG_DATE DESC
 		LIMIT  #recordCountPerPage# OFFSET #firstIndex#	
 	</select>

src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Mysql.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://www.ibatis.com/dtd/sql-map-config-2.dtd">
+<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://ibatis.apache.org/dtd/sql-map-2.dtd">
 
 <sqlMap namespace="UserLog">
 

src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml

@@ -1331,6 +1331,7 @@
 					AND A.MSG_GROUP_ID = A.msgGroupId
 					AND (<include refid="MjonMsgSentDAO.selectAgentResultQuery_A"/>) = 'S'
 			) AS successCnt
+			, MGD.SEND_KIND	AS sendKind
 			, MGD.SMS_TXT	AS smsTxt
 			, userdata
 			, curState
@@ -1451,6 +1452,7 @@
 					AND A.MSG_GROUP_ID = A.msgGroupId
 					AND (<include refid="MjonMsgSentDAO.selectAgentResultQuery_A"/>) = 'S'
 			) AS successCnt
+			, MGD.SEND_KIND	AS sendKind
 			, MGD.SMS_TXT	AS smsTxt
 			, userdata
 			, curState
@@ -1574,6 +1576,7 @@
 					AND A.MSG_GROUP_ID = A.msgGroupId
 					AND (<include refid="MjonMsgSentDAO.selectAgentResultQuery_A"/>) = 'S'
 			) AS successCnt
+			, MGD.SEND_KIND	AS sendKind
 			, MGD.SMS_TXT	AS smsTxt
 			, userdata
 			, curState

src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml

@@ -533,10 +533,12 @@
     </select>
 
     <select id="userManageDAO.selectUserIdAjax2" parameterClass="userVO" resultClass="userVO">
-		SELECT a.mber_Id AS emplyrId,
-			   DATE_FORMAT(a.SBSCRB_DE, '%Y-%m-%d') as sbscrbDeBegin,
-			   a.CRTFC_DN_VALUE AS mblDn
-		FROM   lettngnrlmber a
+		SELECT
+			a.mber_Id								AS emplyrId
+			, DATE_FORMAT(a.SBSCRB_DE, '%Y-%m-%d')	AS sbscrbDeBegin
+			, a.CRTFC_DN_VALUE						AS mblDn
+		FROM
+			lettngnrlmber a
 		WHERE 1=1
 		<isEmpty property="emplyrNm">
 			<isEmpty property="emailAdres">
@@ -544,21 +546,21 @@
 					<isEmpty property="emplyrId">
 						AND	1=2
 					</isEmpty>
-				</isEmpty>				
+				</isEmpty>
 			</isEmpty>
 		</isEmpty>
 				
 		<isNotEmpty property="emplyrNm">
-			AND    (a.MBER_NM = #emplyrNm# OR a.MANAGER_NM = #emplyrNm#)
-		</isNotEmpty>		
+			AND (a.MBER_NM = #emplyrNm# OR a.MANAGER_NM = #emplyrNm#)
+		</isNotEmpty>
 		<isNotEmpty property="emailAdres">
-			AND    a.MBER_EMAIL_ADRES 	= #emailAdres#
+			AND a.MBER_EMAIL_ADRES = #emailAdres#
 		</isNotEmpty>
 		<isNotEmpty property="moblphonNo">
-			AND    a.MBTLNUM 			= #moblphonNo#
+			AND a.MBTLNUM = #moblphonNo#
 		</isNotEmpty>
 		<isNotEmpty property="emplyrId">
-			AND    a.mber_Id 			= #emplyrId#
+			AND a.mber_Id = #emplyrId#
 		</isNotEmpty>
     </select>
     

src/main/webapp/WEB-INF/decorators.xml

@@ -149,6 +149,10 @@
       
       <pattern>/let/mjo/tax/updateTaxReceiptFileAjax.do</pattern> <!-- 세금계산서 등록 -->
       
+      <pattern>/uss/ion/msg/weekendCsWork.do</pattern>
+      <pattern>/uss/ion/msg/weekendCsWork2.do</pattern>
+      <pattern>/uss/ion/msg/pdfView.do</pattern>
+      
     </decorator>
     
 	<!-- 관리자 게시글 작성, 템플릿 미리보기(헤더풋터 없음) -->

src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserManage.jsp

@@ -112,7 +112,7 @@ function getMberStopCashSum() {
 			if (data.isSuccess) {
 				try {
 					var sHtml = "";
-					sHtml = "  (" + jsonInfo.userMoneyDay + " : " + jsonInfo.userMoneyDaySum + " / " + jsonInfo.userMoneyYear + "년 누적 : " + jsonInfo.userMoneyYearSum + ")";
+					sHtml = "(" + jsonInfo.userMoneyDay + " : " + jsonInfo.userMoneyDaySum + " / " + jsonInfo.userMoneyYear + "년 누적 : " + jsonInfo.userMoneyYearSum + ")";
 					$("#mberStopCashSumArea").html(sHtml);
 				} catch (error) {
 					  console.error(error);
@@ -487,8 +487,7 @@ function customLinkPage(mberId){
 			</div>
 			<div class="listTop">
 				<p class="tType5">
-					총 <span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${paginationInfo.totalRecordCount}" pattern="#,###" /></span>건
-					<span id="mberStopCashSumArea"></span>
+					총 <span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${paginationInfo.totalRecordCount}" pattern="#,###" /></span>건<span id="mberStopCashSumArea"></span>
 				</p>
 				<div class="rightWrap">
 					<!-- <input type="button" class="excelBtn" onclick="javascript:userListExcelDownload();"> -->

src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectMsgDataListPop.jsp

@@ -120,6 +120,10 @@ function init_date(){
 	$('#ntceEnddeYYYMMDD').val('');
 	$('#ntceBgnde').val('');
 	$('#ntceEndde').val('');
+	
+	$('#searchKeyword').val('');
+	$('#sendKind').val('').prop("selected",true);
+	$('#searchCondition').val('').prop("selected",true);
 }
 
 
@@ -342,6 +346,7 @@ function fn_updateSendRealTime(userId, msgGroupId){
 			<div class="tableWrap tableWrapTotal">
 				<table class="tbType1">
 					<colgroup>
+						<col style="width:5.00%">
 						<col style="width:5.00%">
 						<col style="width:5.50%">
 						<col style="width:7.00%">
@@ -361,6 +366,7 @@ function fn_updateSendRealTime(userId, msgGroupId){
 					</colgroup>
 					<thead>
 						<tr>
+							<th rowspan="2">방식</th>
 							<th colspan="4">단문</th>
 							<th colspan="4">장문</th>
 							<th colspan="4">그림문자</th>
@@ -387,51 +393,93 @@ function fn_updateSendRealTime(userId, msgGroupId){
 					</thead>
 					<tbody>
 						<tr>
-							<td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgSmsGroupSCntSum}" pattern="#,###" /></span></td>
-							<td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totSmsSPriceSum}" pattern="#,###" /></span></td>
-							<td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgSmsGroupFWCntSum}" pattern="#,###" /></span></td>
-							<td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totSmsFWPriceSum}" pattern="#,###" /></span></td>
-							<td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgLmsGroupSCntSum}" pattern="#,###" /></span></td>
-							<td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totLmsSPriceSum}" pattern="#,###" /></span></td>
-							<td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgLmsGroupFWCntSum}" pattern="#,###" /></span></td>
-							<td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totLmsFWPriceSum}" pattern="#,###" /></span></td>
-							<td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgMmsGroupSCntSum}" pattern="#,###" /></span></td>
-							<td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totMmsSPriceSum}" pattern="#,###" /></span></td>
-							<td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgMmsGroupFWCntSum}" pattern="#,###" /></span></td>
-							<td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totMmsFWPriceSum}" pattern="#,###" /></span></td>
-							<td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgGroupSCntSum}" pattern="#,###" /></span></td>
-							<td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totSPriceSum}" pattern="#,###" /></span></td>
-							<td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgGroupFWCntSum}" pattern="#,###" /></span></td>
-							<td><span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totFWPriceSum}" pattern="#,###" /></span></td>
+							<td>
+								전체
+							</td>
+							<td>
+								<span class="tType4 c_456ded fwBold">
+									<fmt:formatNumber value="${msgSmsGroupSCntSum}" pattern="#,###" />
+								</span>
+							</td>
+							<td>
+								<span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totSmsSPriceSum}" pattern="#,###" /></span>
+							</td>
+							<td>
+								<span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgSmsGroupFWCntSum}" pattern="#,###" /></span>
+							</td>
+							<td>
+								<span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totSmsFWPriceSum}" pattern="#,###" /></span>
+							</td>
+							<td>
+								<span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgLmsGroupSCntSum}" pattern="#,###" /></span>
+							</td>
+							<td>
+								<span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totLmsSPriceSum}" pattern="#,###" /></span>
+							</td>
+							<td>
+								<span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgLmsGroupFWCntSum}" pattern="#,###" /></span>
+							</td>
+							<td>
+								<span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totLmsFWPriceSum}" pattern="#,###" /></span>
+							</td>
+							<td>
+								<span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgMmsGroupSCntSum}" pattern="#,###" /></span>
+							</td>
+							<td>
+								<span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totMmsSPriceSum}" pattern="#,###" /></span>
+							</td>
+							<td>
+								<span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgMmsGroupFWCntSum}" pattern="#,###" /></span>
+							</td>
+							<td>
+								<span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totMmsFWPriceSum}" pattern="#,###" /></span>
+							</td>
+							<td>
+								<span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgGroupSCntSum}" pattern="#,###" /></span>
+							</td>
+							<td>
+								<span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totSPriceSum}" pattern="#,###" /></span>
+							</td>
+							<td>
+								<span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${msgGroupFWCntSum}" pattern="#,###" /></span>
+							</td>
+							<td>
+								<span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${totFWPriceSum}" pattern="#,###" /></span>
+							</td>
 						</tr>
 					</tbody>
 				</table>
 			</div>
 			
 			<div class="listSerch">
-				<select name="searchCondition" class="select" title="검색조건 선택">
+				
+				<select id="sendKind" name="sendKind" class="select" title="검색조건 선택">
+					<option value="" <c:if test="${searchVO.sendKind == ''}">selected="selected"</c:if>>발송방식 전체</option>
+					<option value="H" <c:if test="${searchVO.sendKind == 'H'}">selected="selected"</c:if>>WEB</option>
+					<option value="A" <c:if test="${searchVO.sendKind == 'A'}">selected="selected"</c:if>>API</option>
+				</select>
+				
+				<select id="searchCondition" name="searchCondition" class="select" title="검색조건 선택">
 					<option value="" <c:if test="${searchVO.searchCondition == ''}">selected="selected"</c:if>>발신번호/내용</option>
-					<%-- <option value="1" <c:if test="${searchVO.searchCondition == '1'}">selected="selected"</c:if>>사용자ID</option> --%>
-					<option value="2" <c:if test="${searchVO.searchCondition == '2'}">selected="selected"</c:if>>발신번호</option>
-					<option value="3" <c:if test="${searchVO.searchCondition == '3'}">selected="selected"</c:if>>전송내용</option>
+					<option value="1" <c:if test="${searchVO.searchCondition == '1'}">selected="selected"</c:if>>발신번호</option>
+					<option value="2" <c:if test="${searchVO.searchCondition == '2'}">selected="selected"</c:if>>전송내용</option>
 				</select>
 				
 				<input id="searchKeyword" name="searchKeyword" class="recentSearch" type="text" value="<c:out value='${searchVO.searchKeyword}'/>" size="25" title="검색" maxlength="100" />
 				<input type="button" class="btnType1" value="검색" onclick="fn_search(); return false;">
 				
 				<input type="hidden" name="cal_url" id="cal_url" value="/sym/cmm/EgovNormalCalPopup.do">
-			    <a href="#" onclick="javascript:fn_egov_NormalCalendar(document.forms.listForm, document.forms.listForm.ntceBgndeYYYMMDD);">
-			    <input style="width:auto;min-width: 83px;" type="text" class="date_format" name="ntceBgndeYYYMMDD" id="ntceBgndeYYYMMDD" size="4" maxlength="4" readonly=""
-			    value="<c:out value="${searchVO.ntceBgnde}" />" >
-			   	 	<input type="button" class="calBtn">
-		    	</a>
-		    	&nbsp;&nbsp;~    	
-			    <a href="#" onclick="javascript:fn_egov_NormalCalendar(document.forms.listForm, document.forms.listForm.ntceEnddeYYYMMDD);">
-				<input style="width:auto;min-width: 83px;" type="text" class="date_format" name="ntceEnddeYYYMMDD" id="ntceEnddeYYYMMDD" size="4" maxlength="4" readonly=""
-		    	value="<c:out value="${searchVO.ntceEndde}" />"
-		    	>
-			   	 	<input type="button" class="calBtn">
-		    	</a>
+				<a href="#" onclick="javascript:fn_egov_NormalCalendar(document.forms.listForm, document.forms.listForm.ntceBgndeYYYMMDD);">
+					<input style="width:auto;min-width: 83px;" type="text" class="date_format" name="ntceBgndeYYYMMDD" id="ntceBgndeYYYMMDD" size="4" maxlength="4" readonly=""
+					value="<c:out value="${searchVO.ntceBgnde}" />" >
+					<input type="button" class="calBtn">
+				</a>
+				&nbsp;&nbsp;~
+				<a href="#" onclick="javascript:fn_egov_NormalCalendar(document.forms.listForm, document.forms.listForm.ntceEnddeYYYMMDD);">
+					<input style="width:auto;min-width: 83px;" type="text" class="date_format" name="ntceEnddeYYYMMDD" id="ntceEnddeYYYMMDD" size="4" maxlength="4" readonly=""
+					value="<c:out value="${searchVO.ntceEndde}" />" >
+					<input type="button" class="calBtn">
+				</a>
 				<a href="#" style="margin-left: 17px;" onclick="init_date(); return false;">
 					<img src="/pb/img/common/topTimeOut.png" alt="타임아웃 아이콘">
 				</a>		    
@@ -462,7 +510,7 @@ function fn_updateSendRealTime(userId, msgGroupId){
 						<col style="width: 6%">
 						<%-- <col style="width: 8%"> --%>
 						<%-- <col style="width: 6%"> --%>
-						<%--<col style="width: 6%">--%>
+						<col style="width: 6%">
 						<col style="width: 8%">
 						<col style="width: 7%">
 						<col style="width: 7%">
@@ -482,9 +530,7 @@ function fn_updateSendRealTime(userId, msgGroupId){
 							<th>예약</th>
 							<th>내용</th>
 							<th>타입</th>
-							<!-- <th>금액</th> -->
-							<!-- <th>발송결과</th> -->
-							<%--<th>전송사</th>--%>
+							<th>방식</th>
 							<th>스미싱의심</th>
 							<th>이용정지</th>
 							<th>발송처리</th>
@@ -495,24 +541,24 @@ function fn_updateSendRealTime(userId, msgGroupId){
 						<tr>
 							<td>
 								<c:if test="${searchVO.searchSortOrd eq 'desc' }">
-		                			<c:out value="${ ( paginationInfo.totalRecordCount - ((paginationInfo.currentPageNo -1)*paginationInfo.recordCountPerPage) ) - status.index }"/>
-			                	</c:if>
-			                	<c:if test="${searchVO.searchSortOrd eq 'asc' }">
+									<c:out value="${ ( paginationInfo.totalRecordCount - ((paginationInfo.currentPageNo -1)*paginationInfo.recordCountPerPage) ) - status.index }"/>
+								</c:if>
+								<c:if test="${searchVO.searchSortOrd eq 'asc' }">
 									<c:out value="${(paginationInfo.currentPageNo - 1) * paginationInfo.recordCountPerPage + status.count}"/>                   		
-			                	</c:if>
+								</c:if>
 							</td>
 							<td>
 								<c:out value="${result.callFrom}"/>
 							</td>
 							<td title="<c:out value="${result.regDate}"/>">
 								<fmt:parseDate value="${result.regDate}" var="regDateValue" pattern="yyyy-MM-dd HH:mm"/>
-								<fmt:formatDate value="${regDateValue}" pattern="MM-dd HH:mm"/>																						
+								<fmt:formatDate value="${regDateValue}" pattern="MM-dd HH:mm"/>
 							</td>
 							<td>
 								<c:choose>
 									<c:when test="${result.reserveCYn eq 'Y'}">
 										<c:out value="${result.cancelDate}"/>
-									</c:when>                                                
+									</c:when>
 									<c:when test="${result.reserveYn eq 'Y' && result.reserveCYn eq 'N'}">
 										<c:out value="${result.reqDate}"/>
 									</c:when>
@@ -525,21 +571,13 @@ function fn_updateSendRealTime(userId, msgGroupId){
 								</c:choose>
 							</td>
 							<td>
-								<%-- <c:choose>
-									<c:when test="${result.resultCodeTxt eq 'S'}">
-										<fmt:formatNumber value="${result.msgGroupSCnt}" pattern="#,###" />
-									</c:when>
-									<c:otherwise>
-										<fmt:formatNumber value="${result.msgGroupFWCnt}" pattern="#,###" />
-									</c:otherwise>
-								</c:choose> --%>
 								<fmt:formatNumber value="${result.msgGroupSCnt}" pattern="#,###" />/<fmt:formatNumber value="${result.msgGroupFWCnt}" pattern="#,###" />(<fmt:formatNumber value="${(result.msgGroupSCnt / (result.msgGroupSCnt + result.msgGroupFWCnt)) * 100}" pattern="#,###" />%)
 							</td>							
 							<td>
 								<c:choose>
 									<c:when test="${result.reserveCYn eq 'Y'}">
 										예약취소
-									</c:when>                                                
+									</c:when>
 									<c:when test="${result.reserveYn eq 'Y' && result.reserveCYn eq 'N'}">
 										예약
 									</c:when>
@@ -547,27 +585,7 @@ function fn_updateSendRealTime(userId, msgGroupId){
 										즉시
 									</c:otherwise>
 								</c:choose>
-
-							</td>							
-							<%--
-							<td class="msg_detail">
-									<button type="button" class="btnType btnType20" id="msgDetail" name="msgDetail" onclick="msgDetailView(this, '<c:out value="${result.msgGroupId}"/>', '${status.count}'); return false;">상세보기</button>
-								<div class="layer_msg_wrap">
-									<div class="layer_msg_detail">
-										<button type="button" onclick="msgDetailClose(this);"></button>
-										<div class="title">
-										<c:choose>
-											<c:when test="${result.msgType eq '4'}">단문</c:when>
-											<c:when test="${result.msgType eq '6' && result.fileCnt > 0}">그림(<c:out value="${result.fileCnt}"/>장)</c:when>
-											<c:otherwise>장문</c:otherwise>
-										</c:choose>
-										</div>
-										<div class="content msgSentDetailPopLoad${status.count}">
-										</div>
-									</div>
-								</div>
 							</td>
-							--%>
 							<td class="sms_detail left">
 								<c:choose>
 									<c:when test="${empty result.smsTxt}">
@@ -612,8 +630,7 @@ function fn_updateSendRealTime(userId, msgGroupId){
 										</div>
 									</c:otherwise>
 								</c:choose>
-							</td>							
-							
+							</td>
 							<td>
 								<c:choose>
 									<c:when test="${result.msgType eq '4'}">
@@ -627,30 +644,16 @@ function fn_updateSendRealTime(userId, msgGroupId){
 									</c:otherwise>
 								</c:choose>
 							</td>
-							<%-- <td>
+							<td>
 								<c:choose>
-									<c:when test="${result.resultCodeTxt eq 'S'}">
-										<fmt:formatNumber value="${result.totSPrice}" pattern="#,###" />
+									<c:when test="${result.sendKind eq 'A'}">
+										API
+									</c:when>
+									<c:when test="${result.sendKind eq 'H'}">
+										홈페이지
 									</c:when>
-									<c:otherwise>
-										<fmt:formatNumber value="${result.totFWPrice}" pattern="#,###" />
-									</c:otherwise>
 								</c:choose>
-							</td> --%>
-							<%-- <td>
-								<c:choose>
-									<c:when test="${result.resultCodeTxt eq 'S'}">
-										정상수신
-									</c:when>
-									<c:when test="${result.resultCodeTxt eq 'F'}">
-										수신오류
-									</c:when>
-									<c:otherwise>
-										결과대기
-									</c:otherwise>
-								</c:choose>
-							</td> --%>
-							<%--<td><c:out value="${result.agentCodeTxt}"/></td>--%>
+							</td>
 							<td>
 								<c:choose>
 									<c:when test="${result.delayYn eq 'Y'}">
@@ -702,7 +705,7 @@ function fn_updateSendRealTime(userId, msgGroupId){
 						</tr>
 						</c:forEach>
 						<c:if test="${empty resultList}">
-		         			<tr><td colspan="11"><spring:message code="common.nodata.msg" /></td></tr>
+		         			<tr><td colspan="12"><spring:message code="common.nodata.msg" /></td></tr>
 		         		</c:if>    
 					</tbody>
 				</table>

src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp

@@ -60,6 +60,8 @@ tbody tr td.sms_detail:hover .sms_detail_hover {display:-webkit-box;}
 <script type="text/javascript" src="/js/RSA/rng.js"></script>
 <!-- <script src="http://dmaps.daum.net/map_js_init/postcode.v2.js"></script> -->
 <script type="text/javaScript" language="javascript" defer="defer">
+var grdSettingList = [];	// 등급별 단가 정보
+
 $(document).ready(function(){
 	console.log('${serverName}');
 //메모 리스트 10초마다 갱신
@@ -474,6 +476,12 @@ function layerPopOpen(obj){
 	var target=$('.layer_'+obj);
 	target.addClass('active');
 	$('.popup_mask').addClass('active');
+	
+	// 발송 금액 변경
+	if (obj == "price") {
+		//등급별 단가 정보
+		//getMberGrdSettingList();		
+	}
 }
 
 //레이어팝업 닫기
@@ -483,6 +491,70 @@ function layerPopClose(obj){
 	$('.popup_mask').removeClass('active');
 }
 
+//등급별 단가 정보
+function getMberGrdSettingList() {
+	grdSettingList = [];
+	
+	$.ajax({
+        type: "POST",
+        url: "/sym/grd/mberGrdSettingListAjax.do",
+        data: {},
+        dataType:'json',
+        async: false,
+        success: function (data) {
+			if (data.isSuccess) {
+				var sHtml = "";
+				var sHtml2 = "";
+				sHtml += "<select onchange='getMberGrdSettingInfo(this);'>";
+				sHtml += "<option value='0'>직접입력</option>";
+				$.each(data.mberGrdSettingList, function(i, item) {
+					// 배열
+					grdSettingList.push({grdSetNo: item.grdSetNo, shortPrice: item.shortPrice, longPrice: item.longPrice, picturePrice: item.picturePrice, picture2Price: item.picture2Price, picture3Price: item.picture3Price});
+					
+					sHtml += "<option value='" + item.grdSetNo + "'>" + item.grdSetNm + "</option>";
+					sHtml2 += item.grdSetNm + " : " + item.shortPrice + ", " + item.longPrice + ", " + item.picturePrice + ", " + item.picture2Price + ", " + item.picture3Price + "\n";
+				});
+				sHtml += "</select>";
+				
+				// Combo
+				$("#mberGrdSettingCombo").html(sHtml);
+				
+				// Title
+				$("#mberGrdSettingTitle").attr("title", sHtml2);
+			} 
+			else {
+				//alert("Msg : " + data.msg);
+			}
+		},
+        error: function (e) { 
+        	//alert("ERROR : " + JSON.stringify(e)); 
+        }
+    });				
+}	
+
+// 단가 적용
+function getMberGrdSettingInfo(obj) {
+	var returnValue = grdSettingList.find(function(data){ return data.grdSetNo == obj.value});
+	
+	form = document.msgPriceForm;
+	if (obj.value == 0) {
+		// 원래 단가
+		form.shortPrice.value = "${shortPrice}";
+		form.longPrice.value = "${longPrice}";
+		form.picturePrice.value = "${picturePrice}";
+		form.picture2Price.value = "${picture2Price}";
+		form.picture3Price.value = "${picture3Price}";		
+	}
+	else {
+		// 등급 단가
+		form.shortPrice.value = returnValue.shortPrice;
+		form.longPrice.value = returnValue.longPrice;
+		form.picturePrice.value = returnValue.picturePrice;
+		form.picture2Price.value = returnValue.picture2Price;
+		form.picture3Price.value = returnValue.picture3Price;
+	}
+}
+
 //스팸 이용 정지 사유 확인용 레이어팝업 오픈
 function layerSpamBlockMemoPopOpen(obj, smiId){
 	var form = document.modiForm;
@@ -3649,6 +3721,7 @@ function kakaoATDelayCancel(msgGroupId){
 								<colgroup>
 									<col style="width:5%;">
 									<col style="width:7%;">
+									<col style="width:7%;">
 									<col style="width:9%;">
 									<col style="width:13%;">
 									<col style="width:15%;">
@@ -3661,6 +3734,7 @@ function kakaoATDelayCancel(msgGroupId){
 									<tr>
 										<th>번호</th>
 										<th>종류</th>
+										<th>방식</th>
 										<th>등록일시</th>
 										<th>전송일시</th>
 										<th>발신번호</th>
@@ -3675,7 +3749,9 @@ function kakaoATDelayCancel(msgGroupId){
 										<c:when test="${not empty mjonMsgSentList}">
 											<c:forEach var="mjonMsgSentList" items="${mjonMsgSentList}" varStatus="status">
 												<tr>
-													<td><c:out value="${status.count}"/></td>
+													<td>
+														<c:out value="${status.count}"/>
+													</td>
 													<td>
 														<c:choose>
 															<c:when test="${mjonMsgSentList.msgType == '4'}">
@@ -3699,6 +3775,16 @@ function kakaoATDelayCancel(msgGroupId){
 															</c:otherwise>
 														</c:choose>
 													</td>
+													<td>
+														<c:choose>
+															<c:when test="${mjonMsgSentList.sendKind == 'H'}">
+																WEB
+															</c:when>
+															<c:when test="${mjonMsgSentList.sendKind == 'A'}">
+																API
+															</c:when>
+														</c:choose>
+													</td>
 													<td>
 														<c:choose>
 															<c:when test="${not empty mjonMsgSentList.regdate}">
@@ -3826,7 +3912,7 @@ function kakaoATDelayCancel(msgGroupId){
 										</c:when>
 										<c:otherwise>
 											<tr>
-												<td colspan="9">문자 발송 내역이 없습니다.</td>
+												<td colspan="10">문자 발송 내역이 없습니다.</td>
 											</tr>
 										</c:otherwise>
 									</c:choose>
@@ -3844,6 +3930,7 @@ function kakaoATDelayCancel(msgGroupId){
 								<colgroup>
 									<col style="width:5%;">
 									<col style="width:7%;">
+									<col style="width:7%;">
 									<col style="width:9%;">
 									<col style="width:13%;">
 									<col style="width:15%;">
@@ -3856,6 +3943,7 @@ function kakaoATDelayCancel(msgGroupId){
 									<tr>
 										<th>번호</th>
 										<th>종류</th>
+										<th>방식</th>
 										<th>등록일시</th>
 										<th>요청일시</th>
 										<th>발신번호</th>
@@ -3894,6 +3982,16 @@ function kakaoATDelayCancel(msgGroupId){
 															</c:otherwise>
 														</c:choose>
 													</td>
+													<td>
+														<c:choose>
+															<c:when test="${mjonMsgSentList.sendKind == 'H'}">
+																WEB
+															</c:when>
+															<c:when test="${mjonMsgSentList.sendKind == 'A'}">
+																API
+															</c:when>
+														</c:choose>
+													</td>
 													<td>
 														<c:choose>
 															<c:when test="${not empty mjonMsgSentList.regdate}">
@@ -4022,7 +4120,7 @@ function kakaoATDelayCancel(msgGroupId){
 										</c:when>
 										<c:otherwise>
 											<tr>
-												<td colspan="9">예약 문자 내역이 없습니다.</td>
+												<td colspan="10">예약 문자 내역이 없습니다.</td>
 											</tr>
 										</c:otherwise>
 									</c:choose>
@@ -4044,6 +4142,7 @@ function kakaoATDelayCancel(msgGroupId){
 							<colgroup>
 								<col style="width:5%;">
 								<col style="width:7%;">
+								<col style="width:7%;">
 								<col style="width:13%;">
 								<col style="width:14%;">
 								<col style="width:15%;">
@@ -4056,6 +4155,7 @@ function kakaoATDelayCancel(msgGroupId){
 								<tr>
 									<th><input type="checkbox" name="checkDelayAll" id="checkAll" onclick="fnCheckAll();" /><label for="checkAll"></label></th>
 									<th>종류</th>
+									<th>방식</th>
 									<th>등록일시</th>
 									<th>전송일시</th>
 									<th>발신번호</th>
@@ -4098,6 +4198,16 @@ function kakaoATDelayCancel(msgGroupId){
 														</c:otherwise>
 													</c:choose>
 												</td>
+												<td>
+													<c:choose>
+														<c:when test="${mjonMsgDelaySentList.sendKind == 'H'}">
+															WEB
+														</c:when>
+														<c:when test="${mjonMsgDelaySentList.sendKind == 'A'}">
+															API
+														</c:when>
+													</c:choose>
+												</td>
 												<td>
 													<c:choose>
 														<c:when test="${not empty mjonMsgDelaySentList.regdate}">
@@ -4221,7 +4331,7 @@ function kakaoATDelayCancel(msgGroupId){
 									</c:when>
 									<c:otherwise>
 										<tr>
-											<td colspan="9">문자 지연 내역이 없습니다.</td>
+											<td colspan="10">문자 지연 내역이 없습니다.</td>
 										</tr>
 									</c:otherwise>
 								</c:choose>
@@ -5362,6 +5472,12 @@ function kakaoATDelayCancel(msgGroupId){
 						<col style="width:auto;">
 					</colgroup>
 					<tbody>
+						<!-- 
+						<tr>
+							<th id="mberGrdSettingTitle">등급단가 적용</th>
+							<td><div id="mberGrdSettingCombo"></div></td>
+						</tr>
+						 -->					
 						<tr>
 							<th>단문 금액</th>
 							<td><input type="text" name="shortPrice" id="shortPrice" value="<c:out value='${shortPrice}'/>"/></td>

src/main/webapp/WEB-INF/jsp/sym/grd/mberGrdList.jsp

@@ -238,8 +238,8 @@ function setMberGrdSave() {
 						<col style="width: 5%">
 						<col style="width: auto;">
 						<col style="width: 8%;">
-						<col style="width: 8%;">
-						<col style="width: 10%">
+						<col style="width: 7%;">
+						<col style="width: 9%">
 						<col style="width: 9%">
 						<col style="width: 8%">
 						<col style="width: 8%">
@@ -322,13 +322,13 @@ function setMberGrdSave() {
 					</c:forEach>
 					</tbody>
 					<c:if test="${empty resultList}">
-	         			<tr><td colspan="7"><spring:message code="common.nodata.msg" /></td></tr>
+	         			<tr><td colspan="12"><spring:message code="common.nodata.msg" /></td></tr>
 	         		</c:if>					
 				</table>
 			</div>
 			<div class="btnWrap">
-				<input type="text" name="mberId" value="" style="height: 50px; width: 120px;" />
-				<input type="button" class="btnType2" value="등급제 적용테스트" onclick="javascript:setMberGrdSave(); return false;">
+				<input type="text" name="mberId" value="" style="height: 50px; width: 120px;" placeholder="아이디" />
+				<input type="button" class="btnType2" value="등급 등록(테스트용)" onclick="javascript:setMberGrdSave(); return false;">
 			</div>	
 			
 			<c:if test="${!empty resultList}">

src/main/webapp/WEB-INF/jsp/sym/grd/mberGrdSetting.jsp

@@ -5,16 +5,55 @@
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
 <!DOCTYPE html>
 <html lang="ko">
-
 <head>
 	<meta charset="UTF-8">
 	<title>등급제 관리</title>
+	
 	<script type="text/javascript">
 	//숫자 천단위 콤마 찍어주기
 	function numberWithCommas(x) { 
 		return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); 
 	}
 	
+	// 등급제 설정변경
+	function setMberGrdSettingEdit() {
+		
+		if ($("input[name='grdNoti']:checked").val() == "") {
+			alert("등급제 적용 온/오프를 선택해주세요.");
+			return false;			
+		}
+		
+		// 누적결제 적용일자
+		if ($("#ntceBgndeYYYMMDD").val() == "") {
+			alert("누적결제 적용일자를 선택해주세요.");
+			return false;
+		}		
+		
+		if(confirm("저장 하시겠습니까?")) {
+			$("#grdDate").val($("#ntceBgndeYYYMMDD").val());
+			
+			$.ajax({
+		        type: "POST",
+		        url: "/sym/grd/mberGrdSettingUpdateAjax.do",
+		        data: $("#listForm").serialize(),
+		        dataType:'json',
+		        async: false,
+		        success: function (data) {
+					if (data.isSuccess) { 
+						location.reload();
+					} 
+					else {
+						alert("Msg : " + data.msg);
+					}
+				},
+		        error: function (e) { 
+		        	alert("ERROR : " + JSON.stringify(e)); 
+		        }
+		    });	
+				
+		}
+	}		
+	
 	// 등급제 일괄변경
 	function setMberGrdSettingMassEdit() {
 		
@@ -45,7 +84,7 @@
 		        async: false,
 		        success: function (data) {
 					if (data.isSuccess) { 
-						alert(numberWithCommas(data.updateMberCnt) + "명 저장 완료했습니다.");
+						alert(numberWithCommas(data.updateMberCnt) + "명 등급 업데이트 완료했습니다.");
 						location.reload();
 					} 
 					else {
@@ -55,22 +94,23 @@
 		        error: function (e) { 
 		        	alert("ERROR : " + JSON.stringify(e)); 
 		        }
-		    });				
+		    });	
+				
 		}
 	}	
 	
 	// 회원별 등급 초기화
-	function setMberGrdEndMassEdit() {
+	function setMberGrdResetMassEdit() {
 		if(confirm("모든 고객 등급을 초기화하시겠습니까?")) {
 			$.ajax({
 		        type: "POST",
-		        url: "/sym/grd/mberGrdEndMassUpdateAjax.do",
+		        url: "/sym/grd/mberGrdResetMassUpdateAjax.do",
 		        data: {},
 		        dataType:'json',
 		        async: false,
 		        success: function (data) {
 					if (data.isSuccess) { 
-						alert(numberWithCommas(data.updateMberCnt) + "명 저장 완료했습니다.");
+						alert(numberWithCommas(data.updateMberCnt) + "명 업데이트 완료했습니다.");
 						location.reload();
 					} 
 					else {
@@ -84,6 +124,28 @@
 		}
 	}		
 	
+	// 오늘날짜 Get
+	function getToday() {
+		// new Date를 통해서 날짜 객체를 생성. 여기서 년, 월, 일 정보만 필요.
+		 const nowDate = new Date();
+
+		var year = nowDate.getFullYear(); // 년
+		var month = ('0' + (nowDate.getMonth() + 1)).slice(-2); // 월
+		var day = ('0' + nowDate.getDate()).slice(-2); // 일
+
+		// yyyy-mm-dd 형식으로 todate에 담기.
+		var todate = year + '-' + month + '-' + day;
+		
+		return todate;
+	}
+	
+	// 오늘날짜 Set
+	function setToday() {
+		var toDay = getToday();
+		
+		$('#ntceBgndeYYYMMDD').val(toDay);
+	}
+	
 	</script>
 </head>
 <body>
@@ -125,6 +187,9 @@
 							    value="<c:out value="${grdDate}" />" >
 							   	 	<input type="button" class="calBtn">
 						    	</a>
+						    	
+						    	&nbsp;&nbsp;&nbsp;
+						    	<input type="button" style="cursor: pointer; height: 33px;" onclick="setToday();" value="오늘">
 							</td>
 							<th>누적결제 계산기간</th>
 							<td>
@@ -134,7 +199,13 @@
 					</tbody>
 				</table>
 			</div>
-			<br /><br />
+			
+			<br />
+			<div class="btnWrap">
+				<input type="button" class="btnType1" value="저장" onclick="javascript:setMberGrdSettingEdit(); return false;">
+			</div>
+			
+			<br /><br /><br />
 						
 			<div class="tableWrap">
 				<table class="tbType1">
@@ -178,9 +249,9 @@
 			
 			<br />
 			<div class="btnWrap">
-				<input type="button" class="btnType2" value="모든 고객 등급 초기화" onclick="javascript:setMberGrdEndMassEdit(); return false;">
-				<input type="button" class="btnType1" value="취소" onclick="javascript:location.reload(); return false;">
-				<input type="button" class="btnType1" value="수정" onclick="javascript:setMberGrdSettingMassEdit(); return false;">
+				<input type="button" class="btnType2" value="모든 고객 등급 초기화" onclick="javascript:setMberGrdResetMassEdit(); return false;">
+				<%--<input type="button" class="btnType1" value="취소" onclick="javascript:location.reload(); return false;">--%>
+				<input type="button" class="btnType1" value="저장" onclick="javascript:setMberGrdSettingMassEdit(); return false;">
 			</div>
 		</div>
 	</div>

src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp

@@ -36,6 +36,44 @@
 <script type="text/javascript" src="<c:url value='/js/EgovCalPopup.js'/>"></script>
 <script type="text/javaScript" language="javascript">
 
+$(document).ready(function(){
+
+	// 알림톡 금일/금월/금년 통계
+	getMjonKakaoAtThisSum();
+		
+});
+
+// 알림톡 금일/금월/금년 통계
+function getMjonKakaoAtThisSum() {
+	$("#mjonKakaoAtThisSumArea").html("");
+	
+	$.ajax({
+        type: "POST",
+        url: "/uss/umt/user/selectMjonKakaoAtThisSumAjax.do",
+        data: {},
+        dataType:'json',
+        async: true,
+        success: function (data) {
+        	var jsonInfo = data.result;
+			if (data.isSuccess) {
+				try {
+					var sHtml = "";
+					sHtml = "(" + jsonInfo.successDay + " : " + jsonInfo.successCntDay + "건 / " + jsonInfo.successMonth + "월 누적 : " + jsonInfo.successCntMonth + "건 / " + jsonInfo.successYear + "년 누적 : " + jsonInfo.successCntYear + "건)";
+					$("#mjonKakaoAtThisSumArea").html(sHtml);
+				} catch (error) {
+					  console.error(error);
+				}					
+			} 
+			else {
+				//alert("Msg : " + data.msg);
+			}
+		},
+        error: function (e) { 
+        	//alert("ERROR : " + JSON.stringify(e)); 
+        }
+    });	
+}	
+
 function fn_search(){
 	var searchKeyword = $('input[name=searchKeyword]').val();
 	$('input[name=searchKeyword]').val(searchKeyword.replace(/(\s*)/g, ""));
@@ -433,7 +471,8 @@ function fnAtSmishingUpdate(flag) {
 
 			</div>
 			<div class="listTop">
-				<p class="tType5">총 <span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${paginationInfo.totalRecordCount}" pattern="#,###" /></span>건</p>
+				<p class="tType5">총 <span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${paginationInfo.totalRecordCount}" pattern="#,###" /></span>건<span id="mjonKakaoAtThisSumArea"></span>				
+				</p>
 				<div class="rightWrap">
 <!-- 					<input type="button" class="excelBtn" onclick="javascript:sendMsgExcelDownload();"> -->
 					<!-- <input type="button" class="printBtn"> -->

src/main/webapp/WEB-INF/jsp/uss/ion/msg/MsgDayChart_230125.jsp

@@ -11,14 +11,34 @@
 	response.setDateHeader("Expires",0);   
 	if (request.getProtocol().equals("HTTP/1.1")) response.setHeader("Cache-Control", "no-cache"); 
 %> 
-<!DOCTYPE html>
-<html lang="ko">
-<head>
 <title>일별 문자발송건수 통계</title>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <script type="text/javascript" src="<c:url value='/js/EgovMultiFile.js'/>"></script>
 <script type="text/javascript" src="<c:url value='/js/EgovCalPopup.js'/>"></script>
 <script type="text/javaScript" language="javascript">
+
+$( document ).ready(function(){
+	var selectSendKind = $("#sendKind option:selected").val();
+	
+	if(selectSendKind == "H"){
+		$('.all').css('display', 'none');
+		$('.api').css('display', 'none');
+		setThead(1);
+	}else if(selectSendKind == "A"){
+		$('.all').css('display', 'none');
+		$('.homePage').css('display', 'none');
+		setThead(1);
+	}else{
+		setThead(3);
+	}
+});
+
+function setThead(index){
+	$("#sendHead").attr('colspan',index);
+	$("#successHead").attr('colspan',index);
+	$("#rateHead").attr('colspan',index);
+}
+
 function fn_search(){
 	linkPage(1);
 }
@@ -48,6 +68,8 @@ function init_date(){
 	$('#ntceEnddeYYYMMDD').val('');
 	$('#ntceBgnde').val('');
 	$('#ntceEndde').val('');
+	
+	$('#sendKind').val('').prop("selected",true);
 }
 
 //기간선택 select
@@ -89,12 +111,9 @@ function fnSetCalMonth(val) {
     cursor: pointer;
 }
 </style>
-</head>
-<body>
 
 <compress:html>
 
-
 <form name="listForm" action="<c:url value='/uss/ion/msg/msgDayChart_230125.do'/>" method="post">
 	<input name="pageIndex" type="hidden" value="<c:out value='${searchVO.pageIndex}'/>"/>
 	<input type="hidden" name="searchSortCnd" value="<c:out value="${searchVO.searchSortCnd}" />" />
@@ -111,6 +130,11 @@ function fnSetCalMonth(val) {
 		
 		<div class="pageCont">
 			<div class="listSerch">
+				<select id="sendKind" name="sendKind" onchange="">
+					<option value=""<c:if test="${searchVO.sendKind eq ''}">selected="selected"</c:if>>발송방식 전체</option>
+					<option value="H"<c:if test="${searchVO.sendKind eq 'H'}">selected="selected"</c:if>>WEB</option>
+					<option value="A"<c:if test="${searchVO.sendKind eq 'A'}">selected="selected"</c:if>>API</option>
+				</select>
 				<select name="setCalMonth" onchange="fnSetCalMonth(this.value)">
 					<option value="0">전체</option>
 					<option value="1">1개월</option>
@@ -118,23 +142,21 @@ function fnSetCalMonth(val) {
 					<option value="6">6개월</option>
 				</select>
 				<input type="hidden" name="cal_url" id="cal_url" value="/sym/cmm/EgovNormalCalPopup.do">
-			    <a href="#" onclick="javascript:fn_egov_NormalCalendar(document.forms.listForm, document.forms.listForm.ntceBgndeYYYMMDD);">
-			    <input style="width:auto;min-width: 83px;" type="text" class="date_format" name="ntceBgndeYYYMMDD" id="ntceBgndeYYYMMDD" size="4" maxlength="4" readonly=""
-			    value="<c:out value="${searchVO.ntceBgnde}" />" >
-			   	 	<input type="button" class="calBtn">
-		    	</a>
-				&nbsp;&nbsp;~    	
-			    <a href="#" onclick="javascript:fn_egov_NormalCalendar(document.forms.listForm, document.forms.listForm.ntceEnddeYYYMMDD);">
-				<input style="width:auto;min-width: 83px;" type="text" class="date_format" name="ntceEnddeYYYMMDD" id="ntceEnddeYYYMMDD" size="4" maxlength="4" readonly=""
-		    	value="<c:out value="${searchVO.ntceEndde}" />"
-		    	>
-			   	 	<input type="button" class="calBtn">
-		    	</a>
+				<a href="#" onclick="javascript:fn_egov_NormalCalendar(document.forms.listForm, document.forms.listForm.ntceBgndeYYYMMDD);">
+					<input style="width:auto;min-width: 83px;" type="text" class="date_format" name="ntceBgndeYYYMMDD" id="ntceBgndeYYYMMDD" size="4" maxlength="4" readonly=""
+					value="<c:out value="${searchVO.ntceBgnde}" />" >
+					<input type="button" class="calBtn">
+				</a>
+				&nbsp;&nbsp;~
+				<a href="#" onclick="javascript:fn_egov_NormalCalendar(document.forms.listForm, document.forms.listForm.ntceEnddeYYYMMDD);">
+					<input style="width:auto;min-width: 83px;" type="text" class="date_format" name="ntceEnddeYYYMMDD" id="ntceEnddeYYYMMDD" size="4" maxlength="4" readonly=""
+					value="<c:out value="${searchVO.ntceEndde}" />" >
+					<input type="button" class="calBtn">
+				</a>
 				<a href="#" style="margin-left: 17px;" onclick="init_date(); return false;">
 					<img src="/pb/img/common/topTimeOut.png" alt="타임아웃 아이콘">
 				</a>
 				<input type="button" class="btnType1" style="margin-left:10px;" value="검색" onclick="fn_search(); return false;">
-				
 			</div>
 			<div class="listTop">
 				<p class="tType5">총 <span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${paginationInfo.totalRecordCount}" pattern="#,###" /></span>건
@@ -154,31 +176,78 @@ function fnSetCalMonth(val) {
 			<div class="tableWrap">
 				<table class="tbType1">
 					<colgroup>
-						<col style="width: auto;">
-						<col style="width: 25%">
-						<col style="width: 25%">
 						<col style="width: 25%">
+						<col style="width: 25%" class="all">
+						<col style="width: 25%" class="homePage">
+						<col style="width: 25%" class="api">
+						<col style="width: 25%" class="all">
+						<col style="width: 25%" class="homePage">
+						<col style="width: 25%" class="api">
+						<col style="width: 25%" class="all">
+						<col style="width: 25%" class="homePage">
+						<col style="width: 25%" class="api">
 					</colgroup>
 					<thead>
 						<tr>
-							<th>발송일</th>
-							<th>발송건수</th>
-							<th>성공건수</th>
-							<th>성공율</th>
+							<th rowspan="2" style="vertical-align: middle;">발송일</th>
+							<th id="sendHead">발송건수</th>
+							<th id="successHead">성공건수</th>
+							<th id="rateHead">성공율</th>
+						</tr>
+						<tr>
+							<th class="all">전체</th>
+							<th class="homePage">WEB</th>
+							<th class="api">API</th>
+							<th class="all">전체</th>
+							<th class="homePage">WEB</th>
+							<th class="api">API</th>
+							<th class="all">전체</th>
+							<th class="homePage">WEB</th>
+							<th class="api">API</th>
 						</tr>
 					</thead>
 					<tbody>
 						<c:forEach var="result" items="${resultList}" varStatus="status">
 						<tr>
-							<td><c:out value="${result.regDate}"/></td>
-							<td><fmt:formatNumber value="${result.sendCount}" pattern="#,###" /></td>
-							<td><fmt:formatNumber value="${result.successCount}" pattern="#,###" /></td>
-							<td><fmt:formatNumber value="${(result.successCount / result.sendCount) * 100}" pattern="#,###" />%</td>							
+							<td>
+								<c:out value="${result.regDate}"/>
+							</td>
+							<td class="all">
+								<fmt:formatNumber value="${result.totalSendCount}" pattern="#,###" />
+							</td>
+							<td class="homePage">
+								<fmt:formatNumber value="${result.sendCount}" pattern="#,###" />
+							</td>
+							<td class="api">
+								<fmt:formatNumber value="${result.aSendCount}" pattern="#,###" />
+							</td>
+							
+							<td class="all">
+								<fmt:formatNumber value="${result.totalSuccessCount}" pattern="#,###" />
+							</td>
+							<td class="homePage">
+								<fmt:formatNumber value="${result.successCount}" pattern="#,###" />
+							</td>
+							<td class="api">
+								<fmt:formatNumber value="${result.aSuccessCount}" pattern="#,###" />
+							</td>
+							
+							<td class="all">
+								<fmt:formatNumber value="${result.rateTotalSuccessCount}" pattern="#,###" />%
+							</td>
+							<td class="homePage">
+								<fmt:formatNumber value="${result.rateSuccessCount}" pattern="#,###" />%
+							</td>
+							<td class="api">
+								<fmt:formatNumber value="${result.rateApiSuccessCount}" pattern="#,###" />%
+							</td>
 						</tr>
 						</c:forEach>
 						<c:if test="${empty resultList}">
-		         			<tr><td colspan="4"><spring:message code="common.nodata.msg" /></td></tr>
-		         		</c:if>    
+						<tr>
+							<td colspan="10"><spring:message code="common.nodata.msg" /></td>
+						</tr>
+						</c:if>
 					</tbody>
 				</table>
 			</div>
@@ -186,16 +255,14 @@ function fnSetCalMonth(val) {
 			</div>
 			<!-- 페이지 네비게이션 시작 -->
 			<c:if test="${!empty resultList}">
-		 		<div class="page">
-		    		<ul class="inline">
-		    			<ui:pagination paginationInfo = "${paginationInfo}"  type="image" jsFunction="linkPage" />
-		    		</ul>	
-		    	</div>  
-		  	</c:if>                      
-		    <!-- //페이지 네비게이션 끝 --> 
+			<div class="page">
+				<ul class="inline">
+					<ui:pagination paginationInfo = "${paginationInfo}"  type="image" jsFunction="linkPage" />
+				</ul>
+			</div>
+			</c:if>
+			<!-- //페이지 네비게이션 끝 --> 
 		</div>
 	</div>
 </form>
 </compress:html>
-</body>
-</html>

src/main/webapp/WEB-INF/jsp/uss/ion/msg/MsgMonthChart_230125.jsp

@@ -11,9 +11,6 @@
 	response.setDateHeader("Expires",0);   
 	if (request.getProtocol().equals("HTTP/1.1")) response.setHeader("Cache-Control", "no-cache"); 
 %> 
-<!DOCTYPE html>
-<html lang="ko">
-<head>
 <title>월별 문자발송건수 통계</title>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <script type="text/javascript" src="<c:url value='/js/EgovMultiFile.js'/>"></script>
@@ -30,20 +27,31 @@ $(document).ready(function(){
 	}
 	/* $('#searchYear').find('option:contains("${searchVO.ntceBgnde}")').attr("selected",true); */
 	$('#searchYear').find('option[value="${searchVO.ntceBgnde}"]').attr("selected",true);
+	
+	
+	var selectSendKind = $("#sendKind option:selected").val();
+	
+	if(selectSendKind == "H"){
+		$('.all').css('display', 'none');
+		$('.api').css('display', 'none');
+		setThead(1);
+	}else if(selectSendKind == "A"){
+		$('.all').css('display', 'none');
+		$('.homePage').css('display', 'none');
+		setThead(1);
+	}else{
+		setThead(3);
+	}
 });
 	
-	
-	
-	function linkPage(){
+function setThead(index){
+	$("#sendHead").attr('colspan',index);
+	$("#successHead").attr('colspan',index);
+	$("#rateHead").attr('colspan',index);
+}
+
+function linkPage(){
 	var listForm = document.listForm ;
-	/* if( $('#ntceBgndeYYYMMDD').val() != '' && $('#ntceEnddeYYYMMDD').val() != '' ){
-		var iChkBeginDe = Number($('#ntceBgndeYYYMMDD').val().replaceAll("-", ""));
-		var iChkEndDe =  Number($('#ntceEnddeYYYMMDD').val().replaceAll("-", ""));
-		if(iChkBeginDe > iChkEndDe || iChkEndDe < iChkBeginDe ){
-			alert("검색 시작 일자는 종료 일자 보다 클 수 없습니다.");
-			return;
-		}
-	} */
 	$('#ntceBgnde').val($('#searchYear option:selected').val());
 	listForm.submit();
 }
@@ -63,8 +71,6 @@ $(document).ready(function(){
     cursor: pointer;
 }
 </style>
-</head>
-<body>
 
 <compress:html>
 
@@ -84,60 +90,95 @@ $(document).ready(function(){
 		
 		<div class="pageCont">
 			<div class="listSerch">
-				<%-- <input type="hidden" name="cal_url" id="cal_url" value="/sym/cmm/EgovNormalCalPopup.do">
-			    <a href="#" onclick="javascript:fn_egov_NormalCalendar(document.forms.listForm, document.forms.listForm.ntceBgndeYYYMMDD);">
-			    <input style="width:auto;min-width: 83px;" type="text" class="date_format" name="ntceBgndeYYYMMDD" id="ntceBgndeYYYMMDD" size="4" maxlength="4" readonly=""
-			    value="<c:out value="${searchVO.ntceBgnde}" />" >
-			   	 	<input type="button" class="calBtn">
-		    	</a>
-				&nbsp;&nbsp;~    	
-			    <a href="#" onclick="javascript:fn_egov_NormalCalendar(document.forms.listForm, document.forms.listForm.ntceEnddeYYYMMDD);">
-				<input style="width:auto;min-width: 83px;" type="text" class="date_format" name="ntceEnddeYYYMMDD" id="ntceEnddeYYYMMDD" size="4" maxlength="4" readonly=""
-		    	value="<c:out value="${searchVO.ntceEndde}" />"
-		    	>
-			   	 	<input type="button" class="calBtn">
-		    	</a>
-				<a href="#" style="margin-left: 17px;" onclick="init_date(); return false;">
-					<img src="/pb/img/common/topTimeOut.png" alt="타임아웃 아이콘">
-				</a>
-				<input type="button" class="btnType1" style="margin-left:10px;" value="검색" onclick="fn_search(); return false;"> --%>
+				<select id="sendKind" name="sendKind" onchange="linkPage();">
+					<option value=""<c:if test="${searchVO.sendKind eq ''}">selected="selected"</c:if>>발송방식 전체</option>
+					<option value="H"<c:if test="${searchVO.sendKind eq 'H'}">selected="selected"</c:if>>WEB</option>
+					<option value="A"<c:if test="${searchVO.sendKind eq 'A'}">selected="selected"</c:if>>API</option>
+				</select>
 				<select id="searchYear" name="searchYear" onchange="linkPage();"></select>
-				<br/><br/>
-				<c:if test="${sttstDate ne '' and sttstDate ne null }">
-					(집계 일시 : ${sttstDate}(금일))
-				</c:if>								
 			</div>
-			<%-- <div class="listTop">
-				<p class="tType5">총 <span class="tType4 c_456ded fwBold"><fmt:formatNumber value="${paginationInfo.totalRecordCount}" pattern="#,###" /></span>건</p>
-			</div> --%>
+			<div class="listTop">
+				<p class="tType5">
+					<c:if test="${sttstDate ne '' and sttstDate ne null }">
+						(집계 일시 : ${sttstDate}(금일))
+					</c:if>
+				</p>
+			</div>
 			<div class="tableWrap">
 				<table class="tbType1">
 					<colgroup>
-						<col style="width: auto;">
-						<col style="width: 25%">
-						<col style="width: 25%">
 						<col style="width: 25%">
+						<col style="width: 25%" class="all">
+						<col style="width: 25%" class="homePage">
+						<col style="width: 25%" class="api">
+						<col style="width: 25%" class="all">
+						<col style="width: 25%" class="homePage">
+						<col style="width: 25%" class="api">
+						<col style="width: 25%" class="all">
+						<col style="width: 25%" class="homePage">
+						<col style="width: 25%" class="api">
 					</colgroup>
 					<thead>
 						<tr>
-							<th>발송월</th>
-							<th>발송건수</th>
-							<th>성공건수</th>
-							<th>성공율</th>
+							<th rowspan="2" style="vertical-align: middle;">발송일</th>
+							<th id="sendHead">발송건수</th>
+							<th id="successHead">성공건수</th>
+							<th id="rateHead">성공율</th>
+						</tr>
+						<tr>
+							<th class="all">전체</th>
+							<th class="homePage">WEB</th>
+							<th class="api">API</th>
+							<th class="all">전체</th>
+							<th class="homePage">WEB</th>
+							<th class="api">API</th>
+							<th class="all">전체</th>
+							<th class="homePage">WEB</th>
+							<th class="api">API</th>
 						</tr>
 					</thead>
 					<tbody>
 						<c:forEach var="result" items="${resultList}" varStatus="status">
 						<tr>
-							<td><c:out value="${result.regDate}"/></td>
-							<td><fmt:formatNumber value="${result.sendCount}" pattern="#,###" /></td>
-							<td><fmt:formatNumber value="${result.successCount}" pattern="#,###" /></td>
-							<td><fmt:formatNumber value="${(result.successCount / result.sendCount) * 100}" pattern="#,###" />%</td>
+							<td>
+								<c:out value="${result.regDate}"/>
+							</td>
+							<td class="all">
+								<fmt:formatNumber value="${result.totalSendCount}" pattern="#,###" />
+							</td>
+							<td class="homePage">
+								<fmt:formatNumber value="${result.sendCount}" pattern="#,###" />
+							</td>
+							<td class="api">
+								<fmt:formatNumber value="${result.aSendCount}" pattern="#,###" />
+							</td>
+							
+							<td class="all">
+								<fmt:formatNumber value="${result.totalSuccessCount}" pattern="#,###" />
+							</td>
+							<td class="homePage">
+								<fmt:formatNumber value="${result.successCount}" pattern="#,###" />
+							</td>
+							<td class="api">
+								<fmt:formatNumber value="${result.aSuccessCount}" pattern="#,###" />
+							</td>
+							
+							<td class="all">
+								<fmt:formatNumber value="${result.rateTotalSuccessCount}" pattern="#,###" />%
+							</td>
+							<td class="homePage">
+								<fmt:formatNumber value="${result.rateSuccessCount}" pattern="#,###.##" />%
+							</td>
+							<td class="api">
+								<fmt:formatNumber value="${result.rateApiSuccessCount}" pattern="#,###" />%
+							</td>
 						</tr>
 						</c:forEach>
 						<c:if test="${empty resultList}">
-		         			<tr><td colspan="4"><spring:message code="common.nodata.msg" /></td></tr>
-		         		</c:if>    
+							<tr>
+								<td colspan="10"><spring:message code="common.nodata.msg" /></td>
+							</tr>
+						</c:if>
 					</tbody>
 				</table>
 			</div>
@@ -145,5 +186,3 @@ $(document).ready(function(){
 	</div>
 </form>
 </compress:html>
-</body>
-</html>

src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp

@@ -0,0 +1,134 @@
+<%--
+  Class Name : weekendCsWork.jsp
+  Description : 발신번호 리스트 조회 페이지
+  Modification Information
+
+      수정일         수정자                   수정내용
+    -------    --------    ---------------------------
+    2021.03.31    신명섭          최초 생성
+
+    Copyright (C) 2009 by ITN  All right reserved.
+--%>
+<%@ page contentType="text/html; charset=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="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="ec" uri="/WEB-INF/tld/ecnet_tld.tld"%>
+<%   
+	response.setHeader("Cache-Control","no-store");   
+	response.setHeader("Pragma","no-cache");   
+	response.setDateHeader("Expires",0);   
+	if (request.getProtocol().equals("HTTP/1.1")) response.setHeader("Cache-Control", "no-cache"); 
+%> 
+<!DOCTYPE html>
+<html lang="ko">
+
+<head>
+	<script type="text/javascript" src="<c:url value='/js/EgovMultiFile.js'/>"></script>
+	<script src="//mozilla.github.io/pdf.js/build/pdf.js"></script>
+</head>
+<body>
+
+<div>
+  <button id="prev">Previous</button>
+  <button id="next">Next</button>
+  &nbsp; &nbsp;
+  <span>Page: <span id="page_num"></span> / <span id="page_count"></span></span>
+</div>
+<canvas id="the-canvas" name="the-canvas"></canvas>
+</body>
+</html>
+	<script type="text/javaScript" language="javascript">
+		var pdfDoc = null;
+		var pageNum = 1;
+		var pageRendering = false;
+		var pageNumPending = null;
+		var scale = 0.8;
+		var canvas = document.getElementById('the-canvas');
+		var ctx = canvas.getContext('2d');
+		 /* var url = '/cmm/fms/FileDown.do?atchFileId=FILE_000000000019061&fileSn=0'; */ 
+// 		 var url = '/usr/local/tomcat/file/sht/pdf/2ccbb16e-62df-48c0-bbb1-3b6559bd4c36.pdf'; 
+		var url = '${pdfPath}';
+
+		/**
+		 * Get page info from document, resize canvas accordingly, and render page.
+		 * @param num Page number.
+		 */
+		function renderPage(num) {
+		  pageRendering = true;
+		  // Using promise to fetch the page
+		  pdfDoc.getPage(num).then(function(page) {
+		    var viewport = page.getViewport({scale: scale});
+		    canvas.height = viewport.height;
+		    canvas.width = viewport.width;
+
+		    // Render PDF page into canvas context
+		    var renderContext = {
+		      canvasContext: ctx,
+		      viewport: viewport
+		    };
+		    var renderTask = page.render(renderContext);
+
+		    // Wait for rendering to finish
+		    renderTask.promise.then(function() {
+		      pageRendering = false;
+		      if (pageNumPending !== null) {
+		        // New page rendering is pending
+		        renderPage(pageNumPending);
+		        pageNumPending = null;
+		      }
+		    });
+		  });
+
+		  // Update page counters
+		  document.getElementById('page_num').textContent = num;
+		}
+
+		/**
+		 * If another page rendering in progress, waits until the rendering is
+		 * finised. Otherwise, executes rendering immediately.
+		 */
+		function queueRenderPage(num) {
+		  if (pageRendering) {
+		    pageNumPending = num;
+		  } else {
+		    renderPage(num);
+		  }
+		}
+
+		/**
+		 * Displays previous page.
+		 */
+		function onPrevPage() {
+		  if (pageNum <= 1) {
+		    return;
+		  }
+		  pageNum--;
+		  queueRenderPage(pageNum);
+		}
+		document.getElementById('prev').addEventListener('click', onPrevPage);
+
+		/**
+		 * Displays next page.
+		 */
+		function onNextPage() {
+		  if (pageNum >= pdfDoc.numPages) {
+		    return;
+		  }
+		  pageNum++;
+		  queueRenderPage(pageNum);
+		}
+		document.getElementById('next').addEventListener('click', onNextPage);
+		/**
+		 * Asynchronously downloads PDF.
+		 */
+		pdfjsLib.getDocument(url).promise.then(function(pdfDoc_) {
+		  pdfDoc = pdfDoc_;
+		  document.getElementById('page_count').textContent = pdfDoc.numPages;
+
+		  // Initial/first page rendering
+		  renderPage(pageNum);
+		});
+	</script>

src/main/webapp/WEB-INF/jsp/uss/ion/msg/weekendCsWork.jsp

@@ -0,0 +1,429 @@
+<%--
+  Class Name : weekendCsWork.jsp
+  Description : 발신번호 리스트 조회 페이지
+  Modification Information
+
+      수정일         수정자                   수정내용
+    -------    --------    ---------------------------
+    2021.03.31    신명섭          최초 생성
+
+    Copyright (C) 2009 by ITN  All right reserved.
+--%>
+<%@ page contentType="text/html; charset=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="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="ec" uri="/WEB-INF/tld/ecnet_tld.tld"%>
+<%   
+	response.setHeader("Cache-Control","no-store");   
+	response.setHeader("Pragma","no-cache");   
+	response.setDateHeader("Expires",0);   
+	if (request.getProtocol().equals("HTTP/1.1")) response.setHeader("Cache-Control", "no-cache"); 
+%> 
+<!DOCTYPE html>
+<html lang="ko">
+<head>
+		<meta charset="UTF-8">
+		<meta http-equiv="content-type" content="text/html; charset=utf-8">
+		<meta http-equiv="X-UA-Compatible" content="IE=edge" />
+		<!-- <meta name="viewport" content="width=device-width, initial-scale=1.0"> -->
+		<link rel="stylesheet" href="/pb/css/reset.css">
+		<link rel="stylesheet" href="/pb/css/common.css">
+		<link rel="stylesheet" href="/pb/css/content.css?date=202301160001">
+		<link rel="stylesheet" href="/pb/css/popup.css">
+		<script src="/pb/js/jquery-3.5.0.js"></script>
+		<script src="/pb/js/common.js"></script>
+		<script src = "/js/new_main.js "></script>	
+		<link rel="icon" href="data:;base64,iVBORw0KGgo=">
+		<script src="<c:url value='/js/jquery.js' />"></script>
+		<script type="text/javascript" src="<c:url value='/js/EgovCalPopup.js'/>"></script>
+		<c:if test="${!empty loginId}">
+			<!-- 자동완성 START-->
+			<link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
+			<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+			<script src="<c:url value='/js/recent_search.js' />"></script>
+			<!-- 자동완성 END -->
+		</c:if>
+		<c:set var="RequestUrl" value="${pageContext.request.requestURL}"/>
+		<c:if test="${RequestUrl.indexOf('RefundReRegist.do') == -1}">
+			<script src="<c:url value='/js/ncms_common.js' />"></script>
+		</c:if>
+		<script>
+			$( document ).ready(function() {
+				labelSet();
+			});
+			function labelSet(){//Ajax load를 위해 메소드로 구현
+				$("input[type='checkBox'],input[type=radio]").each(function(index, item){
+					$(this).after("<label for='"+$(this).attr('id')+"'></label>") ;
+				});
+			}
+			
+			// 페이지 뒤로 가기 시 이벤트 발생
+			window.onpageshow = function(event) {
+				// 뒤로 가기, 새로고침 등 캐시 복원 시
+				if ( event.persisted || (window.performance && window.performance.navigation.type == 2)) {
+				} else { // 새 페이지 열릴 시
+					<c:if test="${!empty message}">alert("${message}");</c:if>
+				}
+			}
+		</script>
+<title>주말 cs 리스트</title>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<script type="text/javascript" src="<c:url value='/js/EgovMultiFile.js'/>"></script>
+<script type="text/javaScript" language="javascript">
+var certType = "${certType}";
+
+$( document ).ready(function() {
+	//첨부파일 이미지 br태그 삭제 - import로 공통으로 사용해서 jsp에서 따로 처리
+	$(".brRm").children('br').remove();
+});
+
+
+function linkPage(pageNo){
+	var listForm = document.listForm ;
+	$('input[name=pageIndex]').val(pageNo);
+	listForm.action = "<c:url value='/uss/ion/msg/weekendCsWork.do'/>";
+	listForm.submit();
+}
+
+
+function fnCheckAll() {
+	if( $("#checkAll").is(':checked') ){
+	  $("input[name=del]").prop("checked", true);
+	}else{
+	  $("input[name=del]").prop("checked", false);
+	}
+}
+
+/* 체크된 메인배너  목록 삭제 */
+function fn_delete(){
+	if($("input[name=del]:checked").length == 0){
+		alert("선택된 항목이 없습니다.");
+		return;
+	}
+		
+	if (confirm("해당 정보를 삭제하시겠습니까?")){
+		frm = document.listForm;
+		//frm.action = "<c:url value='/uss/ion/msg/SendMsgDelete.do' />";
+		frm.action = "<c:url value='/uss/ion/msg/SendNumberDelete.do' />";
+	    frm.submit();
+	}
+}
+
+/* 수정 화면*/
+function fn_modify(phmId){
+	var frm = document.listForm ;
+	frm.phmId.value = phmId ;
+	frm.action = "<c:url value='/uss/ion/msg/SendNumberModify.do'/>";
+	frm.submit();
+}
+
+function fnSelectMber(mberId) {
+	document.modiForm.mberId.value = mberId;
+	window.open("about:blank", 'popupSelectMber', 'width=900, height=1800, top=100, left=100, fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=yes, location=no, scrollbar=no');
+    document.modiForm.action = "<c:url value='/uss/umt/user/EgovGnrlselectedUserView.do'/>";
+    document.modiForm.target = "popupSelectMber";
+    document.modiForm.submit();
+}
+
+//기업회원 신청 승인/반려 처리
+function updateAuthYn(phmId, authYn, userId) {
+	
+	var form = document.listForm;
+	form.phmId.value = phmId;
+	form.authYn.value = authYn;
+	form.userId.value = userId;
+	var data = new FormData(form);
+	
+	if (confirm("인증완료 하시겠습니까?")) {
+		$.ajax({
+	        type: "POST",
+	        url: "/uss/ion/msg/updateAuthYnAjax.do",
+	        data: data,
+	        dataType:'json',
+	        async: false,
+	        processData: false,
+	        contentType: false,
+	        cache: false, 
+	        success: function (data) {
+				if (data.result) { 
+					alert(data.msg);
+					location.reload();
+				} else {
+					alert(data.msg);
+				}
+			},
+	        error: function (e) { 
+	        	alert("저장에 실패하였습니다."); 
+	        	alert("ERROR : " + JSON.stringify(e)); 
+	        }
+	    });
+	}
+	
+}
+
+function returnPop(phmId) {
+	window.open("about:blank", 'returnPopup', 'width=600, height=310, top=400, left=650, fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=yes, location=no, scrollbar=no');
+    document.popupForm.phmId.value = phmId;
+    document.popupForm.action = "<c:url value='/uss/ion/msg/sendNumberReturnPop.do'/>";
+    document.popupForm.target = "returnPopup";
+    document.popupForm.submit();
+}
+
+//기간선택 select
+function fnSetCalMonth(val) {
+	var form = document.listForm;
+	var today = new Date();
+
+	var year = today.getFullYear();
+	var month = ("0"+(today.getMonth()+1)).slice(-2);
+	var date = ("0"+today.getDate()).slice(-2);
+
+	var sDate = new Date(today.setMonth(today.getMonth() - val));
+
+	var sYear = sDate.getFullYear();
+	var sMonth = ("0"+(sDate.getMonth()+1)).slice(-2);
+	var sDate = ("0"+sDate.getDate()).slice(-2);
+	
+	form.searchStartDate.value = sYear + "-" + sMonth + "-" + sDate;
+	form.searchEndDate.value = year + "-" + month + "-" + date;
+	
+}
+</script>
+
+<style type="text/css">
+.pageCont .tbType1 thead tr th,
+.pageCont .tbType1 tbody tr td {font-size:14px;}
+.btnType.btnType20{min-width: 0;}
+.contWrap{position: relative; width: 100%; height: 90%; min-height: auto; left: 0; top: 0; padding: 0;}
+.contWrap::after{display: none;}
+.pageCont{min-height: 100%;}
+html{height: 100%;}
+body{height: 94%;}
+</style>
+</head>
+<body >
+<form name="listForm" action="<c:url value='/uss/ion/msg/weekendCsWork.do'/>" method="post" style="height: 100%;">
+	<input name="pageIndex" id="pageIndex" type="hidden" value="<c:out value='${searchVO.pageIndex}'/>"/>
+	<input type="hidden" name="phmId"  />
+	<input type="hidden" name="authYn"  />
+	<input type="hidden" name="delFlag" value="Y" />
+	<input type="hidden" name="selectedId" />
+	<input type="hidden" name="pageType" />	
+	<input type="hidden" name="searchSortCnd" value="<c:out value="${searchVO.searchSortCnd}" />" />
+	<input type="hidden" name="searchSortOrd" value="<c:out value="${searchVO.searchSortOrd}" />" />
+	<input type="hidden" name="userId" value="" />
+	
+	<div class="contWrap">
+<!-- 		<div class="pageTitle"> -->
+<!-- 			<div class="pageIcon"><img src="/pb/img/pageTitIcon4.png" alt=""></div> -->
+<!-- 			<h2 class="titType1 c_222222 fwBold">주말 cs 리스트</h2> -->
+<!-- 			<p class="tType6 c_999999">주말 cs 리스트</p> -->
+<!-- 		</div> -->
+		<div class="pageCont">
+			<div class="tableWrap">
+				<table class="tbType1">
+					<colgroup>
+						<col style="width: 2%">
+						<col style="width: 5%">
+						<col style="width: 7%">
+						<col style="width: 9%">
+						<col style="width: 9%">
+						<col style="width: 6%">
+						<col style="width: 6%">
+						<col style="width: 3%">
+						<col style="width: 3%">
+						<col style="width: 7%">
+						<col style="width: 5%">
+						<col style="width: 5%">
+						<col style="width: 5%">
+						<col style="width: 8%">
+						<col style="width: *%">
+						<col style="width: 8%">
+						<%-- <col style="width: 10%"> --%>
+					</colgroup>
+					<thead>
+						<tr>
+							<th><input type="checkbox" name="checkAll" id="checkAll" class="check2" value="1" onClick="fnCheckAll();"></th>
+							<th>번호<input type="button" class="sort sortBtn" id="sort_phmId"></th>
+							<th>아이디<input type="button" class="sort sortBtn" id="sort_userId"></th>
+							<th>회원휴대폰</th>
+							<th>전화번호</th>
+							<th>대표<input type="button" class="sort sortBtn" id="sort_userName"></th>
+							<th>담당자<input type="button" class="sort sortBtn" id="sort_managerNm"></th>
+							<th>회원<%--<input type="button" class="sort sortBtn" id="sort_dept"> --%></th>
+							<th>구분<%--<input type="button" class="sort sortBtn" id="sort_nameType"> --%></th>
+							<!-- <th>타입(발신/수신/거부)<input type="button" class="sort sortBtn" id="sort_phmType"></th> -->
+							<th>인증여부<input type="button" class="sort sortBtn" id="sort_authYn"></th>
+							<th>관리자</th>
+							<th>인증<input type="button" class="sort sortBtn" id="sort_phmAuthType"></th>
+							<th>인증자<input type="button" class="sort sortBtn" id="sort_ownerName"></th>
+							<th>첨부파일</th>
+							<th>관리</th>
+							<th>등록일자<input type="button" class="sort sortBtn" id="sort_frstRegistPnttm"></th>
+							<!-- <th>삭제여부<input type="button" class="sort sortBtn" id="sort_delFlag"></th> -->
+						</tr>
+					</thead>
+					<tbody>
+						<c:forEach var="result" items="${resultList}" varStatus="status">
+						<tr>
+							<td>
+								<input name="del" id="del_${status.index}" type="checkbox" value="${result.phmId}" />
+							</td>
+							<td>
+								<c:if test="${searchVO.searchSortOrd eq 'desc' }">
+		                			<c:out value="${ ( paginationInfo.totalRecordCount - ((paginationInfo.currentPageNo -1)*paginationInfo.recordCountPerPage) ) - status.index }"/>
+			                	</c:if>
+			                	<c:if test="${searchVO.searchSortOrd eq 'asc' }">
+									<c:out value="${(paginationInfo.currentPageNo - 1) * paginationInfo.recordCountPerPage + status.count}"/>                   		
+			                	</c:if>
+							</td>
+							<td title="<c:out value="${result.userId}"/>">
+								<a href="#"  onclick="javascript:fnSelectMber('<c:out value="${result.userId}"/>'); return false;">
+									<c:out value="${result.userId}"/>
+								</a>
+							</td>
+							<td title="<c:out value="${result.mbtlNum}"/>">
+								<a href="#" onclick="fn_modify('${result.phmId}'); return false;">
+								<c:out value="${result.mbtlNum}"/>
+								</a>
+							</td>
+							<td title="<c:out value="${result.phoneNumber}"/>">
+								<a href="#" onclick="fn_modify('${result.phmId}'); return false;">
+								<c:out value="${result.phoneNumber}"/>
+								</a>
+							</td>
+							<td title="<c:out value="${result.userName}"/>">
+								<a href="#" onclick="fn_modify('${result.phmId}'); return false;">
+									<c:out value="${result.userName}"/>
+								</a>
+							</td>
+							<td title="<c:out value="${result.managerNm}"/>">
+								<a href="#" onclick="fn_modify('${result.phmId}'); return false;">
+									<c:out value="${result.managerNm}"/>
+								</a>
+							</td>							
+							<td>
+								<a href="#" onclick="fn_modify('${result.phmId}'); return false;">
+									<c:choose>
+										<c:when test="${result.dept == 'c'}">
+											기업
+										</c:when>
+										<c:otherwise>
+											개인
+										</c:otherwise>
+									</c:choose>
+								</a>
+							</td>
+							
+							<td>
+								<a href="#" onclick="fn_modify('${result.phmId}'); return false;">
+									<c:choose>
+										<c:when test="${not empty result.nameType}">
+											<c:choose>
+												<c:when test="${result.nameType == '1'}">
+													당사
+												</c:when>
+												<c:when test="${result.nameType == '2'}">
+													대표
+												</c:when>
+												<c:when test="${result.nameType == '3'}">
+													직원
+												</c:when>
+												<c:when test="${result.nameType == '4'}">
+													타사
+												</c:when>
+												<c:when test="${result.nameType == '5'}">
+													본인
+												</c:when>
+												<c:otherwise>
+													타인
+												</c:otherwise>
+											</c:choose>	
+										</c:when>
+										<c:otherwise>
+											없음
+										</c:otherwise>
+									</c:choose>
+								</a>
+							</td>
+							<%-- <td><c:out value="${result.phmTypeTxt}"/></td> --%>
+							<td>
+								<c:choose>
+									<c:when test="${result.phmType eq '03'}">
+										발신번호 차단
+									</c:when>
+									<c:otherwise>
+										<c:if test="${result.authYnTxt eq '심사중'}">인증요청</c:if> <!-- 코드에 심사중으로 등록되어 있지만 인증요청으로 화면에 뿌리기 위한 처리-->
+										<c:if test="${result.authYnTxt ne '심사중'}"><c:out value="${result.authYnTxt}"/></c:if>
+										
+									</c:otherwise>
+								</c:choose>
+							</td>
+							<td><c:out value="${result.admNm}"/></td>
+							<td title="<c:out value="${result.phmAuthTypeTxt}"/>">
+								<c:choose>
+									<c:when test="${result.phmAuthTypeTxt eq '휴대폰 인증'}">
+										휴대폰
+									</c:when>
+									<c:when test="${result.phmAuthTypeTxt eq '서류인증'}">
+										서류
+									</c:when>									
+									<c:otherwise>
+										<c:out value="${result.phmAuthTypeTxt}"/>
+									</c:otherwise>
+								</c:choose>							
+							</td>
+							<td>
+								<c:choose>
+									<c:when test="${result.phmAuthTypeTxt eq '서류인증'}">
+										
+									</c:when>									
+									<c:otherwise>
+										<c:out value="${result.ownerName}"/>
+									</c:otherwise>
+								</c:choose>							
+							</td>
+							<td class="brRm">
+				            		<c:import url="/cmm/fms/selectAddrAgencyFileInfs.do" charEncoding="utf-8">
+										<c:param name="param_atchFileId" value="${result.atchFileId}" />
+									</c:import>	
+							</td>
+							<td>
+								<c:if test="${result.authYn eq 'H'}">
+									<button class="btnType btnType20" onclick="updateAuthYn('<c:out value='${result.phmId}'/>', 'Y', '<c:out value='${result.userId}'/>'); return false;" >인증완료</button>
+									<button class="btnType btnType20" onclick="returnPop('<c:out value="${result.phmId}"/>'); return false;">반려</button>
+								</c:if>
+								<c:if test="${result.authYn eq 'C'}">
+									<button class="btnType btnType20" onclick="returnPop('<c:out value="${result.phmId}"/>'); return false;">반려사유</button>
+								</c:if>
+							</td>
+							<td title="<c:out value="${result.frstRegistPnttm}"/>">
+								<fmt:parseDate value="${result.frstRegistPnttm}" var="frstRegistDateValue" pattern="yyyy-MM-dd HH:mm"/>
+								<fmt:formatDate value="${frstRegistDateValue}" pattern="MM-dd HH:mm"/>																						
+							</td>
+							
+							<%-- <td><c:out value="${result.delFlagTxt}"/></td> --%>
+						</tr>
+						</c:forEach>
+						<c:if test="${empty resultList}">
+		         			<tr><td colspan="14"><spring:message code="common.nodata.msg" /></td></tr>
+		         		</c:if>    
+					</tbody>
+				</table>
+			</div>
+		</div>
+	</div>
+</form>
+
+<form name="modiForm" id="modiForm" method="post">
+	<input name="mberId" type="hidden" />
+</form>
+<form name="popupForm" id="popupForm" method="post">
+	<input name="phmId" type="hidden" />
+</form>
+
+</body>
+</html>

src/main/webapp/WEB-INF/jsp/uss/ion/msg/weekendCsWork2.jsp

@@ -0,0 +1,602 @@
+<%@ page contentType="text/html; charset=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="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="ec" uri="/WEB-INF/tld/ecnet_tld.tld"%>
+<!DOCTYPE html>
+<html lang="ko">
+<head>
+		<meta charset="UTF-8">
+		<meta http-equiv="content-type" content="text/html; charset=utf-8">
+		<meta http-equiv="X-UA-Compatible" content="IE=edge" />
+		<!-- <meta name="viewport" content="width=device-width, initial-scale=1.0"> -->
+		<link rel="stylesheet" href="/pb/css/reset.css">
+		<link rel="stylesheet" href="/pb/css/common.css">
+		<link rel="stylesheet" href="/pb/css/content.css?date=202301160001">
+		<link rel="stylesheet" href="/pb/css/popup.css">
+		<script src="/pb/js/jquery-3.5.0.js"></script>
+		<script src="/pb/js/common.js"></script>
+		<script src = "/js/new_main.js "></script>	
+		<link rel="icon" href="data:;base64,iVBORw0KGgo=">
+		<script src="<c:url value='/js/jquery.js' />"></script>
+		<script type="text/javascript" src="<c:url value='/js/EgovCalPopup.js'/>"></script>
+		<c:if test="${!empty loginId}">
+			<!-- 자동완성 START-->
+			<link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
+			<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+			<script src="<c:url value='/js/recent_search.js' />"></script>
+			<!-- 자동완성 END -->
+		</c:if>
+		<c:set var="RequestUrl" value="${pageContext.request.requestURL}"/>
+		<c:if test="${RequestUrl.indexOf('RefundReRegist.do') == -1}">
+			<script src="<c:url value='/js/ncms_common.js' />"></script>
+		</c:if>
+		<script>
+			$( document ).ready(function() {
+				labelSet();
+			});
+			function labelSet(){//Ajax load를 위해 메소드로 구현
+				$("input[type='checkBox'],input[type=radio]").each(function(index, item){
+					$(this).after("<label for='"+$(this).attr('id')+"'></label>") ;
+				});
+			}
+			
+			// 페이지 뒤로 가기 시 이벤트 발생
+			window.onpageshow = function(event) {
+				// 뒤로 가기, 새로고침 등 캐시 복원 시
+				if ( event.persisted || (window.performance && window.performance.navigation.type == 2)) {
+				} else { // 새 페이지 열릴 시
+					<c:if test="${!empty message}">alert("${message}");</c:if>
+				}
+			}
+		</script>
+<title>기업회원 신청 정보</title>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<script type="text/javascript" src="<c:url value='/js/EgovMultiFile.js'/>"></script>
+<script type="text/javaScript" language="javascript">
+
+var hstSttus = "${hstSttus}";
+
+$( document ).ready(function() {
+	// 대시보드에 전달받은 파라미터 처리
+	fromDashboard();
+
+});
+
+function fnChkAll() {
+	if($("#chkAll").is(':checked') ){
+	  $("input[name=chkSttusY]").prop("checked", true);
+	}else{
+	  $("input[name=chkSttusY]").prop("checked", false);
+	}
+}
+
+// 대시보드에 전달받은 파라미터 처리
+function fromDashboard() {
+	if (hstSttus == "01") {
+		$("#searchHstSttus").val(hstSttus).prop("selected", true);
+	
+		linkPage(1);
+	}	
+}
+
+function linkPage(pageNo){
+	var listForm = document.listForm ;
+	listForm.action = "/uss/umt/user/EgovMberCmpHstList.do" ;
+	listForm.target = "_self";
+	listForm.pageIndex.value = pageNo ;
+	listForm.submit();
+}
+
+function returnPop(cmphstId) {
+	$("#cmphstId").val(cmphstId);
+	window.open("about:blank", 'returnPopup', 'width=600, height=310, top=400, left=650, fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=yes, location=no, scrollbar=no');
+    document.listForm.action = "<c:url value='/uss/umt/user/EgovMberCmpHstReturnPop.do'/>";
+    document.listForm.target = "returnPopup";
+    document.listForm.submit();
+}
+
+function listPop(mberId) {
+	document.popupForm.mberId.value = mberId;
+	window.open("about:blank", 'listPopup', 'width=1800, height=800, top=100, left=0, fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=yes, location=no, scrollbar=no');
+    document.popupForm.action = "<c:url value='/uss/umt/user/EgovMberCmpHstListPop.do'/>";
+    document.popupForm.target = "listPopup";
+    document.popupForm.submit();
+}
+
+//link to bizno
+function bizNoPop(p_biz_no) {
+	//document.popupForm.mberId.value = mberId;
+	window.open("about:blank", 'listPopup', 'width=1800, height=800, top=100, left=0, fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=yes, location=no, scrollbar=no');
+    document.popupForm.action = "https://bizno.net/article/"+p_biz_no;
+    document.popupForm.target = "bizNoPopup";
+    document.popupForm.submit();
+}
+
+function listTaxPop(mberId) {
+	document.popupForm.mberId.value = mberId;
+	window.open("about:blank", 'taxListPopup', 'width=1800, height=800, top=100, left=0, fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=yes, location=no, scrollbar=no');
+    document.popupForm.action = "<c:url value='/uss/umt/user/EgovMberCmpHstTaxListPop.do'/>";
+    document.popupForm.target = "taxListPopup";
+    document.popupForm.submit();
+}
+
+function biznoPop(p_bizno) {
+	window.open('https://www.bizno.net/article/'+p_bizno);	
+}
+
+
+
+// 기업회원 신청 승인/반려 처리
+function setMberCmpHstStatusSave(hstSttus, cmphstId, hstType, mberId, managerNm, mbtlNum) {
+	var sMsg = "";
+	if (hstSttus == "02") {
+		sMsg = "승인";
+	}
+	else if (hstSttus == "03") {
+		sMsg = "반려";
+	}
+	
+	if (confirm(sMsg + " 하시겠습니까?")) {
+		
+		$("#hstSttus").val(hstSttus);
+		$("#cmphstId").val(cmphstId);
+		$("#hstType").val(hstType);	
+		$("#mberId").val(mberId);
+		$("#mbtlNum").val(mbtlNum);
+		if(hstType == '02' && hstSttus == '02'){ //기업회원 전환 승인이라면 기존 mberNm -> managerNm 으로 수정
+			$("#managerNm").val(managerNm);
+		}
+		
+		
+		
+		var form = document.listForm;
+		var data = new FormData(form);
+		url = "/uss/umt/user/mberCmpHstStatusSaveAjax.do";
+		
+		$.ajax({
+	        type: "POST",
+	        url: url,
+	        data: data,
+	        dataType:'json',
+	        async: false,
+	        processData: false,
+	        contentType: false,
+	        cache: false,
+	        success: function (data) {
+				if (data.isSuccess) {
+					if(data.isDone){ //이미 처리했던 건인지 체크
+						alert(data.msg);
+						location.reload();
+					}else{
+						// 초기화
+						$("#hstSttus").val("");
+						$("#cmphstId").val("");
+						$("#hstType").val("");	
+						$("#mberId").val("");
+						alert(data.msg);
+						linkPage(1);
+					}
+				} 
+				else {
+					alert(data.msg);
+				}
+			},
+	        error: function (e) { 
+	        	alert("저장에 실패하였습니다."); 
+	        	alert("ERROR : " + JSON.stringify(e)); 
+	        }
+	    });
+	}
+	
+}
+
+//반려 기업회원 삭제 처리
+function setMberCmpHstStatusDelete(
+		p_mberId
+		) {
+	if (confirm("정말 삭제 하시겠습니까?")) {			
+		$("#mberId").val(p_mberId);
+		
+		var form = document.listForm;
+		var data = new FormData(form);
+		url = "/uss/umt/user/mberCmpHstStatusDeleteAjax.do";
+		
+		$.ajax({
+	        type: "POST",
+	        url: url,
+	        data: data,
+	        dataType:'json',
+	        async: false,
+	        processData: false,
+	        contentType: false,
+	        cache: false,
+	        success: function (data) {
+				if (data.isSuccess) { 
+					// 초기화
+					$("#mberId").val("");
+					alert(data.msg);
+					linkPage(1);
+				} 
+				else {
+					alert(data.msg);
+				}
+			},
+	        error: function (e) { 
+	        	alert("삭제에 실패하였습니다."); 
+	        	alert("ERROR : " + JSON.stringify(e)); 
+	        }
+	    });
+	}
+	
+}
+
+//신청 일괄승인
+function fnSttusYAll() {
+		if($("input[name=chkSttusY]:checked").length == 0){
+			alert("선택된 항목이 없습니다.");
+			return false;
+		}
+		if (confirm("일괄승인 처리하시겠습니까?")){
+			var cmphstIds = [];
+			$('input:checkbox[name="chkSttusY"]').each(function() {
+				if(this.checked){
+					cmphstIds.push($(this).val());
+				}
+			})
+		}
+		
+		$.ajax({
+			type: "POST",
+			url : "<c:url value='/uss/umt/user/mberCmpHstStatusYSaveAjax.do'/>",
+			data : {"cmphstIds" : cmphstIds},
+			dataType : 'json',
+			async : false,
+			success : function(data){
+				alert(data.msg);
+				location.reload();
+			},
+			error :function(e){
+				alert("2");
+			}
+		})
+}
+//마우스 오버시 상세정보 노출
+$(function(){
+	$('.pageCont .tbType1 tbody tr').mouseover(function(){
+		$(this).mousemove(function(e){
+			var x=e.pageX+15;
+			var y=e.pageY+15;
+			$(this).closest('tr').next('.biz_hover_wrap').find('.biz_hover_content').css({'top':y,'left':x});
+		});
+	});
+});
+
+//회원정보 상세 팝업
+function fnSelectMber(mberId) {
+	document.modiForm.mberId.value = mberId;
+	window.open("about:blank", 'popupSelectMber', 'width=900, height=1800, top=100, left=100, fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=yes, location=no, scrollbar=no');
+    document.modiForm.action = "<c:url value='/uss/umt/user/EgovGnrlselectedUserView.do'/>";
+    document.modiForm.target = "popupSelectMber";
+    document.modiForm.submit();
+}
+
+//기간선택 select
+function fnSetCalMonth(val) {
+	var form = document.listForm;
+	var today = new Date();
+
+	var year = today.getFullYear();
+	var month = ("0"+(today.getMonth()+1)).slice(-2);
+	var date = ("0"+today.getDate()).slice(-2);
+
+	var sDate = new Date(today.setMonth(today.getMonth() - val));
+
+	var sYear = sDate.getFullYear();
+	var sMonth = ("0"+(sDate.getMonth()+1)).slice(-2);
+	var sDate = ("0"+sDate.getDate()).slice(-2);
+	
+	form.searchStartDate.value = sYear + "-" + sMonth + "-" + sDate;
+	form.searchEndDate.value = year + "-" + month + "-" + date;
+	
+}
+
+</script>
+<style type="text/css">
+.pageCont .tbType1 thead tr th,
+.pageCont .tbType1 tbody tr td {font-size:14px;}
+.btnType.btnType20{min-width: 0;}
+.contWrap{position: relative; width: 100%; height: 90%; min-height: auto; left: 0; top: 0; padding: 0;}
+.contWrap::after{display: none;}
+.pageCont{min-height: 100%;}
+html{height: 100%;}
+body{height: 94%;}
+</style>
+</head>
+<body>
+
+<form name="popupForm" action="<c:url value='/uss/umt/user/EgovMberCmpHstListPop.do'/>" method="post">
+	<input type="hidden" name="pageIndex" value="1"/>
+	<input type="hidden" name="searchSortCnd" value="<c:out value="${searchVO.searchSortCnd}" />" />
+	<input type="hidden" name="searchSortOrd" value="<c:out value="${searchVO.searchSortOrd}" />" />
+	<input type="hidden" name="mberId"/>
+</form>
+
+
+<form name="listForm" action="<c:url value='/uss/umt/user/EgovMberCmpHstList.do'/>" method="post" style="height: 100%;">
+	<input name="pageIndex" id="pageIndex" type="hidden" value="<c:out value='${searchVO.pageIndex}'/>"/>
+	<input type="hidden" name="pageType" />	
+	<input type="hidden" name="searchSortCnd" value="<c:out value="${searchVO.searchSortCnd}" />" />
+	<input type="hidden" name="searchSortOrd" value="<c:out value="${searchVO.searchSortOrd}" />" />
+	<input type="hidden" name="hstSttus" id="hstSttus" />
+	<input type="hidden" name="cmphstId" id="cmphstId" />
+	<input type="hidden" name="hstType" id="hstType" />
+	<input type="hidden" name="mberId" id="mberId" />
+	<input type="hidden" name="managerNm" id="managerNm" />
+	<input type="hidden" name="mbtlNum" id="mbtlNum" />
+	<input type="hidden" name="atchFileId" id="atchFileId" />
+	<input type="hidden" name="workAtchFileId" id="workAtchFileId" />
+	
+	<div class="contWrap">
+<!-- 		<div class="pageTitle"> -->
+<!-- 			<div class="pageIcon"><img src="/pb/img/pageTitIcon4.png" alt=""></div> -->
+<!-- 			<h2 class="titType1 c_222222 fwBold">기업회원 신청 목록</h2> -->
+<!-- 			<p class="tType6 c_999999">기업회원 신청 정보를 파악할 수 있습니다.</p> -->
+<!-- 		</div> -->
+		<div class="pageCont">
+			<div class="tableWrap">
+				<table class="tbType1">
+					<colgroup>
+						<col style="width: 20px">
+						<col style="width: 50px">
+						<col style="width: 7%">
+						<col style="width: 30px">
+						<col style="width: auto">
+						<col style="width: 80px">
+						<col style="width: 5%">
+						<col style="width: 6%">
+						<col style="width: 90px">
+						<col style="width: 55px">
+						<col style="width: 55px">
+						<col style="width: 5%">
+						<col style="width: 35px">
+						<col style="width: 50px">
+						<col style="width: 30px">
+						<col style="width: 7%">						
+						<col style="width: 115px">
+						<col style="width: 50px">
+						<col style="width: 50px">
+					</colgroup>
+					<thead>
+						<tr>
+							<th><input type="checkbox" id="chkAll" onClick="fnChkAll();"></th>
+							<th>번호<input type="button" class="sort sortBtn" id="sort_cmphstId"></th>
+							<th>회원ID<input type="button" class="sort sortBtn" id="sort_mberId"></th>
+							<th>유형<input type="button" class="sort sortBtn" id="sort_bizType"></th>
+							<th>기업명<input type="button" class="sort sortBtn" id="sort_mberNm"></th>
+							<th>사업자번호<input type="button" class="sort sortBtn" id="sort_bizNo"></th>
+							<th>대표자<input type="button" class="sort sortBtn" id="sort_ceoNm"></th>
+							<th>담당자<input type="button" class="sort sortBtn" id="sort_ceoNm"></th>
+							<th>휴대폰<input type="button" class="sort sortBtn" id="sort_ceoNm"></th>
+							<th>사업자<input type="button" class="sort sortBtn" id="sort_atchFileId"></th>
+							<th>재직<input type="button" class="sort sortBtn" id="sort_workAtchFileId"></th>
+							<th>유형<input type="button" class="sort sortBtn" id="sort_hstType"></th>
+							<th>사전</th>
+							<th>API</th>
+							<th>상태<input type="button" class="sort sortBtn" id="sort_hstSttus"></th>
+							<th>등록일<input type="button" class="sort sortBtn" id="sort_frstRegistPnttm"></th>
+							<th>관리</th>
+							<th>전체</th>
+							<th>삭제</th>
+						</tr>
+					</thead>
+					<tbody>
+						<c:forEach var="result" items="${mberCmpHstList}" varStatus="status">
+						<tr>
+							<td>
+								<c:if test="${result.hstSttus eq '01'}">
+									<input type="checkbox" name="chkSttusY" id="chkSttusY_${status.index}" value="${result.cmphstId}">
+								</c:if>
+							</td>
+							<td>
+								<c:if test="${searchVO.searchSortOrd eq 'desc' }">
+		                			<c:out value="${ ( paginationInfo.totalRecordCount - ((paginationInfo.currentPageNo -1)*paginationInfo.recordCountPerPage) ) - status.index }"/>
+			                	</c:if>
+			                	<c:if test="${searchVO.searchSortOrd eq 'asc' }">
+									<c:out value="${(paginationInfo.currentPageNo - 1) * paginationInfo.recordCountPerPage + status.count}"/>
+			                	</c:if>
+							</td>
+							<td>
+								<c:choose>
+									<c:when test="${result.hstSttus == '02'}">
+										<a href="#"  onclick="javascript:fnSelectMber('<c:out value="${result.mberId}"/>'); return false;">
+											<c:out value="${result.mberId}"/>	
+										</a>
+									</c:when>
+									<c:otherwise>
+										<c:out value="${result.mberId}"/>
+									</c:otherwise>
+								</c:choose>
+							</td>
+							<td>
+		                        <c:forEach var="item" items="${bizTypeList}" varStatus="status">
+		                            <c:if test="${result.bizType == item.code}"><c:out value="${fn:substring(item.codeNm,0,2)}"/></c:if>
+		                        </c:forEach>
+							</td>
+							<td><c:out value="${result.mberNm}"/></td>
+							<td><a href="https://www.bizno.net/article/${result.bizNo}" target="_blank"><c:out value="${result.bizNo}"/></a></td>
+							<td><c:out value="${result.ceoNm}"/></td>
+							<td><c:out value="${result.hstManagerNm}"/></td>
+							<td><c:out value="${result.hstMbtlNum}"/></td>
+				            <td class="td_file">		            	
+                                <c:if test="${result.atchFileId ne '' || result.atchFileId ne null}">
+				            		<c:import url="/cmm/fms/selectAddrAgencyFileInfs.do" charEncoding="utf-8">
+										<c:param name="param_atchFileId" value="${result.atchFileId}" />
+									</c:import>	
+					            </c:if>
+				            </td>							
+				            <td class="td_file">		            	
+                                <c:if test="${result.workAtchFileId ne '' || result.workAtchFileId ne null}">
+				            		<c:import url="/cmm/fms/selectAddrAgencyFileInfs.do" charEncoding="utf-8">
+										<c:param name="param_atchFileId" value="${result.workAtchFileId}" />
+									</c:import>	
+					            </c:if>
+				            </td>											            							
+							<td>
+		                        <c:forEach var="item" items="${hstTypeList}" varStatus="status">
+		                            <c:if test="${result.hstType == item.code}"><c:out value="${item.codeNm}"/></c:if>
+		                        </c:forEach>
+							</td>
+							<td>
+								<c:choose>
+									<c:when test="${result.checkType == '100'}">
+										Y
+									</c:when>
+									<c:when test="${result.checkType == '111'}">
+										YY
+										<br/>대표자명
+										<br/>기업이름
+										<br/>설립일										
+									</c:when>
+									<c:otherwise>
+										X
+									</c:otherwise>
+								</c:choose>							
+							</td>
+							<td>
+<%-- 								<a href="https://www.bizno.net/article/${result.bizNo}" target="_blank">bizno</a> --%>
+<!-- 
+								<button class="btnType btnType20" 
+								onclick="biznoPop('${result.bizNo}');return false;">bizno</button>
+ -->								
+								<button class="btnType btnType20" 
+								onclick="listTaxPop('<c:out value="${result.mberId}"/>'); return false;">팝업</button>							
+							</td>														
+							<td>
+		                        <c:forEach var="item" items="${hstSttusList}" varStatus="status">
+		                            <c:if test="${result.hstSttus == item.code}">
+		                            	<c:if test="${result.hstSttus == 01}"><span class="c_ed4555"><c:out value="${item.codeNm}"/></span></c:if>
+		                            	<c:if test="${result.hstSttus == 02}"><span class="c_456ded"><c:out value="${item.codeNm}"/></span></c:if>
+		                            	<c:if test="${result.hstSttus == 03}"><span class="c_b4b4b4"><c:out value="${item.codeNm}"/></span></c:if>
+		                            </c:if>
+		                        </c:forEach>
+							</td>							
+							<td>
+								<fmt:parseDate value="${result.frstRegistPnttm}" var="frstRegistDateValue" pattern="yyyy-MM-dd HH:mm"/>
+								<fmt:formatDate value="${frstRegistDateValue}" pattern="MM-dd HH:mm"/>																						
+							</td>							
+							<td>
+								<c:if test="${result.hstSttus eq '01'}">
+									<button class="btnType btnType20" onclick="setMberCmpHstStatusSave('02','<c:out value="${result.cmphstId}"/>','<c:out value="${result.hstType}"/>','<c:out value="${result.mberId}"/>' ,'<c:out value="${result.managerNm}"/>' ,'<c:out value="${result.mbtlNum}"/>'); return false;">승인</button>
+									<%-- <button class="btnType btnType20" onclick="setMberCmpHstStatusSave('03','<c:out value="${result.cmphstId}"/>','<c:out value="${result.hstType}"/>','<c:out value="${result.mberId}"/>' ,'<c:out value="${result.managerNm}"/>' ,'<c:out value="${result.mbtlNum}"/>'); return false;">반려</button> --%>
+									<button class="btnType btnType20" onclick="returnPop('<c:out value="${result.cmphstId}"/>'); return false;">반려</button>
+								</c:if>
+								<c:if test="${result.hstSttus eq '03'}">
+									<button class="btnType btnType20" onclick="returnPop('<c:out value="${result.cmphstId}"/>'); return false;">반려 사유</button>
+								</c:if>														
+							</td>								
+							<td>
+								<button class="btnType btnType20" onclick="listPop('<c:out value="${result.mberId}"/>'); return false;">전체 </button>								
+							</td>
+							<td>
+								<c:if test="${result.hstSttus eq '03'}">																	
+									<button class="btnType btnType20" onclick="setMberCmpHstStatusDelete('<c:out value="${result.mberId}"/>'); return false;">삭제</button>								
+								</c:if>								
+							</td>															
+						</tr>
+						<tr class="biz_hover_wrap">
+							<td colspan="14">
+								<div class="biz_hover_content">
+									<dl>
+										<dt>회원 ID</dt>
+										<dd><c:out value="${result.mberId}"/></dd>
+									</dl>
+									<dl>
+										<dt>유형</dt>
+										<dd>
+											<c:forEach var="item" items="${bizTypeList}" varStatus="status">
+					                            <c:if test="${result.bizType == item.code}"><c:out value="${fn:substring(item.codeNm,0,2)}"/></c:if>
+					                        </c:forEach>
+										</dd>
+									</dl>
+									<dl>
+										<dt>기업이름</dt>
+										<dd><c:out value="${result.mberNm}"/></dd>
+									</dl>
+									<dl>
+										<dt>사업자번호</dt>
+										<dd><c:out value="${result.bizNo}"/></dd>
+									</dl>
+									<dl>
+										<dt>대표자 성명</dt>
+										<dd><c:out value="${result.ceoNm}"/></dd>
+									</dl>
+									<dl>
+										<dt>담당자 성명</dt>
+										<dd><c:out value="${result.hstManagerNm}"/></dd>
+									</dl>
+									<dl>
+										<dt>휴대폰</dt>
+										<dd><c:out value="${result.hstMbtlNum}"/></dd>
+									</dl>
+									<%-- <c:if test="${result.atchFileId ne '' && result.atchFileId ne null}">
+										<dl>
+											<dt>사업자등록증</dt>
+											<dd></dd>
+										</dl>
+									</c:if>
+									<c:if test="${result.workAtchFileId ne '' && result.workAtchFileId ne null}">
+										<dl>
+											<dt>재직증명서</dt>
+											<dd></dd>
+										</dl>
+									</c:if> --%>
+									<dl>
+										<dt>유형</dt>
+										<dd>
+											<c:forEach var="item" items="${hstTypeList}" varStatus="status">
+					                            <c:if test="${result.hstType == item.code}"><c:out value="${item.codeNm}"/></c:if>
+					                        </c:forEach>
+										</dd>
+									</dl>
+									<dl>
+										<dt>상태</dt>
+										<dd>
+											<c:forEach var="item" items="${hstSttusList}" varStatus="status">
+					                            <c:if test="${result.hstSttus == item.code}"><c:out value="${item.codeNm}"/></c:if>
+					                        </c:forEach>
+										</dd>
+									</dl>
+									<dl>
+										<dt>관리자</dt>
+										<dd>
+											<c:out value="${result.admNm}" />
+										</dd>
+									</dl>
+									<dl>
+										<dt>등록일</dt>
+										<dd><c:out value="${result.frstRegistPnttm}"/></dd>
+									</dl>
+								</div>
+							</td>
+						</tr>
+						</c:forEach>
+						<c:if test="${empty mberCmpHstList}">
+		         			<tr><td colspan="14"><spring:message code="common.nodata.msg" /></td></tr>
+		         		</c:if>    
+					</tbody>
+				</table>
+			</div>
+			<div class="btnWrap">
+				<input type="button" class="btnType2"  onclick="javascript:fnSttusYAll(); return false;" value="일괄승인">
+			</div>
+		</div>
+	</div>
+</form>
+<form name="modiForm" id="modiForm" method="post">
+	<input name="mberId" type="hidden" />
+</form>
+</body>
+</html>

src/main/webapp/WEB-INF/jsp/uss/ion/msg/weekendCsWorkMain.jsp

@@ -0,0 +1,67 @@
+<%--
+  Class Name : weekendCsWork.jsp
+  Description : 발신번호 리스트 조회 페이지
+  Modification Information
+
+      수정일         수정자                   수정내용
+    -------    --------    ---------------------------
+    2021.03.31    신명섭          최초 생성
+
+    Copyright (C) 2009 by ITN  All right reserved.
+--%>
+<%@ page contentType="text/html; charset=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="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="ec" uri="/WEB-INF/tld/ecnet_tld.tld"%>
+<%   
+	response.setHeader("Cache-Control","no-store");   
+	response.setHeader("Pragma","no-cache");   
+	response.setDateHeader("Expires",0);   
+	if (request.getProtocol().equals("HTTP/1.1")) response.setHeader("Cache-Control", "no-cache"); 
+%> 
+<!DOCTYPE html>
+<html lang="ko">
+
+<head>
+	<script type="text/javascript" src="<c:url value='/js/EgovMultiFile.js'/>"></script>
+	<script type="text/javaScript" language="javascript">
+			
+		$(document).ready(function() {
+	// 			load();
+	// 			alert('test');
+		});
+			
+		function load(){
+			$('#frame1').attr('src', '/uss/ion/msg/weekendCsWork.do');
+			$('#frame2').attr('src', '/uss/ion/msg/weekendCsWork2.do');
+		}
+	</script>
+	<style>
+		@import url(//fonts.googleapis.com/earlyaccess/notosanskr.css);
+		#test{position: absolute; height: 40px; right: 40px; top: 47px; font-family: 'Noto Sans KR', sans-serif; color: #456ded; font-weight: 500; border: 1px solid #456ded; border-radius: 5px; padding: 0 10px; background-color: #fff;}
+		#test img{vertical-align: middle; margin-top: -4px; margin-right: 4px;}
+	</style>
+</head>
+<body>
+<div class="contWrap">
+	<div class="pageTitle">
+		<div class="pageIcon"><img src="/pb/img/pageTitIcon4.png" alt="" style="max-width: 1173px;"></div>
+		<h2 class="titType1 c_222222 fwBold">발신번호 조회</h2>
+		<p class="tType6 c_999999">화이팅!</p>
+		<div class="btn_area">
+			<button id="test" onclick="load();"><img src="/pb/img/icon_refresh.png" alt="" /> 갱신</button>
+		</div>
+	</div>
+	<iframe id="frame1" src="/uss/ion/msg/weekendCsWork.do" width="100%" height="500"></iframe>
+	<div class="pageTitle">
+		<div class="pageIcon"><img src="/pb/img/pageTitIcon4.png" alt="" style="max-width: 1173px;"></div>
+		<h2 class="titType1 c_222222 fwBold">기업회원 신청</h2>
+		<p class="tType6 c_999999">화이팅!</p>
+	</div>
+	<iframe id="frame2" src="/uss/ion/msg/weekendCsWork2.do" width="100%" height="500"></iframe>
+</div>
+</body>
+</html>

src/main/webapp/WEB-INF/jsp/web/addr/AddrListAjax.jsp

@@ -214,12 +214,32 @@ function copyAddr() {
 }
 
 //메모 레이어 열 때 메모 데이터 전달
-function memoOpen(comment, id) {
+function memoOpen(id) {
 	var form = document.addrMemoForm;
 	form.addrCheck.value=id;
-	$('#textareaMemo').text(comment);
-	
+
+	// 메모내용 가져오기
+	$.ajax({
+		url : "<c:url value='/web/mjon/addr/selectAddrDetailAjax.do'/>", 
+		type : 'POST', 
+		data : {"addrId" : id},
+		dataType:'json',
+		async: false,
+		success : function(data, status){
+			if(data.isSuccess == true) {
+				$('#textareaMemo').text(data.addrInfo.addrComment);
+			} 
+			else {
+				//alert("Message : " + msg);
+			}			
+		},
+		error: function (e) { 
+			console.log("ERROR : ", e); 
+			alert("에러가 발생했습니다.");  
+		}
+	});	
 }
+
 // 메모 저장
 function updateMemo() {
 	var form = document.addrMemoForm;
@@ -768,7 +788,7 @@ function setAddrDupliClose() {
 							</p>
 						</td>
 						<td>
-							<button type="button" onclick="memoOpen('<c:out value='${result.addrComment}' />','<c:out value='${result.addrId}' />'); return false;" data-tooltip="adr_popup13">
+							<button type="button" onclick="memoOpen('<c:out value="${result.addrId}" />'); return false;" data-tooltip="adr_popup13">
 								<img src="/publish/images/content/memo_img.png" alt="메모">
 							</button>
 						</td>

src/main/webapp/WEB-INF/jsp/web/event/pay/EventPayView.jsp

@@ -630,7 +630,7 @@ function TabTypePay(obj, tabId) {
 							<li class="btn_charge2 btn_tab"><button type="button" onclick="TabTypePay(this,'2');" id="btnDdedicatedAccount"><i></i>전용계좌</button></li>
 							<!-- <li class="btn_charge2 btn_tab"><button type="button" onclick="TabTypePay(this,'3');"><i></i>무통장입금</button></li> -->
 							<!-- <li class="btn_charge4 btn_tab"><button type="button" onclick="TabTypePay(this,'4');"><i></i>휴대폰결제</button></li> -->
-							<li class="btn_charge5 btn_tab"><button type="button" onclick="TabTypePay(this,'5');"><i></i>즉시이체</button></li>
+							<li class="btn_charge4 btn_tab"><button type="button" onclick="TabTypePay(this,'5');"><i></i>즉시이체</button></li>
 						</ul>
 						<div class="checkbox_wrap"><input type="checkbox" id="agree"><label for="agree">선택한 수단을 다음 충전 시에도
 							이용합니다.</label></div>
@@ -783,6 +783,8 @@ function TabTypePay(obj, tabId) {
 												<p>- <span>첫결제 이벤트는 최대 50만원까지만 적용이 됩니다.</span></p>
 												<p>- 전용계좌는 개설일로부터 <span>3개월 미사용 시 자동 해지</span>됩니다.</p>
 												<p>- 전용계좌에 <span>5,000원 이상 입금</span> 시, 연중무휴 <span>실시간 자동 충전이</span> 가능합니다.</p>
+												<p>- 이체 후 충전 확인까지 <span>최대 10분이 소요</span>됩니다.</p>
+												<p>- 이체금액에서 <span>부가세 10%가 제외되고 충전</span>됩니다.</p>												
 												<!-- <p>- 예금주 : 문자온</p> -->
 												<p>- 계좌번호 문자로 받기(일/3회까지) 
                                                     <label for="" class="label">전화번호 입력</label>

src/main/webapp/WEB-INF/jsp/web/event/pay/EventPayViewV2.jsp

@@ -192,15 +192,16 @@ function pgOpenerPopup(){
 	var payMethod = "";
 	document.pgForm.action = "/web/member/pay/PayActionAjax.do";
 	
-	if ($currentTab == 0) {	
-		payMethod = "SPAY";
-	} else if ($currentTab==1) {	
+	if ($currentTab==0) {	
 		payMethod = "CARD";
-	} else if($currentTab==2){	
+	} else if($currentTab==1) {	
 		payMethod = "VBANK";		
-	} else if($currentTab==3){	
+	} else if($currentTab==2) {	
 		payMethod = "BANK";		
-	}
+	} else {	
+		payMethod = "SPAY";
+	} 
+	
 	$('input[name=payMethod]').val(payMethod);
 	
 	//결제수단 상태 체크
@@ -226,29 +227,37 @@ function pgOpenerPopup(){
 	
 	// 결제창 호출
 	if ($currentTab==0) {
-		// KG 모빌리언스 => SPAY(간편결제)
-		kgmPayCardRequest();		
-	}	
-	else if ($currentTab==1) {
 		// 나이스페이 => CARD(카드결제)
 		pg_opener = window.open('', 'pg_opener', "width=790, height=505, left="+popupX+", top="+popupY, "location = no","status= no","toolbars= no");		
 
 		document.pgForm.method = "post";
 		document.pgForm.target = "pg_opener" ;
 		document.pgForm.submit();		
-	}		
-	else if ($currentTab==2) {
+	} else if ($currentTab==1) {
 		// 전용계좌
-	}			
-	else if ($currentTab==3) {
+	} else if ($currentTab==2) {
 		// KG 모빌리언스 => BANK(즉시이체)
 		kgmPayBankRequest();		
-	}		
+	} else {
+		var cnDirect = "";
+		if ($currentTab == 3) {
+			cnDirect = "NAV:00:N";	// 네이버페이
+		} else if ($currentTab==4) {
+			cnDirect = "KKO:00:N";	// 카카오페이
+		} else if ($currentTab==5) {
+			cnDirect = "TOS:00:N";	// 토스페이
+		} else if ($currentTab==6) {
+			cnDirect = "PYC:00:N";	// 페이코
+		}	
+		
+		// KG 모빌리언스 => SPAY(간편결제)
+		kgmPayCardRequest(cnDirect);		
+	}	
 
 }
 
 //KG 모빌리언스 => CARD
-function kgmPayCardRequest() {
+function kgmPayCardRequest(cnDirect) {
 	$.ajax({
         type: "POST",
         url: "/web/member/pay/kgmCardEncodeAjax.do",
@@ -285,7 +294,7 @@ function kgmPayCardRequest() {
 				form.Termregno.value = data.Termregno;
 				form.APP_SCHEME.value = data.APP_SCHEME;
 				form.CN_FIXCARDCD.value = data.CN_FIXCARDCD;
-				form.CN_DIRECT.value = data.CN_DIRECT;
+				form.CN_DIRECT.value = cnDirect;
 				form.CN_INSTALL.value = data.CN_INSTALL;
 				form.Deposit.value = data.Deposit;
 				
@@ -808,76 +817,20 @@ function TabTypePay(obj, tabId) {
 					</div>--%>
 					<div>
 						<p class="tab_tit">충전수단 선택</p>
-						<ul class="area_tab">
-							<li class="btn_charge_simple btn_tab active"><button type="button" onclick="TabTypePay(this,'0');"><i></i>간편결제</button></li>
-							<li class="btn_charge1 btn_tab"><button type="button" onclick="TabTypePay(this,'1');"><i></i>신용카드</button></li>
+						<ul class="area_tab type03">
+							<li class="btn_charge1 btn_tab active"><button type="button" onclick="TabTypePay(this,'1');"><i></i>신용카드</button></li>
 							<li class="btn_charge2 btn_tab"><button type="button" onclick="TabTypePay(this,'2');" id="btnDdedicatedAccount"><i></i>전용계좌</button></li>
-							<li class="btn_charge5 btn_tab"><button type="button" onclick="TabTypePay(this,'5');"><i></i>즉시이체</button></li>
+							<li class="btn_charge3 btn_tab"><button type="button" onclick="TabTypePay(this,'4');"><i></i>즉시이체</button></li>
+							
+							<li class="btn_charge5 btn_tab simple_pay event_simple"><button type="button" onclick="TabTypePay(this,'6');"><i></i></button></li>
+							<li class="btn_charge6 btn_tab simple_pay event_simple"><button type="button" onclick="TabTypePay(this,'7');"><i></i></button></li>
+							<li class="btn_charge7 btn_tab simple_pay event_simple"><button type="button" onclick="TabTypePay(this,'8');"><i></i></button></li>
+							<li class="btn_charge8 btn_tab simple_pay event_simple"><button type="button" onclick="TabTypePay(this,'9');"><i></i></button></li>														
 						</ul>
-						<div class="checkbox_wrap"><input type="checkbox" id="agree"><label for="agree">선택한 수단을 다음 충전 시에도
-							이용합니다.</label></div>
+						<div class="checkbox_wrap"><input type="checkbox" id="agree"><label for="agree">선택한 수단을 다음 충전 시에도 이용합니다.</label></div>
 
-						<!-- 간편결제 -->
-						<div class="area_tabcont on" id="tab2_0">
-							<p class="tType1_title"><img src="/publish/images/content/icon_charging1_small.png" alt=""> 간편결제</p>
-							<table class="tType1">
-								<caption></caption>
-								<colgroup>
-									<col style="width: 100px;">
-									<col style="width: auto;">
-								</colgroup>
-								<tbody>
-									<tr class="charge_content">
-										<th scope="row">충전금액</th>
-										<td class="flex">
-											<select name="tempPrice" id="tempPrice" class="list_seType1">
-												<option value="5000">5,000</option>
-												<option value="10000">10,000</option>
-												<option value="20000">20,000</option>
-												<option value="30000">30,000</option>
-												<option value="50000" selected>50,000</option>
-												<option value="100000">100,000</option>
-												<option value="200000">200,000</option>
-												<option value="300000">300,000</option>
-												<option value="500000">500,000</option>
-											</select>
-											<p class="input_in">원</p>
-											<!-- <span class="reqTxt6">※ 최소 3천원 이상부터 결제 가능합니다.</span> -->
-										</td>
-									</tr>
-									<tr>
-										<td colspan="2">
-											<div class="amount_wrap">
-												<dl>
-													<dt>최종 결제금액 :</dt>
-													<dd>
-														<ul>
-															<li><strong id="supplyPriceStr"></strong>원(공급가액)</li>
-															<li><span class="plus"></span><strong id="vatPriceStr"></strong>원(부가세)</li>
-															<li class="total"><span class="equal"></span><strong id="lastPriceStr"></strong>원(최종금액)</li>
-														</ul>
-													</dd>
-												</dl>
-												<button type="button" class="btnType" onclick="pgOpenerPopup(); return false;">충전하기</button>
-											</div>
-										</td>
-									</tr>
-									<tr>
-										<td colspan="2">
-											<div class="area_text">
-												<%--<p><span class="c_222222">- 신용카드 결제가 어려우신 고객께서는 문자온 고객센터(010-8432-9333)를 통해서도 ARS 신용카드 결제를 하실 수 있습니다.</span></p>--%>
-                                                <p>- 인터넷 익스플로러 이용 고객께서는 도구-팝업 차단 해제 후 충전이 가능합니다.</p>
-												<p>- 결제사별 정책상 충전금액 제한이 있을 수 있습니다.</p>												
-											</div>
-										</td>
-									</tr>
-								</tbody>
-							</table>
-						</div>
-						<!-- //간편결제 -->
-						
 						<!-- 신용카드 -->
-						<div class="area_tabcont" id="tab2_1">
+						<div class="area_tabcont on" id="tab2_1">
 							<p class="tType1_title"><img src="/publish/images/content/icon_charging1_small.png" alt=""> 신용카드</p>
 							<table class="tType1">
 								<caption></caption>
@@ -1024,6 +977,8 @@ function TabTypePay(obj, tabId) {
 												<p>- <span>첫결제 이벤트는 최대 50만원까지만 적용이 됩니다.</span></p>
 												<p>- 전용계좌는 개설일로부터 <span>3개월 미사용 시 자동 해지</span>됩니다.</p>
 												<p>- 전용계좌에 <span>5,000원 이상 입금</span> 시, 연중무휴 <span>실시간 자동 충전이</span> 가능합니다.</p>
+												<p>- 이체 후 충전 확인까지 <span>최대 10분이 소요</span>됩니다.</p>
+												<p>- 이체금액에서 <span>부가세 10%가 제외되고 충전</span>됩니다.</p>												
 												<!-- <p>- 예금주 : 문자온</p> -->
 												<p>- 계좌번호 문자로 받기(일/3회까지) 
                                                     <label for="" class="label">전화번호 입력</label>
@@ -1038,65 +993,8 @@ function TabTypePay(obj, tabId) {
 						</div>
 						<!-- //전용계좌 -->
 
-						<!-- 휴대폰 -->
-						<%-- <div class="area_tabcont" id="tab2_4">
-							<p class="tType1_title"><img src="/publish/images/content/icon_charging4_small.png" alt=""> 휴대폰결제</p>
-							<table class="tType1">
-								<caption></caption>
-								<colgroup>
-									<col style="width: 100px;">
-									<col style="width: auto;">
-								</colgroup>
-								<tbody>
-									<tr class="charge_content">
-										<th scope="row">충전금액</th>
-										<td class="flex">
-											<select name="tempPrice" id="tempPrice" class="list_seType1">
-												<option value="5000">5,000</option>
-												<option value="10000">10,000</option>
-												<option value="20000">20,000</option>
-												<option value="30000">30,000</option>
-												<option value="50000" selected>50,000</option>
-												<option value="100000">100,000</option>
-												<option value="150000">150,000</option>
-											</select>
-											<p class="input_in">원</p>
-											<!-- <span class="reqTxt6">※ 최소 3천원 이상부터 결제 가능합니다.</span> -->
-										</td>
-									</tr>
-									<tr>
-										<td colspan="2">
-											<div class="amount_wrap">
-												<dl>
-													<dt>최종 결제금액 :</dt>
-													<dd>
-														<ul>
-															<li><strong id="supplyPriceStr"></strong>원(공급가액)</li>
-															<li><span class="plus"></span><strong id="vatPriceStr"></strong>원(부가세)</li>
-															<li class="total"><span class="equal"></span><strong id="lastPriceStr"></strong>원(최종금액)</li>
-														</ul>
-													</dd>
-												</dl>
-												<button type="button" class="btnType" onclick="pgOpenerPopup(); return false;">충전하기</button>
-											</div>
-										</td>
-									</tr>
-									<tr>
-										<td colspan="2">
-											<div class="area_text">
-												<p>- 월 30만원 한도 내에서 충전하실 수 있습니다.</p>
-												<p>- 휴대폰 소액결제 제한에 관한 사항은 가입하신 통신사를 통해 확인하실 수 있습니다.</p>
-												<p>- 인터넷 익스플로러 이용 고객께서는 도구-팝업 차단 해제 후 충전이 가능합니다.</p>
-											</div>
-										</td>
-									</tr>
-								</tbody>
-							</table>
-						</div> --%>
-						<!-- //휴대폰 -->
-
 						<!-- 즉시이체 -->
-						<div class="area_tabcont" id="tab2_5">
+						<div class="area_tabcont" id="tab2_4">
 							<p class="tType1_title"><img src="/publish/images/content/icon_charging5_small.png" alt=""> 즉시이체</p>
 							<table class="tType1">
 								<caption></caption>
@@ -1152,6 +1050,272 @@ function TabTypePay(obj, tabId) {
 							</table>
 						</div>
 						<!-- //즉시이체 -->
+						
+						<!-- 네이버페이 -->
+						<div class="area_tabcont" id="tab2_6">
+							<p class="tType1_title"><img src="/publish/images/simple_small.png" alt="간편결제"> 네이버페이</p>
+							<table class="tType1">
+								<colgroup>
+									<col style="width: 100px;">
+									<col style="width: auto;">
+								</colgroup>
+								<tbody>
+									<tr class="charge_content">
+										<th scope="row">충전금액</th>
+										<td class="flex">
+											<select name="tempPrice" id="tempPrice" class="list_seType1">
+												<option value="5000">5,000</option>
+												<option value="10000">10,000</option>
+												<option value="20000">20,000</option>
+												<option value="30000">30,000</option>
+												<option value="50000" selected="">50,000</option>
+												<option value="100000">100,000</option>
+												<option value="200000">200,000</option>
+												<option value="300000">300,000</option>
+												<option value="500000">500,000</option>
+												<option value="700000">700,000</option>
+												<option value="900000">900,000</option>
+												<option value="1000000">1,000,000</option>
+												<option value="1200000">1,200,000</option>
+												<option value="1500000">1,500,000</option>
+												<option value="2000000">2,000,000</option>
+												<option value="2500000">2,500,000</option>
+												<option value="3000000">3,000,000</option>
+											</select>
+
+											<p class="input_in">원</p>
+											<!-- <span class="reqTxt6">※ 최소 3천원 이상부터 결제 가능합니다.</span> -->
+										</td>
+									</tr>
+									<tr>
+										<td colspan="2">
+											<div class="amount_wrap">
+												<dl>
+													<dt>최종 결제금액 :</dt>
+													<dd>
+														<ul>
+															<li><strong id="supplyPriceStr"></strong>원(공급가액)</li>
+															<li><span class="plus"></span><strong id="vatPriceStr"></strong>원(부가세)</li>
+															<li class="total"><span class="equal"></span><strong id="lastPriceStr"></strong>원(최종금액)</li>
+														</ul>
+													</dd>
+												</dl>
+												<button type="button" class="btnType" onclick="pgOpenerPopup(); return false;">충전하기</button>
+											</div>
+										</td>
+									</tr>
+									<tr>
+										<td colspan="2">
+											<div class="area_text">
+												<p>- 인터넷 익스플로러 이용 고객께서는 도구-팝업 차단 해제 후 충전이 가능합니다.</p>
+												<p>- 결제사별 정책상 충전금액 제한이 있을 수 있습니다.</p>
+												<p>- 간편결제 시 세금계산서 및 간이영수증은 제공되지 않습니다.</p>
+												<p>- 네이버페이 카드 결제 영수증은 네이버페이를 통해서 발급받으실 수 있습니다.</p>
+												<p>- 네이버페이 포인트 사용에 따른 현금영수증 발행은 문자온 캐시 결제과정에서 결제자가 직접 선택하여야만 요청할 수 있습니다.(결제 완료 이후 문자온에서 현금영수증 처리 불가)</p>
+											</div>
+										</td>
+									</tr>
+								</tbody>
+							</table>
+						</div>
+						<!-- //네이버페이 -->
+
+						<!-- 카카오페이 -->
+						<div class="area_tabcont current" id="tab2_7">
+							<!-- 신규계좌발급 시 -->
+							<p class="tType1_title"><img src="/publish/images/simple_small.png" alt="간편결제"> 카카오페이</p>
+							<table class="tType1">
+								<colgroup>
+									<col style="width: 100px;">
+									<col style="width: auto;">
+								</colgroup>
+								<tbody>
+									<tr class="charge_content">
+										<th scope="row">충전금액</th>
+										<td class="flex">
+											<select name="tempPrice" id="tempPrice" class="list_seType1">
+												<option value="5000">5,000</option>
+												<option value="10000">10,000</option>
+												<option value="20000">20,000</option>
+												<option value="30000">30,000</option>
+												<option value="50000" selected="">50,000</option>
+												<option value="100000">100,000</option>
+												<option value="200000">200,000</option>
+												<option value="300000">300,000</option>
+												<option value="500000">500,000</option>
+												<option value="700000">700,000</option>
+												<option value="900000">900,000</option>
+												<option value="1000000">1,000,000</option>
+												<option value="1200000">1,200,000</option>
+												<option value="1500000">1,500,000</option>
+												<option value="2000000">2,000,000</option>
+												<option value="2500000">2,500,000</option>
+												<option value="3000000">3,000,000</option>
+											</select>
+
+											<p class="input_in">원</p>
+											<!-- <span class="reqTxt6">※ 최소 3천원 이상부터 결제 가능합니다.</span> -->
+										</td>
+									</tr>
+									<tr>
+										<td colspan="2">
+											<div class="amount_wrap">
+												<dl>
+													<dt>최종 결제금액 :</dt>
+													<dd>
+														<ul>
+															<li><strong id="supplyPriceStr"></strong>원(공급가액)</li>
+															<li><span class="plus"></span><strong id="vatPriceStr"></strong>원(부가세)</li>
+															<li class="total"><span class="equal"></span><strong id="lastPriceStr"></strong>원(최종금액)</li>
+														</ul>
+													</dd>
+												</dl>
+												<button type="button" class="btnType" onclick="pgOpenerPopup(); return false;">충전하기</button>
+											</div>
+										</td>
+									</tr>
+									<tr>
+										<td colspan="2">
+											<div class="area_text">
+												<p>- 인터넷 익스플로러 이용 고객께서는 도구-팝업 차단 해제 후 충전이 가능합니다.</p>
+												<p>- 결제사별 정책상 충전금액 제한이 있을 수 있습니다.</p>
+												<p>- 간편결제 시 세금계산서 및 간이영수증은 제공되지 않습니다.</p>
+												<p>- 카카오페이 결제에 따른 카드영수증 및 현금영수증은 카카오페이 앱을 통해서만 확인 가능합니다.</p>
+											</div>
+										</td>
+									</tr>
+								</tbody>
+							</table>
+						</div>
+						<!-- //카카오페이 -->
+
+						<!-- 토스페이 -->
+						<div class="area_tabcont current" id="tab2_8">
+							<p class="tType1_title"><img src="/publish/images/simple_small.png" alt="간편결제"> 토스페이</p>
+							<table class="tType1">
+								<caption></caption>
+								<colgroup>
+									<col style="width: 100px;">
+									<col style="width: auto;">
+								</colgroup>
+								<tbody>
+									<tr class="charge_content">
+										<th scope="row">충전금액</th>
+										<td class="flex">
+											<select name="tempPrice" id="tempPrice" class="list_seType1">
+												<option value="5000">5,000</option>
+												<option value="10000">10,000</option>
+												<option value="20000">20,000</option>
+												<option value="30000">30,000</option>
+												<option value="50000" selected="">50,000</option>
+												<option value="100000">100,000</option>
+												<option value="150000">150,000</option>
+											</select>
+
+											<p class="input_in">원</p>
+											<!-- <span class="reqTxt6">※ 최소 3천원 이상부터 결제 가능합니다.</span> -->
+										</td>
+									</tr>
+									<tr>
+										<td colspan="2">
+											<div class="amount_wrap">
+												<dl>
+													<dt>최종 결제금액 :</dt>
+													<dd>
+														<ul>
+															<li><strong id="supplyPriceStr"></strong>원(공급가액)</li>
+															<li><span class="plus"></span><strong id="vatPriceStr"></strong>원(부가세)</li>
+															<li class="total"><span class="equal"></span><strong id="lastPriceStr"></strong>원(최종금액)</li>
+														</ul>
+													</dd>
+												</dl>
+												<button type="button" class="btnType" onclick="pgOpenerPopup(); return false;">충전하기</button>
+											</div>
+										</td>
+									</tr>
+									<tr>
+										<td colspan="2">
+											<div class="area_text">
+												<p>- 인터넷 익스플로러 이용 고객께서는 도구-팝업 차단 해제 후 충전이 가능합니다.</p>
+												<p>- 결제사별 정책상 충전금액 제한이 있을 수 있습니다.</p>
+												<p>- 간편결제 시 세금계산서 및 간이영수증은 제공되지 않습니다.</p>
+												<p>- 토스페이 결제에 따른 카드영수증 및 현금영수증은 토스페이 앱을 통해서만 확인 가능합니다.</p>
+											</div>
+										</td>
+									</tr>
+								</tbody>
+							</table>
+						</div>
+						<!-- //토스페이 -->
+
+						<!-- 페이코 -->
+						<div class="area_tabcont current" id="tab2_9">
+							<p class="tType1_title"><img src="/publish/images/simple_small.png" alt="간편결제"> PAYCO</p>
+							<table class="tType1">
+								<caption></caption>
+								<colgroup>
+									<col style="width: 100px;">
+									<col style="width: auto;">
+								</colgroup>
+								<tbody>
+									<tr class="charge_content">
+										<th scope="row">충전금액</th>
+										<td class="flex">
+											<select name="tempPrice" id="tempPrice" class="list_seType1">
+												<option value="5000">5,000</option>
+												<option value="10000">10,000</option>
+												<option value="20000">20,000</option>
+												<option value="30000">30,000</option>
+												<option value="50000" selected="">50,000</option>
+												<option value="100000">100,000</option>
+												<option value="200000">200,000</option>
+												<option value="300000">300,000</option>
+												<option value="500000">500,000</option>
+												<option value="700000">700,000</option>
+												<option value="900000">900,000</option>
+												<option value="1000000">1,000,000</option>
+												<option value="1200000">1,200,000</option>
+												<option value="1500000">1,500,000</option>
+												<option value="2000000">2,000,000</option>
+												<option value="2500000">2,500,000</option>
+												<option value="3000000">3,000,000</option>
+											</select>
+
+											<p class="input_in">원</p>
+											<!-- <span class="reqTxt6">※ 최소 3천원 이상부터 결제 가능합니다.</span> -->
+										</td>
+									</tr>
+									<tr>
+										<td colspan="2">
+											<div class="amount_wrap">
+												<dl>
+													<dt>최종 결제금액 :</dt>
+													<dd>
+														<ul>
+															<li><strong id="supplyPriceStr"></strong>원(공급가액)</li>
+															<li><span class="plus"></span><strong id="vatPriceStr"></strong>원(부가세)</li>
+															<li class="total"><span class="equal"></span><strong id="lastPriceStr"></strong>원(최종금액)</li>
+														</ul>
+													</dd>
+												</dl>
+												<button type="button" class="btnType" onclick="pgOpenerPopup(); return false;">충전하기</button>
+											</div>
+										</td>
+									</tr>
+									<tr>
+										<td colspan="2">
+											<div class="area_text">
+												<p>- 인터넷 익스플로러 이용 고객께서는 도구-팝업 차단 해제 후 충전이 가능합니다.</p>
+												<p>- 결제사별 정책상 충전금액 제한이 있을 수 있습니다.</p>
+												<p>- 페이코(PAYCO) 결제 영수증은 페이코를 통해 발급받으실 수 있습니다.</p>
+											</div>
+										</td>
+									</tr>
+								</tbody>
+							</table>
+						</div>
+						<!-- //페이코 -->						
+						
 					</div>
 				</div><!-- 결제관리 - 결제하기 -->
             </div><!--// send top -->

src/main/webapp/WEB-INF/jsp/web/kakao/template/at/sample/KakaoAlimtalkSampleTemplateList.jsp

@@ -97,7 +97,7 @@ function fnTemplateDetail(templateId){
             
             <form id="listForm" name="listForm" method="post">
             	<input type="hidden" id="pageIndex" name="pageIndex" value="1"/>
-            	<input type="hidden" id="templateAdminCategoryId" name="templateAdminCategoryId" value=""/>
+            	<input type="hidden" id="templateAdminCategoryId" name="templateAdminCategoryId" value="${searchVO.templateAdminCategoryId}"/>
             	<input type="hidden" id="sampleTemplateId" name="sampleTemplateId" value=""/>
             
 	            <div class="tab_content template_sample_content_wrap current" id="tab_content_2">

src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp

@@ -1,6 +1,8 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<spring:eval expression="@property['Globals.Env']" var="Env"/>
 <head>
 
 <link rel="stylesheet" href="/publish/css/main.css">
@@ -15,8 +17,10 @@ var blineCode = "${blineCode}";
 
 $(document).ready(function() {
 	// http => https 로 이동
-	httpsRedirect();
-     
+	if(${Env eq 'prod'}){
+		httpsRedirect();
+	}
+	
 	// 슬라이드 이미지 변경
 	//setMainSlideImgChange();
 	
@@ -1172,13 +1176,13 @@ function fn_click_banner_add_stat(bannerMenuCode){
 				<div class="slideImg"><img src="/publish/images/main/f_visual_06_20230712.jpg" alt="문자온, 카카오 '알림톡' 서비스 오픈! 문자온 알림톡, 대한민국 최저가 선언! 조건없이 무조건 6.9원! 카카오톡 채널아이디 추가를 하지 않은 이용자에게도 카카오톡 메시지 발송이 가능한 서비스! 알림톡 바로가기 알림톡 도착 kakao 문자온에서 알림톡이 도착하였습니다! 기업전용/1,000자 이하 텍스트 & 이미지/문자 대비 65% 저렴" usemap="#allimtalk-map"></div>
 			</div>
 			<div class="swiper-slide">
-				<div class="slideImg"><img src="/publish/images/main/f_visual_01_20230717.jpg" alt="문자는 이제, 문자온! 단 한번, 국내 최저가! 인생 최저가! 첫결제 단문 7.5원 장문 32원 그림 59원 이열치열 복날 떠나요 여름여행" usemap="#image-map" /></div>
+				<div class="slideImg"><img src="/publish/images/main/f_visual_01_20230731.jpg" alt="문자는 이제, 문자온! 단 한번, 국내 최저가! 인생 최저가! 첫결제 단문 7.5원 장문 32원 그림 59원 가을이 오는 소리를 들어보세요, 입추 - 더운 여름 입추라니 믿기지가 않지만, 오늘부터 더위가 꺽이길 바라는 마음이 간절해지는 날입니다." usemap="#image-map" /></div>
 			</div>			
 			<div class="swiper-slide">
 				<div class="slideImg"><img src="/publish/images/main/f_visual_02_20221116.jpg" alt="문자도 보내고! 현금도 챙기는! 문자온만의 특별한 혜택! 결제금액의 2% 포인트 추가 적립! 포인트 1만점 이상 적립 시 현금페이백" /></div>
 			</div>
 			<div class="swiper-slide">
-				<div class="slideImg"><img src="/publish/images/main/f_visual_03_20230717.jpg" alt="다른 사이트에는 없다! 오직 문자온에만 있다! 최고의 디자이너가 직접 제작하는 그림문자 맞춤제작을 통해 나만의 문자를 디자인 해보세요 summer 여름 휴가 배송 안내 본사 여름 휴가로 인하여 배송 및 고객센터 업무가 진행되지 않는 점 양해 부탁 드립니다. 휴가가 끝나면 정상 영업합니다. 2022.08.03 ~ 08.07 SUN MON TUE WED THU FRI SAT 24 25 26 27 28 29 30 주문마감(울릉도, 제주도, 도서산간지역) 31 1 2 오후 5시 주문마감 3 4 5 6 7 ON몰 여름휴가 8 배송시작 9 10 11 12 13 복날이닭 할인받자! 3천원 할인! ￦12,900 8.11(목)~12(금) 단 2일! 마지막 복날 마지막 찬스 할인받고 복날 치킨 즐기세요! DCCHANCE 해수욕장 숙박권 할인 이벤트 Summer 썸머축제 이벤트 안내 미리 예매만 해도 숙박권 70% 할인 !! 엠제이여행사에서 해수욕장 숙박권를 예매하신 고객분들에게 최고급 호텔숙박권을 무료로 드립니다 70% 할인" /></div>
+				<div class="slideImg"><img src="/publish/images/main/f_visual_03_20230731.jpg" alt="다른 사이트에는 없다! 오직 문자온에만 있다! 최고의 디자이너가 직접 제작하는 그림문자 맞춤제작을 통해 나만의 문자를 디자인 해보세요. 입추맞이 궁궐산책 입추맞이 궁궐 야간 관람 08.05~가을이 끝나기전. 입추맞이 우리가족 여름가을여행 COUPON 15%할인 10가족 추첨, COUPON 30%할인 10가족 추첨, 이벤트기간 : 9.1~9.30. AUTUMN EVENT 가을  정기 세일 50%OFF 이벤트 기간:9.1~9.30" /></div>
 			</div>
 			<div class="swiper-slide">
 				<div class="slideImg"><img src="/publish/images/main/f_visual_04_20221116.jpg" alt="문자는 이제, 문자온! 선택은 역시 문자온! 문자사이트 선택의 5가지 기준 1. 가격, 속도, 성능, 기능, 보안이 보장되는가? 2. 결제, 정산, 계산서 발행 등 업무가 자동화 되어 있고 편리한가? 3. 최신 IT 기술과 트렌드가 반영되어 있는가? 4. 회원가입 및 발신번호 인증이 쉽고 빠르며, 대량문자를 전송하기에 사용이 편리한가? 5. 매일 문자샘플이 업데이트 되고, CS 및 기술응대가 실시간적으로 이루어지는가?" /></div>

src/main/webapp/WEB-INF/jsp/web/msgcampain/excel/MsgExcelDataView.jsp

@@ -32,6 +32,13 @@ $(document).ready(function(){
 	//그림문자 샘플 탭 활성화 시키기
 	TabType2($('.tabType2 li').eq(1), '2');
 	
+	$(".tDep2_cateCode a").each(function(index, item){
+		
+		if($(this).text() == "선거"){
+			$('.tDep2_cateCode').find('.on').removeClass('on');
+			$(this).addClass('on');
+		}
+	})
 	// 맞춤제작 요청 JSPark => 2023.02.21 추가
 	//맞춤제작 등록 Popup 
 	//customPopup();	
@@ -83,11 +90,11 @@ function fnLetterListAjax(index){
 		if(document.letterForm.searchKeyword.value == ''){
 			$('.bottom_content .area_total_count').hide();
 		}
-		if(form.hashTag.value != ''){
+		/* if(form.hashTag.value != ''){
 			if($('#letterLoad .nodata_box').length > 0){
 				$('#letterLoad .nodata_box').hide().next('.nodata_box.hashTag').show();
 			}
-		}
+		} */
 	});
 	
 }
@@ -117,7 +124,7 @@ function fnPhotoListAjax(index){
 	form.pageIndex.value = index;
 	var sendData = $(document.letterForm).serializeArray();
 	//하위 카테고리
-	$("#tDep2_depThrCateCode").load("/web/mjon/msgdata/selectCateConfThrDptListAjax.do", sendData ,function(response, status, xhr){
+	$("#tDep2_depThrCateCode").load("/web/mjon/msgcampain/selectCateConfThrDptListAjax.do", sendData ,function(response, status, xhr){
 		if(document.letterForm.searchKeyword.value == ''){
 			$('.bottom_content .area_total_count').hide();
 		}

src/main/webapp/WEB-INF/jsp/web/pay/PayView.jsp

@@ -471,11 +471,10 @@ function TabTypePay(obj, tabId) {
 							<li class="btn_charge1 btn_tab active"><button type="button" onclick="TabTypePay(this,'1');"><i></i>신용카드</button></li>
 							<li class="btn_charge2 btn_tab"><button type="button" onclick="TabTypePay(this,'2');" id="btnDdedicatedAccount"><i></i>전용계좌</button></li>
 							<!-- <li class="btn_charge2 btn_tab"><button type="button" onclick="TabTypePay(this,'3');"><i></i>무통장입금</button></li> -->
-							<li class="btn_charge4 btn_tab"><button type="button" onclick="TabTypePay(this,'4');"><i></i>휴대폰결제</button></li>
-							<li class="btn_charge5 btn_tab"><button type="button" onclick="TabTypePay(this,'5');"><i></i>즉시이체</button></li>
+							<li class="btn_charge3 btn_tab"><button type="button" onclick="TabTypePay(this,'4');"><i></i>휴대폰결제</button></li>
+							<li class="btn_charge4 btn_tab"><button type="button" onclick="TabTypePay(this,'5');"><i></i>즉시이체</button></li>
 						</ul>
-						<div class="checkbox_wrap"><input type="checkbox" id="agree"><label for="agree">선택한 수단을 다음 충전 시에도
-							이용합니다.</label></div>
+						<div class="checkbox_wrap"><input type="checkbox" id="agree"><label for="agree">선택한 수단을 다음 충전 시에도 이용합니다.</label></div>
 
 						<!-- 신용카드 -->
 						<div class="area_tabcont on" id="tab2_1">
@@ -636,6 +635,8 @@ function TabTypePay(obj, tabId) {
 											<div class="area_text">
 												<p>- 전용계좌는 개설일로부터 <span>3개월 미사용 시 자동 해지</span>됩니다.</p>
 												<p>- 전용계좌에 <span>5,000원 이상 입금</span> 시, 연중무휴 <span>실시간 자동 충전이</span> 가능합니다.</p>
+												<p>- 이체 후 충전 확인까지 <span>최대 10분이 소요</span>됩니다.</p>
+												<p>- 이체금액에서 <span>부가세 10%가 제외되고 충전</span>됩니다.</p>
 												<!-- <p>- 예금주 : 문자온</p> -->
 												<p>- 계좌번호 문자로 받기(일/3회까지) 
                                                     <label for="" class="label">전화번호 입력</label>

src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp

@@ -7,7 +7,7 @@
 <%@ taglib prefix="ec" uri="/WEB-INF/tld/ecnet_tld.tld"%>
 
 <style>
-	.charg_cont .area_tab li{ width: calc((100% - 80px)/5);}
+	/*.charg_cont .area_tab li{ width: calc((100% - 80px)/5);}*/
 </style>
 	
 <!-- KG 모빌리언스 -->
@@ -128,16 +128,16 @@ function pgOpenerPopup(){
 	document.pgForm.action = "/web/member/pay/PayActionAjax.do";
 
 	if ($currentTab == 0) {	
-		payMethod = "SPAY";
-	} else if ($currentTab == 1) {	
 		payMethod = "CARD";
-	} else if ($currentTab == 2) {	
+	} else if ($currentTab == 1) {	
 		payMethod = "VBANK";		
-	} else if ($currentTab==3) {	
+	} else if ($currentTab==2) {	
 		payMethod = "CELLPHONE";		
-	} else if ($currentTab==4) {	
+	} else if ($currentTab==3) {	
 		payMethod = "BANK";		
-	}
+	} else {	
+		payMethod = "SPAY";
+	}		
 	$('input[name=payMethod]').val(payMethod);
 	
 	//결제수단 상태 체크
@@ -162,29 +162,40 @@ function pgOpenerPopup(){
 	var popupY = scY + (docHeight - 195) / 2;
 
 	// 결제창 호출
-	if ($currentTab == 0) {
-		// KG 모빌리언스 => SPAY(간편결제)
-		kgmPayCardRequest();		
-	} else if ($currentTab == 1) {	
+	if ($currentTab == 0) {	
 		// 나이스페이 => CARD(카드결제)
 		pg_opener = window.open('', 'pg_opener', "width=790, height=505, left="+popupX+", top="+popupY, "location = no","status= no","toolbars= no");		
 	
 		document.pgForm.method = "post";
 		document.pgForm.target = "pg_opener" ;
 		document.pgForm.submit();
-	} else if ($currentTab == 2) {
+	} else if ($currentTab == 1) {
 		// 전용계좌
-	} else if ($currentTab == 3) {
+	} else if ($currentTab == 2) {
 		// KG 모빌리언스 => MOBILE(휴대폰결제)
 		kgmPayMobileRequest();		
-	} else if ($currentTab==4) {
+	} else if ($currentTab==3) {
 		// KG 모빌리언스 => BANK(즉시이체)
 		kgmPayBankRequest();		
-	}		
+	} else {
+		var cnDirect = "";
+		if ($currentTab == 4) {
+			cnDirect = "NAV:00:N";	// 네이버페이
+		} else if ($currentTab==5) {
+			cnDirect = "KKO:00:N";	// 카카오페이
+		} else if ($currentTab==6) {
+			cnDirect = "TOS:00:N";	// 토스페이
+		} else if ($currentTab==7) {
+			cnDirect = "PYC:00:N";	// 페이코
+		}	
+		
+		// KG 모빌리언스 => SPAY(간편결제)
+		kgmPayCardRequest(cnDirect);		
+	} 	
 }
 
 //KG 모빌리언스 => CARD
-function kgmPayCardRequest() {
+function kgmPayCardRequest(cnDirect) {
 	$.ajax({
         type: "POST",
         url: "/web/member/pay/kgmCardEncodeAjax.do",
@@ -221,7 +232,7 @@ function kgmPayCardRequest() {
 				form.Termregno.value = data.Termregno;
 				form.APP_SCHEME.value = data.APP_SCHEME;
 				form.CN_FIXCARDCD.value = data.CN_FIXCARDCD;
-				form.CN_DIRECT.value = data.CN_DIRECT;
+				form.CN_DIRECT.value = cnDirect;
 				form.CN_INSTALL.value = data.CN_INSTALL;
 				form.Deposit.value = data.Deposit;
 				
@@ -701,92 +712,20 @@ function getMberGrdChk() {
 					<div>
 						<p class="tab_tit">충전수단 선택</p>
 						<ul class="area_tab">
-							<li class="btn_charge_simple btn_tab active"><button type="button" onclick="TabTypePay(this,'0');"><i></i>간편결제</button></li>
-							<li class="btn_charge1 btn_tab"><button type="button" onclick="TabTypePay(this,'1');"><i></i>신용카드</button></li>
+							<li class="btn_charge1 btn_tab active"><button type="button" onclick="TabTypePay(this,'1');"><i></i>신용카드</button></li>
 							<li class="btn_charge2 btn_tab"><button type="button" onclick="TabTypePay(this,'2');" id="btnDdedicatedAccount"><i></i>전용계좌</button></li>
-							<!-- <li class="btn_charge2 btn_tab"><button type="button" onclick="TabTypePay(this,'3');"><i></i>무통장입금</button></li> -->
-							<li class="btn_charge4 btn_tab"><button type="button" onclick="TabTypePay(this,'4');"><i></i>휴대폰결제</button></li>
-							<li class="btn_charge5 btn_tab"><button type="button" onclick="TabTypePay(this,'5');"><i></i>즉시이체</button></li>
+							<li class="btn_charge3 btn_tab"><button type="button" onclick="TabTypePay(this,'3');"><i></i>휴대폰결제</button></li>
+							<li class="btn_charge4 btn_tab"><button type="button" onclick="TabTypePay(this,'4');"><i></i>즉시이체</button></li>
+							
+							<li class="btn_charge5 btn_tab simple_pay"><button type="button" onclick="TabTypePay(this,'6');"><i></i></button></li>
+							<li class="btn_charge6 btn_tab simple_pay"><button type="button" onclick="TabTypePay(this,'7');"><i></i></button></li>
+							<li class="btn_charge7 btn_tab simple_pay"><button type="button" onclick="TabTypePay(this,'8');"><i></i></button></li>
+							<li class="btn_charge8 btn_tab simple_pay"><button type="button" onclick="TabTypePay(this,'9');"><i></i></button></li>							
 						</ul>
-						<div class="checkbox_wrap"><input type="checkbox" id="agree"><label for="agree">선택한 수단을 다음 충전 시에도
-							이용합니다.</label></div>
-
-						<!-- 간편결제 -->
-						<div class="area_tabcont on" id="tab2_0">
-							<p class="tType1_title"><img src="/publish/images/content/icon_charging1_small.png" alt=""> 간편결제</p>
-							<table class="tType1">
-								<caption></caption>
-								<colgroup>
-									<col style="width: 100px;">
-									<col style="width: auto;">
-								</colgroup>
-								<tbody>
-									<tr class="charge_content">
-										<th scope="row">충전금액</th>
-										<td class="flex">
-											<select name="tempPrice" id="tempPrice" class="list_seType1">
-												<option value="5000">5,000</option>
-												<option value="10000">10,000</option>
-												<option value="20000">20,000</option>
-												<option value="30000">30,000</option>
-												<option value="50000" selected>50,000</option>
-												<option value="100000">100,000</option>
-												<option value="200000">200,000</option>
-												<option value="300000">300,000</option>
-												<option value="500000">500,000</option>
-												<option value="700000">700,000</option>
-												<option value="900000">900,000</option>
-												<option value="1000000">1,000,000</option>
-												<option value="1200000">1,200,000</option>
-												<option value="1500000">1,500,000</option>
-												<option value="2000000">2,000,000</option>
-												<option value="2500000">2,500,000</option>
-												<option value="3000000">3,000,000</option>												
-											</select>
-											<%--<input type="text" numberOnly placeholder="금액을 입력해주세요"  name="tempPrice" class="tempPrice" onfocus="this.placeholder=''" onblur="this.placeholder='금액을 입력해주세요'">
-											<p class="input_in">원</p>
-											<button type="button" class="btnType1" onclick="setPrice(this , '3000'); return false;">+ 3천원</button>
-											<button type="button" onclick="setPrice(this , '5000'); return false;">+ 5천원</button>
-											<button type="button" onclick="setPrice(this , '10000'); return false;">+ 1만원</button>
-											<button type="button" onclick="setPrice(this , '100000'); return false;">+ 10만원</button>
-											<button type="button" onclick="setPrice(this , '1000000'); return false;">+ 100만원</button>--%>
-											<p class="input_in">원</p>
-											<!-- <span class="reqTxt6">※ 최소 3천원 이상부터 결제 가능합니다.</span> -->
-										</td>
-									</tr>
-									<tr>
-										<td colspan="2">
-											<div class="amount_wrap">
-												<dl>
-													<dt>최종 결제금액 :</dt>
-													<dd>
-														<ul>
-															<li><strong id="supplyPriceStr"></strong>원(공급가액)</li>
-															<li><span class="plus"></span><strong id="vatPriceStr"></strong>원(부가세)</li>
-															<li class="total"><span class="equal"></span><strong id="lastPriceStr"></strong>원(최종금액)</li>
-														</ul>
-													</dd>
-												</dl>
-												<button type="button" class="btnType" onclick="pgOpenerPopup(); return false;">충전하기</button>
-											</div>
-										</td>
-									</tr>
-									<tr>
-										<td colspan="2">
-											<div class="area_text">
-												<%--<p><span class="c_222222">- 신용카드 결제가 어려우신 고객께서는 문자온 고객센터(010-8432-9333)를 통해서도 ARS 신용카드 결제를 하실 수 있습니다.</span></p>--%>
-                                                <p>- 인터넷 익스플로러 이용 고객께서는 도구-팝업 차단 해제 후 충전이 가능합니다.</p>
-						                        <p>- 결제사별 정책상 충전금액 제한이 있을 수 있습니다.</p>												
-											</div>
-										</td>
-									</tr>
-								</tbody>
-							</table>
-						</div>
-						<!-- //간편결제 -->
+						<div class="checkbox_wrap"><input type="checkbox" id="agree"><label for="agree">선택한 수단을 다음 충전 시에도 이용합니다.</label></div>
 
 						<!-- 신용카드 -->
-						<div class="area_tabcont" id="tab2_1">
+						<div class="area_tabcont on" id="tab2_1">
 							<p class="tType1_title"><img src="/publish/images/content/icon_charging1_small.png" alt=""> 신용카드</p>
 							<table class="tType1">
 								<caption></caption>
@@ -944,6 +883,8 @@ function getMberGrdChk() {
 											<div class="area_text">
 												<p>- 전용계좌는 개설일로부터 <span>3개월 미사용 시 자동 해지</span>됩니다.</p>
 												<p>- 전용계좌에 <span>5,000원 이상 입금</span> 시, 연중무휴 <span>실시간 자동 충전이</span> 가능합니다.</p>
+												<p>- 이체 후 충전 확인까지 <span>최대 10분이 소요</span>됩니다.</p>
+												<p>- 이체금액에서 <span>부가세 10%가 제외되고 충전</span>됩니다.</p>												
 												<!-- <p>- 예금주 : 문자온</p> -->
 												<p>- 계좌번호 문자로 받기(일/3회까지) 
                                                     <label for="" class="label">전화번호 입력</label>
@@ -959,7 +900,7 @@ function getMberGrdChk() {
 						<!-- //전용계좌 -->
 
 						<!-- 휴대폰 -->
-						<div class="area_tabcont" id="tab2_4">
+						<div class="area_tabcont" id="tab2_3">
 							<p class="tType1_title"><img src="/publish/images/content/icon_charging4_small.png" alt=""> 휴대폰결제</p>
 							<table class="tType1">
 								<caption></caption>
@@ -1023,7 +964,7 @@ function getMberGrdChk() {
 						<!-- //휴대폰 -->
 
 						<!-- 즉시이체 -->
-						<div class="area_tabcont" id="tab2_5">
+						<div class="area_tabcont" id="tab2_4">
 							<p class="tType1_title"><img src="/publish/images/content/icon_charging5_small.png" alt=""> 즉시이체</p>
 							<table class="tType1">
 								<caption></caption>
@@ -1094,8 +1035,273 @@ function getMberGrdChk() {
 							</table>
 						</div>
 						<!-- //즉시이체 -->
-					</div>
 
+						<!-- 네이버페이 -->
+						<div class="area_tabcont" id="tab2_6">
+							<p class="tType1_title"><img src="/publish/images/simple_small.png" alt="간편결제"> 네이버페이</p>
+							<table class="tType1">
+								<colgroup>
+									<col style="width: 100px;">
+									<col style="width: auto;">
+								</colgroup>
+								<tbody>
+									<tr class="charge_content">
+										<th scope="row">충전금액</th>
+										<td class="flex">
+											<select name="tempPrice" id="tempPrice" class="list_seType1">
+												<option value="5000">5,000</option>
+												<option value="10000">10,000</option>
+												<option value="20000">20,000</option>
+												<option value="30000">30,000</option>
+												<option value="50000" selected="">50,000</option>
+												<option value="100000">100,000</option>
+												<option value="200000">200,000</option>
+												<option value="300000">300,000</option>
+												<option value="500000">500,000</option>
+												<option value="700000">700,000</option>
+												<option value="900000">900,000</option>
+												<option value="1000000">1,000,000</option>
+												<option value="1200000">1,200,000</option>
+												<option value="1500000">1,500,000</option>
+												<option value="2000000">2,000,000</option>
+												<option value="2500000">2,500,000</option>
+												<option value="3000000">3,000,000</option>
+											</select>
+
+											<p class="input_in">원</p>
+											<!-- <span class="reqTxt6">※ 최소 3천원 이상부터 결제 가능합니다.</span> -->
+										</td>
+									</tr>
+									<tr>
+										<td colspan="2">
+											<div class="amount_wrap">
+												<dl>
+													<dt>최종 결제금액 :</dt>
+													<dd>
+														<ul>
+															<li><strong id="supplyPriceStr"></strong>원(공급가액)</li>
+															<li><span class="plus"></span><strong id="vatPriceStr"></strong>원(부가세)</li>
+															<li class="total"><span class="equal"></span><strong id="lastPriceStr"></strong>원(최종금액)</li>
+														</ul>
+													</dd>
+												</dl>
+												<button type="button" class="btnType" onclick="pgOpenerPopup(); return false;">충전하기</button>
+											</div>
+										</td>
+									</tr>
+									<tr>
+										<td colspan="2">
+											<div class="area_text">
+												<p>- 인터넷 익스플로러 이용 고객께서는 도구-팝업 차단 해제 후 충전이 가능합니다.</p>
+												<p>- 결제사별 정책상 충전금액 제한이 있을 수 있습니다.</p>
+												<p>- 간편결제 시 세금계산서 및 간이영수증은 제공되지 않습니다.</p>
+												<p>- 네이버페이 카드 결제 영수증은 네이버페이를 통해서 발급받으실 수 있습니다.</p>
+												<p>- 네이버페이 포인트 사용에 따른 현금영수증 발행은 문자온 캐시 결제과정에서 결제자가 직접 선택하여야만 요청할 수 있습니다.(결제 완료 이후 문자온에서 현금영수증 처리 불가)</p>
+											</div>
+										</td>
+									</tr>
+								</tbody>
+							</table>
+						</div>
+						<!-- //네이버페이 -->
+
+						<!-- 카카오페이 -->
+						<div class="area_tabcont current" id="tab2_7">
+							<!-- 신규계좌발급 시 -->
+							<p class="tType1_title"><img src="/publish/images/simple_small.png" alt="간편결제"> 카카오페이</p>
+							<table class="tType1">
+								<colgroup>
+									<col style="width: 100px;">
+									<col style="width: auto;">
+								</colgroup>
+								<tbody>
+									<tr class="charge_content">
+										<th scope="row">충전금액</th>
+										<td class="flex">
+											<select name="tempPrice" id="tempPrice" class="list_seType1">
+												<option value="5000">5,000</option>
+												<option value="10000">10,000</option>
+												<option value="20000">20,000</option>
+												<option value="30000">30,000</option>
+												<option value="50000" selected="">50,000</option>
+												<option value="100000">100,000</option>
+												<option value="200000">200,000</option>
+												<option value="300000">300,000</option>
+												<option value="500000">500,000</option>
+												<option value="700000">700,000</option>
+												<option value="900000">900,000</option>
+												<option value="1000000">1,000,000</option>
+												<option value="1200000">1,200,000</option>
+												<option value="1500000">1,500,000</option>
+												<option value="2000000">2,000,000</option>
+												<option value="2500000">2,500,000</option>
+												<option value="3000000">3,000,000</option>
+											</select>
+
+											<p class="input_in">원</p>
+											<!-- <span class="reqTxt6">※ 최소 3천원 이상부터 결제 가능합니다.</span> -->
+										</td>
+									</tr>
+									<tr>
+										<td colspan="2">
+											<div class="amount_wrap">
+												<dl>
+													<dt>최종 결제금액 :</dt>
+													<dd>
+														<ul>
+															<li><strong id="supplyPriceStr"></strong>원(공급가액)</li>
+															<li><span class="plus"></span><strong id="vatPriceStr"></strong>원(부가세)</li>
+															<li class="total"><span class="equal"></span><strong id="lastPriceStr"></strong>원(최종금액)</li>
+														</ul>
+													</dd>
+												</dl>
+												<button type="button" class="btnType" onclick="pgOpenerPopup(); return false;">충전하기</button>
+											</div>
+										</td>
+									</tr>
+									<tr>
+										<td colspan="2">
+											<div class="area_text">
+												<p>- 인터넷 익스플로러 이용 고객께서는 도구-팝업 차단 해제 후 충전이 가능합니다.</p>
+												<p>- 결제사별 정책상 충전금액 제한이 있을 수 있습니다.</p>
+												<p>- 간편결제 시 세금계산서 및 간이영수증은 제공되지 않습니다.</p>
+												<p>- 카카오페이 결제에 따른 카드영수증 및 현금영수증은 카카오페이 앱을 통해서만 확인 가능합니다.</p>
+											</div>
+										</td>
+									</tr>
+								</tbody>
+							</table>
+						</div>
+						<!-- //카카오페이 -->
+
+						<!-- 토스페이 -->
+						<div class="area_tabcont current" id="tab2_8">
+							<p class="tType1_title"><img src="/publish/images/simple_small.png" alt="간편결제"> 토스페이</p>
+							<table class="tType1">
+								<caption></caption>
+								<colgroup>
+									<col style="width: 100px;">
+									<col style="width: auto;">
+								</colgroup>
+								<tbody>
+									<tr class="charge_content">
+										<th scope="row">충전금액</th>
+										<td class="flex">
+											<select name="tempPrice" id="tempPrice" class="list_seType1">
+												<option value="5000">5,000</option>
+												<option value="10000">10,000</option>
+												<option value="20000">20,000</option>
+												<option value="30000">30,000</option>
+												<option value="50000" selected="">50,000</option>
+												<option value="100000">100,000</option>
+												<option value="150000">150,000</option>
+											</select>
+
+											<p class="input_in">원</p>
+											<!-- <span class="reqTxt6">※ 최소 3천원 이상부터 결제 가능합니다.</span> -->
+										</td>
+									</tr>
+									<tr>
+										<td colspan="2">
+											<div class="amount_wrap">
+												<dl>
+													<dt>최종 결제금액 :</dt>
+													<dd>
+														<ul>
+															<li><strong id="supplyPriceStr"></strong>원(공급가액)</li>
+															<li><span class="plus"></span><strong id="vatPriceStr"></strong>원(부가세)</li>
+															<li class="total"><span class="equal"></span><strong id="lastPriceStr"></strong>원(최종금액)</li>
+														</ul>
+													</dd>
+												</dl>
+												<button type="button" class="btnType" onclick="pgOpenerPopup(); return false;">충전하기</button>
+											</div>
+										</td>
+									</tr>
+									<tr>
+										<td colspan="2">
+											<div class="area_text">
+												<p>- 인터넷 익스플로러 이용 고객께서는 도구-팝업 차단 해제 후 충전이 가능합니다.</p>
+												<p>- 결제사별 정책상 충전금액 제한이 있을 수 있습니다.</p>
+												<p>- 간편결제 시 세금계산서 및 간이영수증은 제공되지 않습니다.</p>
+												<p>- 토스페이 결제에 따른 카드영수증 및 현금영수증은 토스페이 앱을 통해서만 확인 가능합니다.</p>
+											</div>
+										</td>
+									</tr>
+								</tbody>
+							</table>
+						</div>
+						<!-- //토스페이 -->
+
+						<!-- 페이코 -->
+						<div class="area_tabcont current" id="tab2_9">
+							<p class="tType1_title"><img src="/publish/images/simple_small.png" alt="간편결제"> PAYCO</p>
+							<table class="tType1">
+								<caption></caption>
+								<colgroup>
+									<col style="width: 100px;">
+									<col style="width: auto;">
+								</colgroup>
+								<tbody>
+									<tr class="charge_content">
+										<th scope="row">충전금액</th>
+										<td class="flex">
+											<select name="tempPrice" id="tempPrice" class="list_seType1">
+												<option value="5000">5,000</option>
+												<option value="10000">10,000</option>
+												<option value="20000">20,000</option>
+												<option value="30000">30,000</option>
+												<option value="50000" selected="">50,000</option>
+												<option value="100000">100,000</option>
+												<option value="200000">200,000</option>
+												<option value="300000">300,000</option>
+												<option value="500000">500,000</option>
+												<option value="700000">700,000</option>
+												<option value="900000">900,000</option>
+												<option value="1000000">1,000,000</option>
+												<option value="1200000">1,200,000</option>
+												<option value="1500000">1,500,000</option>
+												<option value="2000000">2,000,000</option>
+												<option value="2500000">2,500,000</option>
+												<option value="3000000">3,000,000</option>
+											</select>
+
+											<p class="input_in">원</p>
+											<!-- <span class="reqTxt6">※ 최소 3천원 이상부터 결제 가능합니다.</span> -->
+										</td>
+									</tr>
+									<tr>
+										<td colspan="2">
+											<div class="amount_wrap">
+												<dl>
+													<dt>최종 결제금액 :</dt>
+													<dd>
+														<ul>
+															<li><strong id="supplyPriceStr"></strong>원(공급가액)</li>
+															<li><span class="plus"></span><strong id="vatPriceStr"></strong>원(부가세)</li>
+															<li class="total"><span class="equal"></span><strong id="lastPriceStr"></strong>원(최종금액)</li>
+														</ul>
+													</dd>
+												</dl>
+												<button type="button" class="btnType" onclick="pgOpenerPopup(); return false;">충전하기</button>
+											</div>
+										</td>
+									</tr>
+									<tr>
+										<td colspan="2">
+											<div class="area_text">
+												<p>- 인터넷 익스플로러 이용 고객께서는 도구-팝업 차단 해제 후 충전이 가능합니다.</p>
+												<p>- 결제사별 정책상 충전금액 제한이 있을 수 있습니다.</p>
+												<p>- 페이코(PAYCO) 결제 영수증은 페이코를 통해 발급받으실 수 있습니다.</p>
+											</div>
+										</td>
+									</tr>
+								</tbody>
+							</table>
+						</div>
+						<!-- //페이코 -->
+						
+					</div>
 
 					<!--누적결제액별 등급 및 단가 추가 시작-->
 					<div class="accrue_price" id="grdShowArea" style="display: none;">

src/main/webapp/publish/css/content.css

@@ -1075,24 +1075,43 @@ button.check_validity:hover  {border: 1px solid #a3a3a3;box-shadow: 0px 0px 5px
 .charg_cont {background-color: #fff;padding: 40px;border-radius: 10px; min-height: 589px; display: none;}
 .charg_cont.current {display: block;}
 .charg_cont .tab_tit{font-size: 24px; font-weight: bold; color: #222; margin-bottom: 20px; margin-top: 40px;}
-.charg_cont .area_tab{display: flex; width: 100%; justify-content: space-between;}
+.charg_cont .area_tab{display: flex; width: 100%; justify-content: space-between; flex-wrap: wrap;}
 /* 간편결제 오픈 시 
 .charg_cont .area_tab li{ width: calc((100% - 80px)/5); border: 1px solid #ddd; border-radius: 5px; position: relative; box-sizing: border-box; text-align: center;} */
 .charg_cont .area_tab li{ width: calc((100% - 80px)/4); border: 1px solid #ddd; border-radius: 5px; position: relative; box-sizing: border-box; text-align: center;}
 .charg_cont .area_tab li button {font-size: 22px; font-weight: 400; width: 100%; height: 100%; padding: 60px 20px 40px 20px;position:relative;z-index:1;}
-.charg_cont .area_tab li.active {border: 3px solid #fbc72b;}
+/* .charg_cont .area_tab li.active {border: 3px solid #fbc72b;} */
+.charg_cont .area_tab li.active::after{position: absolute; content: " "; width: 100%; height: 100%; border: 3px solid #fbc72b; left: -3px; top: -3px; border-radius: 5px;}
 .charg_cont .area_tab li.active::before{background-image: url(/publish/images/content/icon_chargeCheck2.png); background-color: #fbc72b; border: 2px solid #fbc72b;}
 .charg_cont .area_tab li::before{position: absolute; content: " "; width: 31px; height: 31px; border: 3px solid #ccc; right: 15px; top: 15px; border-radius: 100%; background-image: url(/publish/images/content/icon_chargeCheck1.png); background-repeat: no-repeat; background-position: center 58%;}
 .charg_cont .area_tab button i{width: 65px; height: 55px; display: block; margin: 0 auto 15px auto; background-position: center;}
-.charg_cont .area_tab .btn_charge_simple i{background-image: url(/publish/images/simple.png);}
+/*.charg_cont .area_tab .btn_charge_simple i{background-image: url(/publish/images/simple.png);}*/
 .charg_cont .area_tab .btn_charge1 i{background-image: url(/publish/images/content/icon_charging2.png);}
 .charg_cont .area_tab .btn_charge2 i{background-image: url(/publish/images/content/icon_charging3.png);}
-.charg_cont .area_tab .btn_charge4 i{background-image: url(/publish/images/content/icon_charging4.png);}
-.charg_cont .area_tab .btn_charge5 i{background-image: url(/publish/images/content/icon_charging5.png);}
+.charg_cont .area_tab .btn_charge3 i{background-image: url(/publish/images/content/icon_charging4.png);}
+.charg_cont .area_tab .btn_charge4 i{background-image: url(/publish/images/content/icon_charging5.png);}
+
+/*간편결제_오픈시_수정한부분*/
+.charg_cont .area_tab .simple_pay{margin-top: 25px;}
+.charg_cont .area_tab .simple_pay button{padding: 24px 20px 8px 20px;}
+.charg_cont .area_tab .simple_pay button i{width: 150px; height: 33px; display: block; margin: 0 auto 15px auto; background-position: center;}
+.charg_cont .area_tab .btn_charge5 i{background-image: url(/publish/images/never_pay.png);}
+.charg_cont .area_tab .btn_charge6 i{background-image: url(/publish/images/kakao_pay.png);}
+.charg_cont .area_tab .btn_charge7 i{background-image: url(/publish/images/toss_pay.png);}
+.charg_cont .area_tab .btn_charge8 i{background-image: url(/publish/images/payco.png);}
+.charg_cont.serv_content .area_tab .btn_charge4 i{background-image: url(/publish/images/content/icon_charging5.png);}
+.charg_cont.serv_content .area_tab .btn_charge5 i{background-image: url(/publish/images/never_pay.png);}
+.charg_cont.serv_content .area_tab .btn_charge6 i{background-image: url(/publish/images/kakao_pay.png);}
+.charg_cont.serv_content .area_tab .btn_charge7 i{background-image: url(/publish/images/toss_pay.png);}
+.charg_cont.serv_content .area_tab .btn_charge8 i{background-image: url(/publish/images/payco.png);}
 .charg_cont .area_tab+.checkbox_wrap{margin-top: 18px; color: #666; font-weight: 300; font-size: 18px; text-align: right; width: 100%;}
-/* 간편결제 오픈 시  
+
+/* 간편결제_오픈시_이벤트페이지 
 .charg_cont .area_tab.type03 li {width:calc(100%/4 - 15px);} */
 .charg_cont .area_tab.type03 li {width:calc(100%/3 - 15px);}
+/*간편결제_오픈시_이벤트페이지_수정한부분은 이거 하나*/
+.charg_cont .area_tab.type03 li.event_simple{width:calc(100%/4 - 15px);}
+/*//간편결제_오픈시_이벤트페이지_수정한부분은 이거 하나*/
 .charg_cont .checkbox_wrap input[type="checkbox"],
 .charg_cont .checkbox_wrap input[type="radio"]{display: none;}
 .charg_cont .checkbox_wrap input[type="checkbox"]+label,

src/main/webapp/publish/firstpay_event2.html

@@ -165,8 +165,9 @@
                 </ul>
                 <div class="s_menu">
                     <i class="allSearch_info"><span>문자검색</span></i>
-                    <button type="button" title="전체검색" class="allSearch" onclick="searchToggle();"><img
-                            src="/publish/images/search.png" alt="검색영역 열기" class="allMenu"></button>
+                    <button type="button" title="전체검색" class="allSearch" onclick="searchToggle();">
+                    	<img src="/publish/images/search.png" alt="검색영역 열기" class="allMenu">
+                   	</button>
                     <button type="button" title="전체메뉴"><img src="/publish/images/all_menu.png" alt="전체메뉴 열기"></button>
                 </div>
             </div>
@@ -192,8 +193,7 @@
                             <li><a href="#">#좋은하루</a></li>
                         </ul>
                     </div>
-                    <button class="btn_close" onclick="searchToggle();"><img src="/publish/images/btn_searchclose.png"
-                            alt=""></button>
+                    <button class="btn_close" onclick="searchToggle();"><img src="/publish/images/btn_searchclose.png" alt=""></button>
                 </div>
             </div>
             <!--// search popup 영역 -->
@@ -204,11 +204,9 @@
                 <div class="login_left table_cell">
                     <div class="login_put">
                         <label for="id_text" class="label"></label>
-                        <input type="text" placeholder="아이디를 입력해주세요" id="id_text" class="id_text" maxlength="30"
-                            size="18">
+                        <input type="text" placeholder="아이디를 입력해주세요" id="id_text" class="id_text" maxlength="30" size="18">
                         <label for="password_text" class="label"></label>
-                        <input type="password" placeholder="비밀번호를 입력해주세요" id="password_text" class="password_text"
-                            maxlength="30" size="18">
+                        <input type="password" placeholder="비밀번호를 입력해주세요" id="password_text" class="password_text" maxlength="30" size="18">
                         <label for="login_button" class="label"></label>
                         <button type="submit" class="btnType btnType1" class="login_button">로그인</button>
                     </div>
@@ -283,103 +281,23 @@
                                         <div class="serv_content charg_cont">
                                             <div>
                                                 <p class="tab_tit">충전수단 선택</p>
-                                                <ul class="area_tab">
-                                                	<li class="btn_charge_simple btn_tab active">
-                                                    	<button type="button" onclick="TabTypePay(this,'1');"><i></i>간편결제</button>
-                                                    </li>
-                                                    <li class="btn_charge1 btn_tab">
-                                                    	<button type="button" onclick="TabTypePay(this,'2');"><i></i>신용카드</button>
-                                                    </li>
-                                                    <li class="btn_charge2 btn_tab">
-                                                    	<button type="button" onclick="TabTypePay(this,'3');" id="btnDdedicatedAccount"><i></i>전용계좌</button>
-                                                   	</li>
+                                                <ul class="area_tab type03">
+                                                    <li class="btn_charge1 btn_tab active"><button type="button" onclick="TabTypePay(this,'1');" title="선택됨"><i></i>신용카드</button></li>
+                                                    <li class="btn_charge2 btn_tab"><button type="button" onclick="TabTypePay(this,'2');" id="btnDdedicatedAccount" title="선택됨" style="border-left: 0px;"><i></i>전용계좌</button></li>
                                                     <!-- <li class="btn_charge2 btn_tab"><button type="button" onclick="TabTypePay(this,'3');"><i></i>무통장입금</button></li> -->
                                                     <!-- <li class="btn_charge4 btn_tab"><button type="button" onclick="TabTypePay(this,'4');"><i></i>휴대폰결제</button></li> -->
-                                                    <li class="btn_charge5 btn_tab"><button type="button" onclick="TabTypePay(this,'4');"><i></i>즉시이체</button></li>
+                                                    <li class="btn_charge4 btn_tab"><button type="button" onclick="TabTypePay(this,'4');" title="선택됨" style="border-left: 1px solid rgb(229, 229, 229);"><i></i>즉시이체</button></li>
+                                                    <!--이벤트 간편결제-->
+                                                    <li class="btn_charge5 btn_tab simple_pay event_simple"><button onclick="TabType2(this,'6');"><i></i></button></li>
+                                                    <li class="btn_charge6 btn_tab simple_pay event_simple"><button onclick="TabType2(this,'7');"><i></i></button></li>
+                                                    <li class="btn_charge7 btn_tab simple_pay event_simple"><button onclick="TabType2(this,'8');"><i></i></li>
+                                                    <li class="btn_charge8 btn_tab simple_pay event_simple"><button onclick="TabType2(this,'9');"><i></i></button></li>
+                                                    <!--//이벤트 간편결제-->
                                                 </ul>
                                                 <div class="checkbox_wrap"><input type="checkbox" id="agree"><label for="agree">선택한 수단을 다음 충전 시에도 이용합니다.</label></div>
-
-                                                <!-- 간편결제 -->
-                                                <div class="area_tabcont on" id="tab2_1">
-                                                    <p class="tType1_title"><img src="/publish/images/simple_small.png" alt="간편결제"> 간편결제</p>
-                                                    <table class="tType1">
-                                                        <caption></caption>
-                                                        <colgroup>
-                                                            <col style="width: 100px;">
-                                                            <col style="width: auto;">
-                                                        </colgroup>
-                                                        <tbody>
-                                                            <tr class="charge_content">
-                                                                <th scope="row">충전금액</th>
-                                                                <td class="flex">
-                                                                    <select name="tempPrice" id="tempPrice" class="list_seType1">
-                                                                        <option value="5000">5,000</option>
-                                                                        <option value="10000">10,000</option>
-                                                                        <option value="20000">20,000</option>
-                                                                        <option value="30000">30,000</option>
-                                                                        <option value="50000" selected>50,000</option>
-                                                                        <option value="100000">100,000</option>
-                                                                        <option value="200000">200,000</option>
-                                                                        <option value="300000">300,000</option>
-                                                                        <option value="500000">500,000</option>
-                                                                        <option value="700000">700,000</option>
-                                                                        <option value="900000">900,000</option>
-                                                                        <option value="1000000">1,000,000</option>
-                                                                        <option value="1200000">1,200,000</option>
-                                                                        <option value="1500000">1,500,000</option>
-                                                                        <option value="2000000">2,000,000</option>
-                                                                        <option value="2500000">2,500,000</option>
-                                                                        <option value="3000000">3,000,000</option>
-                                                                    </select>
-                                                                    <p class="input_in">원</p>
-                                                                    <!-- <input type="text" numberOnly placeholder="금액을 입력해주세요"  name="tempPrice" class="tempPrice" onfocus="this.placeholder=''" onblur="this.placeholder='금액을 입력해주세요'">
-                                                                    <p class="input_in">원</p>
-                                                                    <button type="button" class="btnType1" onclick="setPrice(this , '3000'); return false;">+ 3천원</button>
-                                                                    <button type="button" onclick="setPrice(this , '5000'); return false;">+ 5천원</button>
-                                                                    <button type="button" onclick="setPrice(this , '10000'); return false;">+ 1만원</button>
-                                                                    <button type="button" onclick="setPrice(this , '100000'); return false;">+ 10만원</button>
-                                                                    <button type="button" onclick="setPrice(this , '1000000'); return false;">+ 100만원</button>--%>
-                                                                    <p class="input_in">원</p> -->
-                                                                    <!-- <span class="reqTxt6">※ 최소 3천원 이상부터 결제 가능합니다.</span> -->
-                                                                </td>
-                                                            </tr>
-                                                            <tr>
-                                                                <td colspan="2">
-                                                                    <div class="amount_wrap">
-                                                                        <dl>
-                                                                            <dt>최종 결제금액 :</dt>
-                                                                            <dd>
-                                                                                <ul>
-                                                                                    <li><strong id="supplyPriceStr">50,000</strong>원(공급가액)
-                                                                                    </li>
-                                                                                    <li><span class="plus"></span><strong id="vatPriceStr">5,000</strong>원(부가세)
-                                                                                    </li>
-                                                                                    <li class="total"><span class="equal"></span><strong id="lastPriceStr">55,000</strong>원(최종금액)
-                                                                                    </li>
-                                                                                </ul>
-                                                                            </dd>
-                                                                        </dl>
-                                                                        <button type="button" class="btnType"
-                                                                            onclick="pgOpenerPopup(); return false;">충전하기</button>
-                                                                    </div>
-                                                                </td>
-                                                            </tr>
-                                                            <tr>
-                                                                <td colspan="2">
-                                                                    <div class="area_text">
-                                                                        <!-- <p><span class="c_222222">- 신용카드 결제가 어려우신 고객께서는 문자온 고객센터(010-8432-9333)를 통해서도 ARS 신용카드 결제를 하실 수 있습니다.</span></p> -->
-                                                                        <p>- 인터넷 익스플로러 이용 고객께서는 도구-팝업 차단 해제 후 충전이 가능합니다.</p>
-												                        <p>- 결제사별 정책상 충전금액 제한이 있을 수 있습니다.</p>
-                                                                    </div>
-                                                                </td>
-                                                            </tr>
-                                                        </tbody>
-                                                    </table>
-                                                </div>
-                                                <!-- //간편결제 -->
-
+                                                
                                                 <!-- 신용카드 -->
-                                                <div class="area_tabcont" id="tab2_2">
+                                                <div class="area_tabcont on" id="tab2_1">
                                                     <p class="tType1_title"><img src="/publish/images/credit_small.png" alt="신용카드"> 신용카드</p>
                                                     <table class="tType1">
                                                         <caption></caption>
@@ -460,7 +378,7 @@
                                                 <!-- //신용카드 -->
 
                                                 <!-- 전용계좌 -->
-                                                <div class="area_tabcont current" id="tab2_3">
+                                                <div class="area_tabcont current" id="tab2_2">
                                                     <!-- 신규계좌발급 시 -->
                                                     <p class="tType1_title"><img src="/publish/images/content/icon_charging1_small.png" alt="계좌 이미"> 전용계좌</p>
                                                     <table class="tType1">
@@ -517,9 +435,7 @@
                                                         <tbody>    
                                                             <tr>
                                                                 <td colspan="2">
-                                                                    <div>
-                                                                        보유한 전용 계좌가 없습니다.
-                                                                    </div>
+                                                                    <div style="font-size: 16px;">보유한 전용 계좌가 없습니다.</div>
                                                                 </td>
                                                             </tr>
 
@@ -698,6 +614,354 @@
                                                     </table>
                                                 </div>
                                                 <!-- //즉시이체 -->
+                                                <!-- 네이바페이 -->
+                                                <div class="area_tabcont" id="tab2_6">
+                                                    <p class="tType1_title"><img src="/publish/images/simple_small.png" alt="간편결제"> 네이버페이</p>
+                                                    <table class="tType1">
+                                                        <colgroup>
+                                                            <col style="width: 100px;">
+                                                            <col style="width: auto;">
+                                                        </colgroup>
+                                                        <tbody>
+                                                            <tr class="charge_content">
+                                                                <th scope="row">충전금액</th>
+                                                                <td class="flex">
+                                                                    <select name="tempPrice" id="tempPrice" class="list_seType1">
+                                                                        <option value="5000">5,000</option>
+                                                                        <option value="10000">10,000</option>
+                                                                        <option value="20000">20,000</option>
+                                                                        <option value="30000">30,000</option>
+                                                                        <option value="50000" selected="">50,000</option>
+                                                                        <option value="100000">100,000</option>
+                                                                        <option value="200000">200,000</option>
+                                                                        <option value="300000">300,000</option>
+                                                                        <option value="500000">500,000</option>
+                                                                        <option value="700000">700,000</option>
+                                                                        <option value="900000">900,000</option>
+                                                                        <option value="1000000">1,000,000</option>
+                                                                        <option value="1200000">1,200,000</option>
+                                                                        <option value="1500000">1,500,000</option>
+                                                                        <option value="2000000">2,000,000</option>
+                                                                        <option value="2500000">2,500,000</option>
+                                                                        <option value="3000000">3,000,000</option>
+                                                                    </select>
+
+                                                                    <p class="input_in">원</p>
+                                                                    <!-- <span class="reqTxt6">※ 최소 3천원 이상부터 결제 가능합니다.</span> -->
+                                                                </td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td colspan="2">
+                                                                    <div class="amount_wrap">
+                                                                        <dl>
+                                                                            <dt>최종 결제금액 :</dt>
+                                                                            <dd>
+                                                                                <ul>
+                                                                                    <li><strong id="supplyPriceStr">50,000</strong>원(공급가액)</li>
+                                                                                    <li><span class="plus"></span><strong id="vatPriceStr">5,000</strong>원(부가세)</li>
+                                                                                    <li class="total"><span class="equal"></span><strong id="lastPriceStr">55,000</strong>원(최종금액)</li>
+                                                                                </ul>
+                                                                            </dd>
+                                                                        </dl>
+                                                                        <button type="button" class="btnType" onclick="pgOpenerPopup(); return false;">충전하기</button>
+                                                                    </div>
+                                                                </td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td colspan="2">
+                                                                    <div class="area_text">
+                                                                        <p>- 인터넷 익스플로러 이용 고객께서는 도구-팝업 차단 해제 후 충전이 가능합니다.</p>
+                                                                        <p>- 결제사별 정책상 충전금액 제한이 있을 수 있습니다.</p>
+                                                                        <p>- 간편결제 시 세금계산서 및 간이영수증은 제공되지 않습니다.</p>
+                                                                        <p>- 네이버페이 카드 결제 영수증은 네이버페이를 통해서 발급받으실 수 있습니다.</p>
+                                                                        <p>- 네이버페이 포인트 사용에 따른 현금영수증 발행은 문자온 캐시 결제과정에서 결제자가 직접 선택하여야만 요청할 수 있습니다.(결제 완료 이후 문자온에서 현금영수증 처리 불가)</p>
+                                                                    </div>
+                                                                </td>
+                                                            </tr>
+                                                        </tbody>
+                                                    </table>
+                                                </div>
+                                                <!-- //네이버페이 -->
+
+                                                <!-- 카카오페이 -->
+                                                <div class="area_tabcont current" id="tab2_7">
+                                                    <!-- 신규계좌발급 시 -->
+                                                    <p class="tType1_title"><img src="/publish/images/simple_small.png" alt="간편결제"> 카카오페이</p>
+                                                    <table class="tType1">
+                                                        <colgroup>
+                                                            <col style="width: 100px;">
+                                                            <col style="width: auto;">
+                                                        </colgroup>
+                                                        <tbody>
+                                                            <tr class="charge_content">
+                                                                <th scope="row">충전금액</th>
+                                                                <td class="flex">
+                                                                    <select name="tempPrice" id="tempPrice" class="list_seType1">
+                                                                        <option value="5000">5,000</option>
+                                                                        <option value="10000">10,000</option>
+                                                                        <option value="20000">20,000</option>
+                                                                        <option value="30000">30,000</option>
+                                                                        <option value="50000" selected="">50,000</option>
+                                                                        <option value="100000">100,000</option>
+                                                                        <option value="200000">200,000</option>
+                                                                        <option value="300000">300,000</option>
+                                                                        <option value="500000">500,000</option>
+                                                                        <option value="700000">700,000</option>
+                                                                        <option value="900000">900,000</option>
+                                                                        <option value="1000000">1,000,000</option>
+                                                                        <option value="1200000">1,200,000</option>
+                                                                        <option value="1500000">1,500,000</option>
+                                                                        <option value="2000000">2,000,000</option>
+                                                                        <option value="2500000">2,500,000</option>
+                                                                        <option value="3000000">3,000,000</option>
+                                                                    </select>
+
+                                                                    <p class="input_in">원</p>
+                                                                    <!-- <span class="reqTxt6">※ 최소 3천원 이상부터 결제 가능합니다.</span> -->
+                                                                </td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td colspan="2">
+                                                                    <div class="amount_wrap">
+                                                                        <dl>
+                                                                            <dt>최종 결제금액 :</dt>
+                                                                            <dd>
+                                                                                <ul>
+                                                                                    <li><strong id="supplyPriceStr">50,000</strong>원(공급가액)</li>
+                                                                                    <li><span class="plus"></span><strong id="vatPriceStr">5,000</strong>원(부가세)</li>
+                                                                                    <li class="total"><span class="equal"></span><strong id="lastPriceStr">55,000</strong>원(최종금액)</li>
+                                                                                </ul>
+                                                                            </dd>
+                                                                        </dl>
+                                                                        <button type="button" class="btnType" onclick="pgOpenerPopup(); return false;">충전하기</button>
+                                                                    </div>
+                                                                </td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td colspan="2">
+                                                                    <div class="area_text">
+                                                                        <p>- 인터넷 익스플로러 이용 고객께서는 도구-팝업 차단 해제 후 충전이 가능합니다.</p>
+                                                                        <p>- 결제사별 정책상 충전금액 제한이 있을 수 있습니다.</p>
+                                                                        <p>- 간편결제 시 세금계산서 및 간이영수증은 제공되지 않습니다.</p>
+                                                                        <p>- 카카오페이 결제에 따른 카드영수증 및 현금영수증은 카카오페이 앱을 통해서만 확인 가능합니다.</p>
+                                                                    </div>
+                                                                </td>
+                                                            </tr>
+                                                        </tbody>
+                                                    </table>
+                                                </div>
+                                                <!-- //카카오페이 -->
+
+                                                <!-- 무통장입금 -->
+                                                <!-- <div class="area_tabcont" id="tab2_4">
+                                                    <p class="tType1_title"><img src="/publish/images/content/icon_charging3_small.png" alt=""> 무통장입금</p>
+                                                    <table class="tType1">
+                                                        <caption></caption>
+                                                        <colgroup>
+                                                            <col style="width: 100px;">
+                                                            <col style="width: auto;">
+                                                        </colgroup>
+                                                        <tbody>
+                                                            <tr>
+                                                                <td colspan="2">
+                                                                    <ul class="info_bank">
+                                                                        <li><a href="#"><i></i>
+                                                                                <p>신한은행 <span>389-01-106644</span></p>
+                                                                            </a>
+                                                                        </li>
+                                                                        <li><a href="#"><i></i>
+                                                                                <p>농협은행 <span>7700-7700-28</span></p>
+                                                                            </a>
+                                                                        </li>
+                                                                        <li><a href="#"><i></i>
+                                                                                <p>국민은행 <span>839-25-0027-299</span></p>
+                                                                            </a>
+                                                                        </li>
+                                                                        <li><a href href="#"><i></i>
+                                                                                <p>기업은행 <span>065-048245-04-013</span></p>
+                                                                            </a>
+                                                                        </li>
+                                                                        <li><a href="#"><i></i>
+                                                                                <p>외환(하나)은행 <span>241-22-04685-7</span></p>
+                                                                            </a>
+                                                                        </li>
+                                                                        <li><a href="#"><i></i>
+                                                                                <p>우리은행 <span>119-301098-13-101</span></p>
+                                                                            </a>
+                                                                        </li>
+                                                                    </ul>
+                                                                    <div class="area_text">
+                                                                        <p>※ 입금자명은 반드시 <span>본인의 아이디</span>로 입력하셔야 합니다(동명이인 식별 불가)</p>
+                                                                        <p>※ 반드시 은행명, 입금액, 예금주를 먼저 입력하신 후 송금을 하셔야 하며, <span>송금이 완료된 상태에서 입금알림 버튼</span>을 눌러주셔야 합니다.</p>
+                                                                        <ul class="box_input flex">
+                                                                            <li class="flex">은행명 
+                                                                                <select name="" id="">
+                                                                                    <option value="">국민은행</option>
+                                                                                </select>
+                                                                            </li>
+                                                                            <li class="flex">입금금액 <input type="text" size="15">
+                                                                                <p class="input_in">원</p>
+                                                                            </li>
+                                                                            <li class="flex">예금주 <input type="text" size="15"></li>
+                                                                            <li class="flex">
+                                                                                <input type="checkbox"> 상기 계좌에 입금 알림 <button>입금알림</button>
+                                                                            </li>
+                                                                        </ul>
+                                                                        <p>- 무통장입금 계좌번호 문자로 받기(일 / 최대 3회)
+                                                                            <label for="" class="sel_type2_label">은행명</label>
+                                                                            <select name="" id="" class="sel_type2">
+                                                                                <option value="">은행선택</option>
+                                                                                <option value="">기업은행</option>
+                                                                                <option value="">국민은행</option>
+                                                                                <option value="">외환은행</option>
+                                                                                <option value="">농협</option>
+                                                                                <option value="">우리은행</option>
+                                                                                <option value="">신한은행</option>
+                                                                                <option value="">SC은행</option>
+                                                                                <option value="">부산은행</option>
+                                                                                <option value="">우체국</option>
+                                                                            </select>
+                                                                            <label for="" class="label">전화번호 입력</label>
+                                                                            <input type="text" placeholder="‘-’ 없이 전화번호를 입력해주세요" onfocus="this.placeholder=''"
+                                                                                onblur="this.placeholder='‘-’ 없이 전화번호를 입력해주세요'">
+                                                                            <button>문자받기</button>
+                                                                        </p>
+                                                                    </div>
+                                                                </td>
+                                                            </tr>
+                                                        </tbody>
+                                                    </table>
+                                                    <div style="text-align: center;">
+                                                        <button class="btnType btnType16">충전하기</button>
+                                                    </div>
+                                                </div> -->
+                                                <!-- //무통장입금 -->
+
+                                                <!-- 토스페이 -->
+                                                <div class="area_tabcont current" id="tab2_8">
+                                                    <p class="tType1_title"><img src="/publish/images/simple_small.png" alt="간편결제"> 토스페이</p>
+                                                    <table class="tType1">
+                                                        <caption></caption>
+                                                        <colgroup>
+                                                            <col style="width: 100px;">
+                                                            <col style="width: auto;">
+                                                        </colgroup>
+                                                        <tbody>
+                                                            <tr class="charge_content">
+                                                                <th scope="row">충전금액</th>
+                                                                <td class="flex">
+                                                                    <select name="tempPrice" id="tempPrice" class="list_seType1">
+                                                                        <option value="5000">5,000</option>
+                                                                        <option value="10000">10,000</option>
+                                                                        <option value="20000">20,000</option>
+                                                                        <option value="30000">30,000</option>
+                                                                        <option value="50000" selected="">50,000</option>
+                                                                        <option value="100000">100,000</option>
+                                                                        <option value="150000">150,000</option>
+                                                                    </select>
+
+                                                                    <p class="input_in">원</p>
+                                                                    <!-- <span class="reqTxt6">※ 최소 3천원 이상부터 결제 가능합니다.</span> -->
+                                                                </td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td colspan="2">
+                                                                    <div class="amount_wrap">
+                                                                        <dl>
+                                                                            <dt>최종 결제금액 :</dt>
+                                                                            <dd>
+                                                                                <ul>
+                                                                                    <li><strong id="supplyPriceStr">50,000</strong>원(공급가액)</li>
+                                                                                    <li><span class="plus"></span><strong id="vatPriceStr">5,000</strong>원(부가세)</li>
+                                                                                    <li class="total"><span class="equal"></span><strong id="lastPriceStr">55,000</strong>원(최종금액)</li>
+                                                                                </ul>
+                                                                            </dd>
+                                                                        </dl>
+                                                                        <button type="button" class="btnType" onclick="pgOpenerPopup(); return false;">충전하기</button>
+                                                                    </div>
+                                                                </td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td colspan="2">
+                                                                    <div class="area_text">
+                                                                        <p>- 인터넷 익스플로러 이용 고객께서는 도구-팝업 차단 해제 후 충전이 가능합니다.</p>
+                                                                        <p>- 결제사별 정책상 충전금액 제한이 있을 수 있습니다.</p>
+                                                                        <p>- 간편결제 시 세금계산서 및 간이영수증은 제공되지 않습니다.</p>
+                                                                        <p>- 토스페이 결제에 따른 카드영수증 및 현금영수증은 토스페이 앱을 통해서만 확인 가능합니다.</p>
+                                                                    </div>
+                                                                </td>
+                                                            </tr>
+                                                        </tbody>
+                                                    </table>
+                                                </div>
+                                                <!-- //토스페이 -->
+                                                <!-- 페이코 -->
+                                                <div class="area_tabcont current" id="tab2_9">
+                                                    <p class="tType1_title"><img src="/publish/images/simple_small.png" alt="간편결제"> PAYCO</p>
+                                                    <table class="tType1">
+                                                        <caption></caption>
+                                                        <colgroup>
+                                                            <col style="width: 100px;">
+                                                            <col style="width: auto;">
+                                                        </colgroup>
+                                                        <tbody>
+                                                            <tr class="charge_content">
+                                                                <th scope="row">충전금액</th>
+                                                                <td class="flex">
+                                                                    <select name="tempPrice" id="tempPrice" class="list_seType1">
+                                                                        <option value="5000">5,000</option>
+                                                                        <option value="10000">10,000</option>
+                                                                        <option value="20000">20,000</option>
+                                                                        <option value="30000">30,000</option>
+                                                                        <option value="50000" selected="">50,000</option>
+                                                                        <option value="100000">100,000</option>
+                                                                        <option value="200000">200,000</option>
+                                                                        <option value="300000">300,000</option>
+                                                                        <option value="500000">500,000</option>
+                                                                        <option value="700000">700,000</option>
+                                                                        <option value="900000">900,000</option>
+                                                                        <option value="1000000">1,000,000</option>
+                                                                        <option value="1200000">1,200,000</option>
+                                                                        <option value="1500000">1,500,000</option>
+                                                                        <option value="2000000">2,000,000</option>
+                                                                        <option value="2500000">2,500,000</option>
+                                                                        <option value="3000000">3,000,000</option>
+                                                                    </select>
+
+                                                                    <p class="input_in">원</p>
+                                                                    <!-- <span class="reqTxt6">※ 최소 3천원 이상부터 결제 가능합니다.</span> -->
+                                                                </td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td colspan="2">
+                                                                    <div class="amount_wrap">
+                                                                        <dl>
+                                                                            <dt>최종 결제금액 :</dt>
+                                                                            <dd>
+                                                                                <ul>
+                                                                                    <li><strong id="supplyPriceStr">50,000</strong>원(공급가액)</li>
+                                                                                    <li><span class="plus"></span><strong id="vatPriceStr">5,000</strong>원(부가세)</li>
+                                                                                    <li class="total"><span class="equal"></span><strong id="lastPriceStr">55,000</strong>원(최종금액)</li>
+                                                                                </ul>
+                                                                            </dd>
+                                                                        </dl>
+                                                                        <button type="button" class="btnType" onclick="pgOpenerPopup(); return false;">충전하기</button>
+                                                                    </div>
+                                                                </td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td colspan="2">
+                                                                    <div class="area_text">
+                                                                        <p>- 인터넷 익스플로러 이용 고객께서는 도구-팝업 차단 해제 후 충전이 가능합니다.</p>
+                                                                        <p>- 결제사별 정책상 충전금액 제한이 있을 수 있습니다.</p>
+                                                                        <p>- 페이코(PAYCO) 결제 영수증은 페이코를 통해 발급받으실 수 있습니다.</p>
+                                                                    </div>
+                                                                </td>
+                                                            </tr>
+                                                        </tbody>
+                                                    </table>
+                                                </div>
+                                                <!-- //페이코 -->
                                             </div>
                                         </div>
                                     </div>

src/main/webapp/publish/guide_2022.html

@@ -18,9 +18,18 @@
     <!-- <p>***<span class="font1"> (컨텐츠)</span> : 반복적으로 사용 안함</p>
     <p>***<span class="font2"> (보드)</span> : 반복적으로 사용</p> -->
     <ul class="page">
+        <li><a href="/publish/payment2.html">payment2.html</a>결제하기 > 충전수단 선택 > 간편결제 추가</li>
+        <li><a href="/publish/firstpay_event2.html">firstpay_event2.html</a>이벤트 페이지 > 충전수단 선택 > 간편결제 추가</li>
         <li><a href="/publish/reservedmsg_2023.html">reservedmsg_2023.html</a>예약관리 > 문자탭 > rev_admin 수정, 발송방식 전체 버튼 추가, table > 발송방식 추가</li>
         <li><a href="/publish/textingmsg_2022.html">textingmsg_2022.html</a>발송결과 > 문자탭 > rev_admin 수정, 발송방식 전체 버튼 추가, table > 발송방식 추가</li>
         <li><a href="/publish/publish_adv/send_group_text.html">send_group_text.html</a>텍스트 수정, 메인화면 이동 버튼 추가</li>
+        <li><a href="/publish/api_admin4.html">api_admin4.html</a>API > 신청/관리 (API 사용 승인 후 IP 등록 후) </li>
+        <li><a href="/publish/api_admin3.html">api_admin3.html</a>API > 신청/관리 (API 사용 승인 후 IP 등록 전) </li>
+        <li><a href="/publish/api_admin2.html">api_admin2.html</a>API > 신청/관리 (API 사용 신청 후 심사중의 경우) </li>
+        <li><a href="/publish/api_admin1.html">api_admin1.html</a>API > 신청/관리 (API 사용 미신청의 경우) </li>
+        <li><a href="/publish/api_download.html">api_download.html</a>API > 예제 다운로드</li>
+        <li><a href="/publish/api_guide.html">api_guide.html</a>API > API 사용안내</li>
+        <li><a href="/publish/api_intro.html">api_intro.html</a>API > 문자 API 소개</li>
         <li><a href="/publish/firstpay_event1.html">firstpay_event.html</a>충전수단 선택 내용 삭제</li>
         <li><a href="/publish/firstpay_event2.html">firstpay_event2.html</a>충전수단 선택 내용 수정 </li>
     	<li><a href="/publish/payment2.html">payment2.html</a>결제관리 > 결제하기 > 충전수단 선택 > 간편결제추가 + 등급별금액&누적결제액별 등급 및 단가(테이블 및 텍스트 추가)</li>

src/main/webapp/publish/payment2.html

@@ -23,9 +23,11 @@
 	<script src="/publish/js/calendar.js"></script>
 	<script src="/publish/js/popupLayer.js"></script>
 
+	<!--
 	<style>
-		.charg_cont .area_tab li{ width: calc((100% - 80px)/5);}
+		.charg_cont .area_tab li{ width: calc((100% - 80px)/4);}
 	</style>
+	-->
 	
 </head>
 
@@ -217,23 +219,23 @@
 					<div>
 						<p class="tab_tit">충전수단 선택</p>
 						<ul class="area_tab">
-							<li class="btn_charge_simple btn_tab active"><button onclick="TabType2(this,'1');"><i></i>간편결제</button></li>
-							<li class="btn_charge1 btn_tab"><button onclick="TabType2(this,'2');"><i></i>신용카드</button>
-							</li>
-							<li class="btn_charge2 btn_tab"><button onclick="TabType2(this,'3');"><i></i>전용계좌</button>
-							</li>
+							<li class="btn_charge1 btn_tab active"><button onclick="TabType2(this,'1');"><i></i>신용카드</button></li>
+							<li class="btn_charge2 btn_tab"><button onclick="TabType2(this,'2');"><i></i>전용계좌</button></li>
 							<!-- <li class="btn_charge2 btn_tab"><button onclick="TabType2(this,'3');"><i></i>무통장입금</button></li> -->
-							<li class="btn_charge4 btn_tab"><button onclick="TabType2(this,'4');"><i></i>휴대폰결제</button>
-							</li>
-							<li class="btn_charge5 btn_tab"><button onclick="TabType2(this,'5');"><i></i>즉시이체</button>
-							</li>
+							<li class="btn_charge3 btn_tab"><button onclick="TabType2(this,'3');"><i></i>휴대폰결제</button></li>
+							<li class="btn_charge4 btn_tab"><button onclick="TabType2(this,'4');"><i></i>즉시이체</button></li>
+							
+							<li class="btn_charge5 btn_tab simple_pay"><button onclick="TabType2(this,'6');"><i></i></button></li>
+							<li class="btn_charge6 btn_tab simple_pay"><button onclick="TabType2(this,'7');"><i></i></button></li>
+							<!-- <li class="btn_charge2 btn_tab"><button onclick="TabType2(this,'3');"><i></i>무통장입금</button></li> -->
+							<li class="btn_charge7 btn_tab simple_pay"><button onclick="TabType2(this,'8');"><i></i></li>
+							<li class="btn_charge8 btn_tab simple_pay"><button onclick="TabType2(this,'9');"><i></i></button></li>
 						</ul>
-						<div class="checkbox_wrap"><input type="checkbox" id="agree"><label for="agree"></label> 선택한 수단을
-							다음 충전 시에도
-							이용합니다.</div>
+						<div class="checkbox_wrap"><input type="checkbox" id="agree"><label for="agree"></label> 선택한 수단을 다음 충전 시에도 이용합니다.</div>
 
 						<!-- 간편결제 -->
-						<div class="area_tabcont on" id="tab2_1">
+						<!--
+													<div class="area_tabcont on" id="tab2_1">
 							<p class="tType1_title"><img src="/publish/images/simple_small.png" alt="간편결제 스몰 아이콘">
 							간편결제</p>
 							<table class="tType1">
@@ -266,7 +268,6 @@
 											</select>
 
 											<p class="input_in">원</p>
-											<!-- <span class="reqTxt6">※ 최소 3천원 이상부터 결제 가능합니다.</span> -->
 										</td>
 									</tr>
 									<tr>
@@ -300,11 +301,11 @@
 								</tbody>
 							</table>
 						</div>
+						-->
 
 						<!-- 신용카드 -->
-						<div class="area_tabcont " id="tab2_2">
-							<p class="tType1_title"><img src="/publish/images/credit_small.png" alt="신용카드">
-								신용카드</p>
+						<div class="area_tabcont on " id="tab2_1">
+							<p class="tType1_title"><img src="/publish/images/credit_small.png" alt="신용카드"> 신용카드</p>
 							<table class="tType1">
 								<colgroup>
 									<col style="width: 100px;">
@@ -346,15 +347,12 @@
 													<dd>
 														<ul>
 															<li><strong id="supplyPriceStr">50,000</strong>원(공급가액)</li>
-															<li><span class="plus"></span><strong
-																	id="vatPriceStr">5,000</strong>원(부가세)</li>
-															<li class="total"><span class="equal"></span><strong
-																	id="lastPriceStr">55,000</strong>원(최종금액)</li>
+															<li><span class="plus"></span><strong id="vatPriceStr">5,000</strong>원(부가세)</li>
+															<li class="total"><span class="equal"></span><strong id="lastPriceStr">55,000</strong>원(최종금액)</li>
 														</ul>
 													</dd>
 												</dl>
-												<button type="button" class="btnType"
-													onclick="pgOpenerPopup(); return false;">충전하기</button>
+												<button type="button" class="btnType" onclick="pgOpenerPopup(); return false;">충전하기</button>
 											</div>
 										</td>
 									</tr>
@@ -362,8 +360,7 @@
 										<td colspan="2">
 											<div class="area_text">
 												<p>- 인터넷 익스플로러 이용 고객께서는 도구-팝업 차단 해제 후 충전이 가능합니다.</p>
-												<p>- 카드사별 정책상 충전금액 제한이 있을 수 있습니다. 단, ARS 신용카드 결제는 충전금액 제한 없이 이용하실 수
-													있습니다.</p>
+												<p>- 카드사별 정책상 충전금액 제한이 있을 수 있습니다. 단, ARS 신용카드 결제는 충전금액 제한 없이 이용하실 수 있습니다.</p>
 											</div>
 										</td>
 									</tr>
@@ -373,10 +370,9 @@
 						<!-- //신용카드 -->
 
 						<!-- 전용계좌 -->
-						<div class="area_tabcont current" id="tab2_3">
+						<div class="area_tabcont current" id="tab2_2">
 							<!-- 신규계좌발급 시 -->
-							<p class="tType1_title"><img src="/publish/images/content/icon_charging1_small.png"
-									alt="계좌 이미"> 전용계좌</p>
+							<p class="tType1_title"><img src="/publish/images/content/icon_charging1_small.png" alt="계좌 이미"> 전용계좌</p>
 							<table class="tType1">
 								<caption></caption>
 								<colgroup>
@@ -404,16 +400,14 @@
 												<option value="088">신한은행</option>
 											</select>
 											<p class="input_in" style="margin-right:5px;">원</p>
-											<button type="button"
-												onclick="fnNewBankAccount(); return false;">신규계좌받기</button>
+											<button type="button" onclick="fnNewBankAccount(); return false;">신규계좌받기</button>
 										</td>
 									</tr>
 								</tbody>
 							</table>
 
 							<!-- 기존 계좌있을 시 -->
-							<p class="tType1_title"><img src="/publish/images/content/icon_charging1_small.png"
-									alt="계좌 이미"> 전용계좌</p>
+							<p class="tType1_title"><img src="/publish/images/content/icon_charging1_small.png" alt="계좌 이미"> 전용계좌</p>
 							<table class="tType1">
 								<caption></caption>
 								<colgroup>
@@ -432,17 +426,12 @@
 										<td colspan="2">
 											<div class="area_text">
 												<p>- 전용계좌는 개설일로부터 <span>3개월 미사용 시 자동 해지</span>됩니다.</p>
-												<p>- 전용계좌에 <span>5,000원 이상 입금</span> 시, 연중무휴 <span>실시간 자동 충전이</span>
-													가능합니다.</p>
+												<p>- 전용계좌에 <span>5,000원 이상 입금</span> 시, 연중무휴 <span>실시간 자동 충전이</span> 가능합니다.</p>
 												<!-- <p>- 예금주 : 문자온</p> -->
 												<p>- 계좌번호 문자로 받기(일/3회까지)
 													<label for="" class="label">전화번호 입력</label>
-													<input type="text" id="callTo" name="callTo" maxlength="11"
-														placeholder="‘-’ 없이 받으실 휴대폰 번호를 입력해주세요."
-														onfocus="this.placeholder=''"
-														onblur="this.placeholder='‘-’ 없이 전화번호를 입력해주세요'">
-													<button type="button"
-														onclick="fnSmsSend(); return false;">문자받기</button>
+													<input type="text" id="callTo" name="callTo" maxlength="11" placeholder="‘-’ 없이 받으실 휴대폰 번호를 입력해주세요." onfocus="this.placeholder=''" onblur="this.placeholder='‘-’ 없이 전화번호를 입력해주세요'">
+													<button type="button" onclick="fnSmsSend(); return false;">문자받기</button>
 												</p>
 											</div>
 										</td>
@@ -538,9 +527,8 @@
 						<!-- //무통장입금 -->
 
 						<!-- 휴대폰 -->
-						<div class="area_tabcont current" id="tab2_4">
-							<p class="tType1_title"><img src="/publish/images/content/icon_charging4_small.png" alt="">
-								휴대폰결제</p>
+						<div class="area_tabcont current" id="tab2_3">
+							<p class="tType1_title"><img src="/publish/images/content/icon_charging4_small.png" alt="휴대폰결제"> 휴대폰결제</p>
 							<table class="tType1">
 								<caption></caption>
 								<colgroup>
@@ -573,15 +561,12 @@
 													<dd>
 														<ul>
 															<li><strong id="supplyPriceStr">50,000</strong>원(공급가액)</li>
-															<li><span class="plus"></span><strong
-																	id="vatPriceStr">5,000</strong>원(부가세)</li>
-															<li class="total"><span class="equal"></span><strong
-																	id="lastPriceStr">55,000</strong>원(최종금액)</li>
+															<li><span class="plus"></span><strong id="vatPriceStr">5,000</strong>원(부가세)</li>
+															<li class="total"><span class="equal"></span><strong id="lastPriceStr">55,000</strong>원(최종금액)</li>
 														</ul>
 													</dd>
 												</dl>
-												<button type="button" class="btnType"
-													onclick="pgOpenerPopup(); return false;">충전하기</button>
+												<button type="button" class="btnType" onclick="pgOpenerPopup(); return false;">충전하기</button>
 											</div>
 										</td>
 									</tr>
@@ -600,9 +585,8 @@
 						<!-- //휴대폰 -->
 
 						<!-- 즉시이체 -->
-						<div class="area_tabcont current" id="tab2_5">
-							<p class="tType1_title"><img src="/publish/images/content/icon_charging5_small.png" alt="">
-								즉시이체</p>
+						<div class="area_tabcont current" id="tab2_4">
+							<p class="tType1_title"><img src="/publish/images/content/icon_charging5_small.png" alt="즉시이체"> 즉시이체</p>
 							<table class="tType1">
 								<caption></caption>
 								<colgroup>
@@ -645,15 +629,12 @@
 													<dd>
 														<ul>
 															<li><strong id="supplyPriceStr">50,000</strong>원(공급가액)</li>
-															<li><span class="plus"></span><strong
-																	id="vatPriceStr">5,000</strong>원(부가세)</li>
-															<li class="total"><span class="equal"></span><strong
-																	id="lastPriceStr">55,000</strong>원(최종금액)</li>
+															<li><span class="plus"></span><strong id="vatPriceStr">5,000</strong>원(부가세)</li>
+															<li class="total"><span class="equal"></span><strong id="lastPriceStr">55,000</strong>원(최종금액)</li>
 														</ul>
 													</dd>
 												</dl>
-												<button type="button" class="btnType"
-													onclick="pgOpenerPopup(); return false;">충전하기</button>
+												<button type="button" class="btnType" onclick="pgOpenerPopup(); return false;">충전하기</button>
 											</div>
 										</td>
 									</tr>
@@ -669,6 +650,355 @@
 							</table>
 						</div>
 						<!-- //즉시이체 -->
+						<!-- 네이바페이 -->
+						<div class="area_tabcont" id="tab2_6">
+							<p class="tType1_title"><img src="/publish/images/simple_small.png" alt="간편결제"> 네이버페이</p>
+							<table class="tType1">
+								<colgroup>
+									<col style="width: 100px;">
+									<col style="width: auto;">
+								</colgroup>
+								<tbody>
+									<tr class="charge_content">
+										<th scope="row">충전금액</th>
+										<td class="flex">
+											<select name="tempPrice" id="tempPrice" class="list_seType1">
+												<option value="5000">5,000</option>
+												<option value="10000">10,000</option>
+												<option value="20000">20,000</option>
+												<option value="30000">30,000</option>
+												<option value="50000" selected="">50,000</option>
+												<option value="100000">100,000</option>
+												<option value="200000">200,000</option>
+												<option value="300000">300,000</option>
+												<option value="500000">500,000</option>
+												<option value="700000">700,000</option>
+												<option value="900000">900,000</option>
+												<option value="1000000">1,000,000</option>
+												<option value="1200000">1,200,000</option>
+												<option value="1500000">1,500,000</option>
+												<option value="2000000">2,000,000</option>
+												<option value="2500000">2,500,000</option>
+												<option value="3000000">3,000,000</option>
+											</select>
+
+											<p class="input_in">원</p>
+											<!-- <span class="reqTxt6">※ 최소 3천원 이상부터 결제 가능합니다.</span> -->
+										</td>
+									</tr>
+									<tr>
+										<td colspan="2">
+											<div class="amount_wrap">
+												<dl>
+													<dt>최종 결제금액 :</dt>
+													<dd>
+														<ul>
+															<li><strong id="supplyPriceStr">50,000</strong>원(공급가액)</li>
+															<li><span class="plus"></span><strong id="vatPriceStr">5,000</strong>원(부가세)</li>
+															<li class="total"><span class="equal"></span><strong id="lastPriceStr">55,000</strong>원(최종금액)</li>
+														</ul>
+													</dd>
+												</dl>
+												<button type="button" class="btnType" onclick="pgOpenerPopup(); return false;">충전하기</button>
+											</div>
+										</td>
+									</tr>
+									<tr>
+										<td colspan="2">
+											<div class="area_text">
+												<p>- 인터넷 익스플로러 이용 고객께서는 도구-팝업 차단 해제 후 충전이 가능합니다.</p>
+												<p>- 결제사별 정책상 충전금액 제한이 있을 수 있습니다.</p>
+												<p>- 간편결제 시 세금계산서 및 간이영수증은 제공되지 않습니다.</p>
+												<p>- 네이버페이 카드 결제 영수증은 네이버페이를 통해서 발급받으실 수 있습니다.</p>
+												<p>- 네이버페이 포인트 사용에 따른 현금영수증 발행은 문자온 캐시 결제과정에서 결제자가 직접 선택하여야만 요청할 수 있습니다.(결제 완료 이후 문자온에서 현금영수증 처리 불가)</p>
+											</div>
+										</td>
+									</tr>
+								</tbody>
+							</table>
+						</div>
+						<!-- //네이버페이 -->
+
+						<!-- 카카오페이 -->
+						<div class="area_tabcont current" id="tab2_7">
+							<!-- 신규계좌발급 시 -->
+							<p class="tType1_title"><img src="/publish/images/simple_small.png" alt="간편결제"> 카카오페이</p>
+							<table class="tType1">
+								<colgroup>
+									<col style="width: 100px;">
+									<col style="width: auto;">
+								</colgroup>
+								<tbody>
+									<tr class="charge_content">
+										<th scope="row">충전금액</th>
+										<td class="flex">
+											<select name="tempPrice" id="tempPrice" class="list_seType1">
+												<option value="5000">5,000</option>
+												<option value="10000">10,000</option>
+												<option value="20000">20,000</option>
+												<option value="30000">30,000</option>
+												<option value="50000" selected="">50,000</option>
+												<option value="100000">100,000</option>
+												<option value="200000">200,000</option>
+												<option value="300000">300,000</option>
+												<option value="500000">500,000</option>
+												<option value="700000">700,000</option>
+												<option value="900000">900,000</option>
+												<option value="1000000">1,000,000</option>
+												<option value="1200000">1,200,000</option>
+												<option value="1500000">1,500,000</option>
+												<option value="2000000">2,000,000</option>
+												<option value="2500000">2,500,000</option>
+												<option value="3000000">3,000,000</option>
+											</select>
+
+											<p class="input_in">원</p>
+											<!-- <span class="reqTxt6">※ 최소 3천원 이상부터 결제 가능합니다.</span> -->
+										</td>
+									</tr>
+									<tr>
+										<td colspan="2">
+											<div class="amount_wrap">
+												<dl>
+													<dt>최종 결제금액 :</dt>
+													<dd>
+														<ul>
+															<li><strong id="supplyPriceStr">50,000</strong>원(공급가액)</li>
+															<li><span class="plus"></span><strong id="vatPriceStr">5,000</strong>원(부가세)</li>
+															<li class="total"><span class="equal"></span><strong id="lastPriceStr">55,000</strong>원(최종금액)</li>
+														</ul>
+													</dd>
+												</dl>
+												<button type="button" class="btnType" onclick="pgOpenerPopup(); return false;">충전하기</button>
+											</div>
+										</td>
+									</tr>
+									<tr>
+										<td colspan="2">
+											<div class="area_text">
+												<p>- 인터넷 익스플로러 이용 고객께서는 도구-팝업 차단 해제 후 충전이 가능합니다.</p>
+												<p>- 결제사별 정책상 충전금액 제한이 있을 수 있습니다.</p>
+												<p>- 간편결제 시 세금계산서 및 간이영수증은 제공되지 않습니다.</p>
+												<p>- 카카오페이 결제에 따른 카드영수증 및 현금영수증은 카카오페이 앱을 통해서만 확인 가능합니다.</p>
+											</div>
+										</td>
+									</tr>
+								</tbody>
+							</table>
+						</div>
+						<!-- //카카오페이 -->
+
+						<!-- 무통장입금 -->
+						<!-- <div class="area_tabcont" id="tab2_4">
+							<p class="tType1_title"><img src="/publish/images/content/icon_charging3_small.png" alt=""> 무통장입금</p>
+							<table class="tType1">
+								<caption></caption>
+								<colgroup>
+									<col style="width: 100px;">
+									<col style="width: auto;">
+								</colgroup>
+								<tbody>
+									<tr>
+										<td colspan="2">
+											<ul class="info_bank">
+												<li><a href="#"><i></i>
+														<p>신한은행 <span>389-01-106644</span></p>
+													</a>
+												</li>
+												<li><a href="#"><i></i>
+														<p>농협은행 <span>7700-7700-28</span></p>
+													</a>
+												</li>
+												<li><a href="#"><i></i>
+														<p>국민은행 <span>839-25-0027-299</span></p>
+													</a>
+												</li>
+												<li><a href href="#"><i></i>
+														<p>기업은행 <span>065-048245-04-013</span></p>
+													</a>
+												</li>
+												<li><a href="#"><i></i>
+														<p>외환(하나)은행 <span>241-22-04685-7</span></p>
+													</a>
+												</li>
+												<li><a href="#"><i></i>
+														<p>우리은행 <span>119-301098-13-101</span></p>
+													</a>
+												</li>
+											</ul>
+											<div class="area_text">
+												<p>※ 입금자명은 반드시 <span>본인의 아이디</span>로 입력하셔야 합니다(동명이인 식별 불가)</p>
+												<p>※ 반드시 은행명, 입금액, 예금주를 먼저 입력하신 후 송금을 하셔야 하며, <span>송금이 완료된 상태에서 입금알림 버튼</span>을 눌러주셔야 합니다.</p>
+												<ul class="box_input flex">
+													<li class="flex">은행명 
+														<select name="" id="">
+															<option value="">국민은행</option>
+														</select>
+													</li>
+													<li class="flex">입금금액 <input type="text" size="15">
+														<p class="input_in">원</p>
+													</li>
+													<li class="flex">예금주 <input type="text" size="15"></li>
+													<li class="flex">
+														<input type="checkbox"> 상기 계좌에 입금 알림 <button>입금알림</button>
+													</li>
+												</ul>
+												<p>- 무통장입금 계좌번호 문자로 받기(일 / 최대 3회)
+													<label for="" class="sel_type2_label">은행명</label>
+													<select name="" id="" class="sel_type2">
+														<option value="">은행선택</option>
+														<option value="">기업은행</option>
+														<option value="">국민은행</option>
+														<option value="">외환은행</option>
+														<option value="">농협</option>
+														<option value="">우리은행</option>
+														<option value="">신한은행</option>
+														<option value="">SC은행</option>
+														<option value="">부산은행</option>
+														<option value="">우체국</option>
+													</select>
+													<label for="" class="label">전화번호 입력</label>
+													<input type="text" placeholder="‘-’ 없이 전화번호를 입력해주세요" onfocus="this.placeholder=''"
+														onblur="this.placeholder='‘-’ 없이 전화번호를 입력해주세요'">
+													<button>문자받기</button>
+												</p>
+											</div>
+										</td>
+									</tr>
+								</tbody>
+							</table>
+							<div style="text-align: center;">
+								<button class="btnType btnType16">충전하기</button>
+							</div>
+						</div> -->
+						<!-- //무통장입금 -->
+
+						<!-- 토스페이 -->
+						<div class="area_tabcont current" id="tab2_8">
+							<p class="tType1_title"><img src="/publish/images/simple_small.png" alt="간편결제"> 토스페이</p>
+							<table class="tType1">
+								<caption></caption>
+								<colgroup>
+									<col style="width: 100px;">
+									<col style="width: auto;">
+								</colgroup>
+								<tbody>
+									<tr class="charge_content">
+										<th scope="row">충전금액</th>
+										<td class="flex">
+											<select name="tempPrice" id="tempPrice" class="list_seType1">
+												<option value="5000">5,000</option>
+												<option value="10000">10,000</option>
+												<option value="20000">20,000</option>
+												<option value="30000">30,000</option>
+												<option value="50000" selected="">50,000</option>
+												<option value="100000">100,000</option>
+												<option value="150000">150,000</option>
+											</select>
+
+											<p class="input_in">원</p>
+											<!-- <span class="reqTxt6">※ 최소 3천원 이상부터 결제 가능합니다.</span> -->
+										</td>
+									</tr>
+									<tr>
+										<td colspan="2">
+											<div class="amount_wrap">
+												<dl>
+													<dt>최종 결제금액 :</dt>
+													<dd>
+														<ul>
+															<li><strong id="supplyPriceStr">50,000</strong>원(공급가액)</li>
+															<li><span class="plus"></span><strong id="vatPriceStr">5,000</strong>원(부가세)</li>
+															<li class="total"><span class="equal"></span><strong id="lastPriceStr">55,000</strong>원(최종금액)</li>
+														</ul>
+													</dd>
+												</dl>
+												<button type="button" class="btnType" onclick="pgOpenerPopup(); return false;">충전하기</button>
+											</div>
+										</td>
+									</tr>
+									<tr>
+										<td colspan="2">
+											<div class="area_text">
+												<p>- 인터넷 익스플로러 이용 고객께서는 도구-팝업 차단 해제 후 충전이 가능합니다.</p>
+												<p>- 결제사별 정책상 충전금액 제한이 있을 수 있습니다.</p>
+												<p>- 간편결제 시 세금계산서 및 간이영수증은 제공되지 않습니다.</p>
+												<p>- 토스페이 결제에 따른 카드영수증 및 현금영수증은 토스페이 앱을 통해서만 확인 가능합니다.</p>
+											</div>
+										</td>
+									</tr>
+								</tbody>
+							</table>
+						</div>
+						<!-- //토스페이 -->
+
+						<!-- 페이코 -->
+						<div class="area_tabcont current" id="tab2_9">
+							<p class="tType1_title"><img src="/publish/images/simple_small.png" alt="간편결제"> PAYCO</p>
+							<table class="tType1">
+								<caption></caption>
+								<colgroup>
+									<col style="width: 100px;">
+									<col style="width: auto;">
+								</colgroup>
+								<tbody>
+									<tr class="charge_content">
+										<th scope="row">충전금액</th>
+										<td class="flex">
+											<select name="tempPrice" id="tempPrice" class="list_seType1">
+												<option value="5000">5,000</option>
+												<option value="10000">10,000</option>
+												<option value="20000">20,000</option>
+												<option value="30000">30,000</option>
+												<option value="50000" selected="">50,000</option>
+												<option value="100000">100,000</option>
+												<option value="200000">200,000</option>
+												<option value="300000">300,000</option>
+												<option value="500000">500,000</option>
+												<option value="700000">700,000</option>
+												<option value="900000">900,000</option>
+												<option value="1000000">1,000,000</option>
+												<option value="1200000">1,200,000</option>
+												<option value="1500000">1,500,000</option>
+												<option value="2000000">2,000,000</option>
+												<option value="2500000">2,500,000</option>
+												<option value="3000000">3,000,000</option>
+											</select>
+
+											<p class="input_in">원</p>
+											<!-- <span class="reqTxt6">※ 최소 3천원 이상부터 결제 가능합니다.</span> -->
+										</td>
+									</tr>
+									<tr>
+										<td colspan="2">
+											<div class="amount_wrap">
+												<dl>
+													<dt>최종 결제금액 :</dt>
+													<dd>
+														<ul>
+															<li><strong id="supplyPriceStr">50,000</strong>원(공급가액)</li>
+															<li><span class="plus"></span><strong id="vatPriceStr">5,000</strong>원(부가세)</li>
+															<li class="total"><span class="equal"></span><strong id="lastPriceStr">55,000</strong>원(최종금액)</li>
+														</ul>
+													</dd>
+												</dl>
+												<button type="button" class="btnType" onclick="pgOpenerPopup(); return false;">충전하기</button>
+											</div>
+										</td>
+									</tr>
+									<tr>
+										<td colspan="2">
+											<div class="area_text">
+												<p>- 인터넷 익스플로러 이용 고객께서는 도구-팝업 차단 해제 후 충전이 가능합니다.</p>
+												<p>- 결제사별 정책상 충전금액 제한이 있을 수 있습니다.</p>
+												<p>- 페이코(PAYCO) 결제 영수증은 페이코를 통해 발급받으실 수 있습니다.</p>
+											</div>
+										</td>
+									</tr>
+								</tbody>
+							</table>
+						</div>
+						<!-- //페이코 -->
 					</div>
 
 					<!--누적결제액별 등급 및 단가 추가 시작-->

src/main/webapp/publish/publish_adv/send_group_text.html

@@ -25,7 +25,7 @@
 	<link rel="icon" type="image/png" sizes="96x96" href="/publish/images/favicon/favicon-96x96.png">
 	<link rel="icon" type="image/png" sizes="16x16" href="/publish/images/favicon/favicon-16x16.png">
 	<link rel="manifest" href="/publish/images/favicon/manifest.json">
-
+    
     <link rel="stylesheet" href="/publish/publish_adv/css/reset.css">
     <link rel="stylesheet" href="/publish/publish_adv/css/style.css">
     <link rel="stylesheet" href="/publish/css/font.css">
@@ -46,10 +46,10 @@
         <div class="list">
             <p>목 &nbsp;차</p>
             <ul>
-                <li><a href="#galaxy">1. 단체문자 발송하기(갤럭시)</a></li>
-                <li><a href="#iphone">2. 단체문자 발송하기(아이폰)</a></li>
+                <li><a href="#galaxy">1. 갤럭시 단체문자 발송하기</a></li>
+                <li><a href="#iphone">2. 아이폰 단체문자 발송하기</a></li>
                 <li><a href="#limit">3. 휴대폰 문자 발송의 한계</a></li>
-                <li><a href="#send">4. 단체문자 발송하기(문자사이트)</a></li>
+                <li><a href="#send">4. 단체문자 발송 가장 좋은 방법</a></li>
             </ul>
         </div>
 
@@ -69,7 +69,7 @@
 			<div class="content">
                 <div id="galaxy">
                     <div class="title">
-                        <p>1. 단체문자 발송하기(갤럭시)</p>
+                        <p>1. 갤럭시 단체문자 발송하기</p>
                         <p> <span>*</span> 갤럭시 S21 기준</p>
                     </div>
 
@@ -146,7 +146,7 @@
             <div class="content content-02">
                 <div id="iphone">
                     <div class="title">
-                        <p>2. 단체문자 발송하기(아이폰)</p>
+                        <p>2. 아이폰 단체문자 발송하기</p>
                         <p> <span>*</span> 아이폰 12 프로 기준</p>
                     </div>
 
@@ -279,7 +279,7 @@
             <div class="content">
                 <div id="send">
                     <div class="title">
-                        <p>4. 단체문자 발송하기(문자사이트)</p>
+                        <p>4. 단체문자 발송 가장 좋은 방법</p>
                     </div>
 
                     <div class="line"></div>
@@ -386,8 +386,8 @@
             <div class="bt-button">
                 <a href="https://www.munjaon.co.kr" target="_blank">메인화면 이동</a>
             </div>
+            
 		</div> 
     </div>
 </body>
 </html>
-