From 77567cf6bc2aa974a30d30e4af4df6cf9c17b6ec Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Thu, 3 Aug 2023 14:28:23 +0900
Subject: [PATCH 01/19] =?UTF-8?q?=EB=B0=9C=EC=8B=A0=EB=B2=88=ED=98=B8=20?=
 =?UTF-8?q?=EC=B2=A8=EB=B6=80=ED=8C=8C=EC=9D=BC=20=EB=B7=B0=EC=96=B4=20?=
 =?UTF-8?q?=EC=8A=B9=EC=9D=B8/=EB=B0=98=EB=A0=A4=20=EA=B8=B0=EB=8A=A5=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../let/mjo/msg/web/MjonMsgController.java    |  22 +-
 .../jsp/uss/ion/msg/SendNumberList.jsp        |   8 +-
 .../WEB-INF/jsp/uss/ion/msg/pdfView.jsp       | 112 ++--
 .../WEB-INF/jsp/uss/ion/msg/pdfViewPhone.jsp  | 561 ++++++++++++------
 4 files changed, 450 insertions(+), 253 deletions(-)

diff --git a/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java b/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java
index 468116ba..00b45d58 100644
--- a/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java
+++ b/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java
@@ -5118,15 +5118,21 @@ public class MjonMsgController {
 		model.addAttribute("fileList", fileList);
 		
 		String phmId = request.getParameter("phmId");
-		String phoneNumber = request.getParameter("phoneNumber");
-		String userName = request.getParameter("userName");
 		String managerNm = request.getParameter("managerNm");
 		String dept = request.getParameter("dept");
-		String nameType = request.getParameter("nameType");
-		String phmType = request.getParameter("phmType");
 		String authYnTxt = request.getParameter("authYnTxt");
 		String phmAuthTypeTxt = request.getParameter("phmAuthTypeTxt");
 		String ownerName = request.getParameter("ownerName");
+
+		MjPhoneMemberVO mjPhoneMemberVO = new MjPhoneMemberVO();
+		mjPhoneMemberVO = mjonMsgService.selectSendPhoneNumberByPhmId(phmId);		
+		String phoneNumber = mjPhoneMemberVO.getPhoneNumber();
+		String userId = mjPhoneMemberVO.getUserId();
+		String userName = mjPhoneMemberVO.getUserName();
+		String nameType = mjPhoneMemberVO.getNameType();
+		String phmType = mjPhoneMemberVO.getPhmType();
+		String authYn = mjPhoneMemberVO.getAuthYn();
+		String rejectReason = mjPhoneMemberVO.getRejectReason();
 		
 		// 필수서류
 		String requiredDocuments = "";
@@ -5211,26 +5217,24 @@ public class MjonMsgController {
 			}			
 		}
 	
-		
-				
-		
-        
-		
 		model.addAttribute("pdfPath", path);
 		model.addAttribute("fileType", fileType);
 		model.addAttribute("atchFileId", fileVO.getAtchFileId());
 		model.addAttribute("fileSn", fileVO.getFileSn());
 		model.addAttribute("phmId", phmId);
 		model.addAttribute("phoneNumber", phoneNumber);
+		model.addAttribute("userId", userId);
 		model.addAttribute("userName", userName);
 		model.addAttribute("managerNm", managerNm);
 		model.addAttribute("dept", dept);
 		model.addAttribute("nameType", nameType);
 		model.addAttribute("phmType", phmType);
+		model.addAttribute("authYn", authYn);
 		model.addAttribute("authYnTxt", authYnTxt);
 		model.addAttribute("phmAuthTypeTxt", phmAuthTypeTxt);
 		model.addAttribute("ownerName", ownerName);
 		model.addAttribute("requiredDocuments", requiredDocuments);
+		model.addAttribute("rejectReason", rejectReason);
     	
     	return "/uss/ion/msg/pdfViewPhone";
     }
diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendNumberList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendNumberList.jsp
index c6a72652..18eb9ee5 100644
--- a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendNumberList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendNumberList.jsp
@@ -41,16 +41,18 @@ $( document ).ready(function() {
 });
 
 //PdfView
-function pdfViewPhonePop(atchFileId,phmId,phoneNumber,userName,managerNm,dept,nameType,phmType,authYnTxt,phmAuthTypeTxt,ownerName) {
+function pdfViewPhonePop(atchFileId,phmId,phoneNumber,userId,userName,managerNm,dept,nameType,phmType,authYn,authYnTxt,phmAuthTypeTxt,ownerName) {
 	document.pdfForm.atchFileId.value = atchFileId;
 	document.pdfForm.fileSn.value = 0;
 	document.pdfForm.phmId.value = phmId;
 	document.pdfForm.phoneNumber.value = phoneNumber;
+	document.pdfForm.userId.value = userId;
 	document.pdfForm.userName.value = userName;
 	document.pdfForm.managerNm.value = managerNm;
 	document.pdfForm.dept.value = dept;
 	document.pdfForm.nameType.value = nameType;
 	document.pdfForm.phmType.value = phmType;
+	document.pdfForm.authYn.value = authYn;
 	document.pdfForm.authYnTxt.value = authYnTxt;
 	document.pdfForm.phmAuthTypeTxt.value = phmAuthTypeTxt;
 	document.pdfForm.ownerName.value = ownerName;
@@ -438,7 +440,7 @@ function fnSetCalMonth(val) {
 							</td>
 							<td>
                                 <c:if test="${result.atchFileId ne '' && result.atchFileId ne null}">
-									<button class="btnType btnType20" onclick="pdfViewPhonePop('${result.atchFileId}','${result.phmId}','${result.phoneNumber}','${result.userName}','${result.managerNm}','${result.dept}','${result.nameType}','${result.phmType}','${result.authYnTxt}','${result.phmAuthTypeTxt}','${result.ownerName}'); return false;" style="height:20px !important; padding:0 2px !important;">V</button>
+									<button class="btnType btnType20" onclick="pdfViewPhonePop('${result.atchFileId}','${result.phmId}','${result.phoneNumber}','${result.userId}','${result.userName}','${result.managerNm}','${result.dept}','${result.nameType}','${result.phmType}','${result.authYn}','${result.authYnTxt}','${result.phmAuthTypeTxt}','${result.ownerName}'); return false;" style="height:20px !important; padding:0 2px !important;">V</button>
 					            </c:if>
 							</td>
 							<td><c:out value="${result.admNm}"/></td>
@@ -492,11 +494,13 @@ function fnSetCalMonth(val) {
 	<input type="hidden" name="fileSn"/>
 	<input type="hidden" name="phmId"/>
 	<input type="hidden" name="phoneNumber"/>
+	<input type="hidden" name="userId"/>
 	<input type="hidden" name="userName"/>
 	<input type="hidden" name="managerNm"/>
 	<input type="hidden" name="dept"/>
 	<input type="hidden" name="nameType"/>
 	<input type="hidden" name="phmType"/>
+	<input type="hidden" name="authYn"/>
 	<input type="hidden" name="authYnTxt"/>
 	<input type="hidden" name="phmAuthTypeTxt"/>
 	<input type="hidden" name="ownerName"/>
diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp
index d07a4bb6..d39d309d 100644
--- a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp
@@ -44,63 +44,63 @@ html {
 </head>
 <body>
 
-	<div class="pageCont" style="text-align: center; width: 1000px;">
-		<div class="listTop" style="float: left; margin-top: 0px; padding-top: 0px;">
-			<p class="tType5">기업회원 신청 정보</p>
-		</div>
-		<div class="tableWrap">
-			<table class="tbType1">
-				<colgroup>
-					<col style="width: *%">
-					<col style="width: 12%">
-					<col style="width: 15%">
-					<col style="width: 15%">
-					<col style="width: 12%">
-					<col style="width: 10%">
-				</colgroup>
-				<thead>
-					<tr>
-						<th>기업명</th>
-						<th>사업자번호</th>
-						<th>대표자</th>
-						<th>담당자</th>
-						<th>휴대폰</th>
-						<th>다운로드</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td title="${mberNm}">${mberNm}</td>
-						<td title="${bizNo}">${bizNo}</td>
-						<td title="${ceoNm}">${ceoNm}</td>
-						<td title="${hstManagerNm}">${hstManagerNm}</td>
-						<td title="${hstMbtlNum}">${hstMbtlNum}</td>
-						<td>
-			           		<c:import url="/cmm/fms/selectMberFileInfs.do" charEncoding="utf-8">
-								<c:param name="param_atchFileId" value="${atchFileId}" />
-							</c:import>											
-						</td>
-					</tr>
-				</tbody>
-			</table>	
-		</div>
-		
-		<c:if test="${fileType eq 'etc'}">
-			<div style="width: 100%; text-align: center; margin: 30px 0 30px 0; color: red;">
-				PDF 뷰어에서 지원하지 않는 형식의 파일입니다. 첨부파일 다운로드후 확인해주세요.
-			</div>
-		</c:if>		
-		<canvas id="the-canvas" name="the-canvas" style="min-width: 600px; max-width: 1000px; margin-top: 25px; margin-bottom: 25px;"></canvas>
-	
-		<div>
-		  <button class="btnType" id="prev">Previous</button>
-		  &nbsp;<span>Page: <span id="page_num"></span> / <span id="page_count"></span></span>&nbsp;
-		  <button class="btnType" id="next">Next</button>
-		  
-		  <div style="float: right; margin-right: 10px;"><button onclick="javascript:self.close()" class="btnType">CLOSE</button></div>
-		</div>
-		
+<div class="pageCont" style="text-align: center; width: 1000px;">
+	<div class="listTop" style="float: left; margin-top: 0px; padding-top: 0px;">
+		<p class="tType5">기업회원 신청 정보</p>
 	</div>
+	<div class="tableWrap">
+		<table class="tbType1">
+			<colgroup>
+				<col style="width: *%">
+				<col style="width: 12%">
+				<col style="width: 15%">
+				<col style="width: 15%">
+				<col style="width: 12%">
+				<col style="width: 10%">
+			</colgroup>
+			<thead>
+				<tr>
+					<th>기업명</th>
+					<th>사업자번호</th>
+					<th>대표자</th>
+					<th>담당자</th>
+					<th>휴대폰</th>
+					<th>다운로드</th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr>
+					<td title="${mberNm}">${mberNm}</td>
+					<td title="${bizNo}">${bizNo}</td>
+					<td title="${ceoNm}">${ceoNm}</td>
+					<td title="${hstManagerNm}">${hstManagerNm}</td>
+					<td title="${hstMbtlNum}">${hstMbtlNum}</td>
+					<td>
+		           		<c:import url="/cmm/fms/selectMberFileInfs.do" charEncoding="utf-8">
+							<c:param name="param_atchFileId" value="${atchFileId}" />
+						</c:import>											
+					</td>
+				</tr>
+			</tbody>
+		</table>	
+	</div>
+	
+	<c:if test="${fileType eq 'etc'}">
+		<div style="width: 100%; text-align: center; margin: 30px 0 30px 0; color: red;">
+			PDF 뷰어에서 지원하지 않는 형식의 파일입니다. 첨부파일 다운로드후 확인해주세요.
+		</div>
+	</c:if>		
+	<canvas id="the-canvas" name="the-canvas" style="min-width: 600px; max-width: 1000px; margin-top: 25px; margin-bottom: 25px;"></canvas>
+
+	<div>
+	  <button class="btnType" id="prev">Previous</button>
+	  &nbsp;<span>Page: <span id="page_num"></span> / <span id="page_count"></span></span>&nbsp;
+	  <button class="btnType" id="next">Next</button>
+	  
+	  <div style="float: right; margin-right: 10px;"><button onclick="javascript:self.close()" class="btnType">CLOSE</button></div>
+	</div>
+</div>
+<br /><br />
 
 </body>
 </html>
diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfViewPhone.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfViewPhone.jsp
index 7c481cd7..677685df 100644
--- a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfViewPhone.jsp
+++ b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfViewPhone.jsp
@@ -44,6 +44,19 @@ html {
 
 <script type="text/javaScript" language="javascript">
 
+$(document).ready(function() {
+	// change 함수
+	$("#changeWord").change(function() {
+	    // 변경된 값으로 비교 후 alert 표출
+	    if($(this).val() == ""){
+	    	$("#rejectReason").val('');
+	    } else {
+	    	$("#rejectReason").val($(this).val());
+	    }
+	});
+
+});
+
 //PdfView
 function pdfViewPhonePop(atchFileId,fileSn) {
 	document.pdfForm.atchFileId.value = atchFileId;
@@ -52,199 +65,375 @@ function pdfViewPhonePop(atchFileId,fileSn) {
     document.pdfForm.submit();	
 }
 
+//기업회원 신청 승인/반려 처리
+function updateAuthYn(phmId, authYn, userId) {
+	
+	var form = document.authForm;
+	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);
+					opener.location.reload(); 
+					self.close();
+				} else {
+					alert(data.msg);
+				}
+			},
+	        error: function (e) { 
+	        	alert("저장에 실패하였습니다."); 
+	        	alert("ERROR : " + JSON.stringify(e)); 
+	        }
+	    });
+	}
+	
+}
+
+//기업회원 신청 승인/반려 처리
+function authYnC() {
+	
+	if( $("#rejectReason").val() == '' ){
+		alert("반려사유를 입력해주세요.");
+		return false;
+	}
+	
+	if (confirm("반려 하시겠습니까?")) {
+	
+		var form = document.returnPopForm;
+		form.authYn.value = "C"
+		var data = new FormData(form);
+		url = "/uss/ion/msg/updateAuthYnAjax.do";
+		
+		$.ajax({
+	        type: "POST",
+	        url: url,
+	        data: data,
+	        dataType:'json',
+	        async: false,
+	        processData: false,
+	        contentType: false,
+	        cache: false,
+	        success: function (data) {
+				if (data.result) { 
+					// 초기화
+					alert(data.msg);
+					opener.location.reload(); 
+					self.close();
+				} 
+				else {
+					alert(data.msg);
+				}
+			},
+	        error: function (e) { 
+	        	alert("저장에 실패하였습니다."); 
+	        	alert("ERROR : " + JSON.stringify(e)); 
+	        }
+	    });
+	}
+	
+}
+
+// 반려화면 Call
+function setRejectAreaCall(sType) {
+	if (sType == "SHOW") {
+		if ($("#rejectArea").css("display") == "block") {
+			$("#rejectArea").hide();
+		}
+		else {
+			$("#rejectArea").show();
+		}
+	}
+	else {
+		$("#rejectArea").hide();
+	}
+}
+
 </script>
 
 </head>
 <body>
 
-	<div class="pageCont" style="text-align: center; width: 1000px;">
-		<div class="listTop" style="float: left; margin-top: 0px; padding-top: 0px;">
-			<p class="tType5">발신번호 신청 정보</p>
-		</div>
-		<div class="tableWrap">
-			<table class="tbType1">
-				<colgroup>
-					<col style="width: 12%">
-					<col style="width: *%">
-					<col style="width: 11%">
-					<col style="width: 8%">
-					<col style="width: 8%">
-					<col style="width: 8%">
-					<col style="width: 8%">
-					<col style="width: 8%">
-					<col style="width: 15%">
-				</colgroup>
-				<thead>
-					<tr>
-						<th>발신번호</th>
-						<th>대표</th>
-						<th>담당자</th>
-						<th>회원</th>
-						<th>구분</th>
-						<th>인증방식</th>
-						<th>인증자</th>
-						<th>인증여부</th>
-						<th>다운로드</th>				
-					</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td title="${phoneNumber}">${phoneNumber}</td>
-						<td title="${userName}">${userName}</td>
-						<td title="${managerNm}">${managerNm}</td>
-						<td>
-							<c:choose>
-								<c:when test="${dept == 'c'}">
-									기업
-								</c:when>
-								<c:otherwise>
-									개인
-								</c:otherwise>
-							</c:choose>
-						</td>
-						<td>
-							<c:choose>
-								<c:when test="${not empty nameType}">
-									<c:choose>
-										<c:when test="${nameType == '1'}">
-											당사
-										</c:when>
-										<c:when test="${nameType == '2'}">
-											대표
-										</c:when>
-										<c:when test="${nameType == '3'}">
-											직원
-										</c:when>
-										<c:when test="${nameType == '4'}">
-											타사
-										</c:when>
-										<c:when test="${nameType == '5'}">
-											본인
-										</c:when>
-										<c:otherwise>
-											타인
-										</c:otherwise>
-									</c:choose>	
-								</c:when>
-								<c:otherwise>
-									없음
-								</c:otherwise>
-							</c:choose>						
-						</td>
-						<td>
-							<c:choose>
-								<c:when test="${phmAuthTypeTxt eq '휴대폰 인증'}">
-									휴대폰
-								</c:when>
-								<c:when test="${phmAuthTypeTxt eq '서류인증'}">
-									서류
-								</c:when>									
-								<c:otherwise>
-									<c:out value="${phmAuthTypeTxt}"/>
-								</c:otherwise>
-							</c:choose>													
-						</td>
-						<td>
-							<c:choose>
-								<c:when test="${phmAuthTypeTxt eq '서류인증'}">
-									
-								</c:when>									
-								<c:otherwise>
-									<c:out value="${ownerName}"/>
-								</c:otherwise>
-							</c:choose>							
-						</td>						
-						<td>
-							<c:choose>
-								<c:when test="${phmType eq '03'}">
-									발신번호 차단
-								</c:when>
-								<c:otherwise>
-									<c:if test="${authYnTxt eq '심사중'}">인증요청</c:if>
-									<c:if test="${authYnTxt ne '심사중'}"><c:out value="${authYnTxt}"/></c:if>
-								</c:otherwise>
-							</c:choose>
-						</td>
-						<td>
-			           		<c:import url="/cmm/fms/selectMberFileInfs.do" charEncoding="utf-8">
-								<c:param name="param_atchFileId" value="${atchFileId}" />
-							</c:import>											
-						</td>
-					</tr>
-				</tbody>
-			</table>	
-		</div>
-		
-		<br /><br />
-		<!-- 필수서류 체크 -->
-		<div class="listTop" style="float: left; margin-top: 0px; padding-top: 0px;">
-			<p class="tType5">승인에 필요한 서류</p>
-		</div>
-		<div class="tableWrap">
-			<table class="tbType1">
-				<colgroup>
-					<col style="width: *%">
-				</colgroup>
-				<thead>
-					<tr>
-						<td class="left" style="padding: 10px 0 10px 0; line-height: 1.6em;">${requiredDocuments}</td>
-					</tr>
-				</thead>
-				</tbody>
-			</table>	
-		</div>		
-		
-
-		<c:if test="${not empty fileList}">
-			<div style="width: 100%; text-align: center; margin: 30px 0 30px 0;">		
-			<c:set var="plusCnt" value="0"/>
-			<c:set var="btnClass" value="btnType1"/>
-			<c:forEach var="result" items="${fileList}" varStatus="status">
-				<c:choose>
-					<c:when test="${result.fileSn eq fileSn}">
-						<c:set var="btnClass" value="btnType2"/>
-					</c:when>									
-					<c:otherwise>
-						<c:set var="btnClass" value="btnType1"/>
-					</c:otherwise>
-				</c:choose>			
-				<c:set var="plusCnt" value="${plusCnt + 1}"/>
-				<button class="<c:out value="${btnClass}"/>" onclick="pdfViewPhonePop('${result.atchFileId}','${result.fileSn}'); return false;"> 첨부파일 <c:out value="${plusCnt}"/> </button>
-			</c:forEach>
-			</div>
-		</c:if>
-
-		<c:if test="${fileType eq 'etc'}">
-			<div style="width: 100%; text-align: center; margin: 30px 0 30px 0; color: red;">
-				PDF 뷰어에서 지원하지 않는 형식의 파일입니다. 첨부파일 다운로드후 확인해주세요.
-			</div>
-		</c:if>		
-		<canvas id="the-canvas" name="the-canvas" style="min-width: 600px; max-width: 1000px; margin-top: 25px; margin-bottom: 25px;"></canvas>
-	
-		<div>
-		  <button class="btnType" id="prev">Previous</button>
-		  &nbsp;<span>Page: <span id="page_num"></span> / <span id="page_count"></span></span>&nbsp;
-		  <button class="btnType" id="next">Next</button>
-		  
-		  <div style="float: right; margin-right: 10px;"><button onclick="javascript:self.close()" class="btnType">CLOSE</button></div>
-		</div>
-		
+<div class="pageCont" style="text-align: center; width: 1000px;">
+	<div class="listTop" style="float: left; margin-top: 0px; padding-top: 0px;">
+		<p class="tType5">발신번호 신청 정보</p>
+	</div>
+	<div class="tableWrap">
+		<table class="tbType1">
+			<colgroup>
+				<col style="width: 12%">
+				<col style="width: *%">
+				<col style="width: 11%">
+				<col style="width: 8%">
+				<col style="width: 8%">
+				<col style="width: 8%">
+				<col style="width: 8%">
+				<col style="width: 8%">
+				<col style="width: 15%">
+			</colgroup>
+			<thead>
+				<tr>
+					<th>발신번호</th>
+					<th>대표</th>
+					<th>담당자</th>
+					<th>회원</th>
+					<th>구분</th>
+					<th>인증방식</th>
+					<th>인증자</th>
+					<th>인증여부</th>
+					<th>다운로드</th>				
+				</tr>
+			</thead>
+			<tbody>
+				<tr>
+					<td title="${phoneNumber}">${phoneNumber}</td>
+					<td title="${userName}">${userName}</td>
+					<td title="${managerNm}">${managerNm}</td>
+					<td>
+						<c:choose>
+							<c:when test="${dept == 'c'}">
+								기업
+							</c:when>
+							<c:otherwise>
+								개인
+							</c:otherwise>
+						</c:choose>
+					</td>
+					<td>
+						<c:choose>
+							<c:when test="${not empty nameType}">
+								<c:choose>
+									<c:when test="${nameType == '1'}">
+										당사
+									</c:when>
+									<c:when test="${nameType == '2'}">
+										대표
+									</c:when>
+									<c:when test="${nameType == '3'}">
+										직원
+									</c:when>
+									<c:when test="${nameType == '4'}">
+										타사
+									</c:when>
+									<c:when test="${nameType == '5'}">
+										본인
+									</c:when>
+									<c:otherwise>
+										타인
+									</c:otherwise>
+								</c:choose>	
+							</c:when>
+							<c:otherwise>
+								없음
+							</c:otherwise>
+						</c:choose>						
+					</td>
+					<td>
+						<c:choose>
+							<c:when test="${phmAuthTypeTxt eq '휴대폰 인증'}">
+								휴대폰
+							</c:when>
+							<c:when test="${phmAuthTypeTxt eq '서류인증'}">
+								서류
+							</c:when>									
+							<c:otherwise>
+								<c:out value="${phmAuthTypeTxt}"/>
+							</c:otherwise>
+						</c:choose>													
+					</td>
+					<td>
+						<c:choose>
+							<c:when test="${phmAuthTypeTxt eq '서류인증'}">
+								
+							</c:when>									
+							<c:otherwise>
+								<c:out value="${ownerName}"/>
+							</c:otherwise>
+						</c:choose>							
+					</td>						
+					<td>
+						<c:choose>
+							<c:when test="${phmType eq '03'}">
+								발신번호 차단
+							</c:when>
+							<c:otherwise>
+								<c:if test="${authYnTxt eq '심사중'}">인증요청</c:if>
+								<c:if test="${authYnTxt ne '심사중'}"><c:out value="${authYnTxt}"/></c:if>
+							</c:otherwise>
+						</c:choose>
+					</td>
+					<td>
+		           		<c:import url="/cmm/fms/selectMberFileInfs.do" charEncoding="utf-8">
+							<c:param name="param_atchFileId" value="${atchFileId}" />
+						</c:import>											
+					</td>
+				</tr>
+			</tbody>
+		</table>	
 	</div>
 
-	<form name="pdfForm" method="post">
-		<input type="hidden" name="atchFileId"/>
-		<input type="hidden" name="fileSn"/>
-		<input type="hidden" name="phmId" value="${phmId}"/>
-		<input type="hidden" name="phoneNumber" value="${phoneNumber}"/>
-		<input type="hidden" name="userName" value="${userName}"/>
-		<input type="hidden" name="managerNm" value="${managerNm}"/>
-		<input type="hidden" name="dept" value="${dept}"/>
-		<input type="hidden" name="nameType" value="${nameType}"/>
-		<input type="hidden" name="phmType" value="${phmType}"/>
-		<input type="hidden" name="authYnTxt" value="${authYnTxt}"/>
-		<input type="hidden" name="phmAuthTypeTxt" value="${phmAuthTypeTxt}"/>
-		<input type="hidden" name="ownerName" value="${ownerName}"/>
-	</form>
+
+	<br /><br />
+	<!-- 필수서류 체크 -->
+	<div class="listTop" style="float: left; margin-top: 0px; padding-top: 0px;">
+		<p class="tType5">승인에 필요한 서류</p>
+	</div>
+	<div class="tableWrap">
+		<table class="tbType1">
+			<colgroup>
+				<col style="width: *%">
+				<col style="width: 20%">
+			</colgroup>
+			<thead>
+				<tr>
+					<td class="left" style="padding: 10px 0 10px 0; line-height: 1.6em;">${requiredDocuments}</td>
+					<td style="padding: 10px 0 10px 0; vertical-align:middle;">
+						<c:if test="${authYn eq 'H'}">
+							<button class="btnType btnType20" onclick="updateAuthYn('<c:out value='${phmId}'/>', 'Y', '<c:out value='${userId}'/>'); return false;" style="background-color: blue;">인증완료</button>
+							<button class="btnType btnType20" onclick="setRejectAreaCall('SHOW'); return false;">반려</button>
+						</c:if>
+					</td>
+				</tr>
+			</thead>
+			</tbody>
+		</table>	
+	</div>		
+	
+	
+	<!-- 반려 -->
+	<div id="rejectArea" class="rejectAreaClass" style="display: none;">
+		<br /><br />
+		<div class="listTop" style="float: left; margin-top: 0px; padding-top: 0px;">
+			<p class="tType5">반려</p>
+		</div>
+		<div class="tableWrap">
+			<form id="returnPopForm" name="returnPopForm" method="post">
+			<input type="hidden" name="phmId" id="phmId" value="${phmId}"/>
+			<input type="hidden" name="authYn" id="authYn"/>
+			<input type="hidden" name="userId" value="${userId}" />			
+				<table class="tbType3">
+				<colgroup>
+					<col style="width: 15%">
+					<col style="width: *%">
+				</colgroup>
+				<thead>
+					<tr>
+						<th>반려문구</th>
+						<td class="left">
+							<c:if test="${authYn eq 'H'}">
+								<select id="changeWord" name="changeWord" style="width: 89%;">
+									<option value="">직접입력</option>
+									<c:choose>
+									<c:when test="${dept == 'c'}">
+									<option value='[문자온] 기업의 일반전화 발신번호 등록을 위해서는 "통신서비스이용증명원"이 반드시 첨부되어야 합니다. 해당 서류 첨부(문자온 로그인-마이페이지-발신번호관리 메뉴-서류제출-파일 등록)하여 재신청해 주시면 빠른 승인 도와드리겠습니다.'>기업(회사 명의 일반전화)</option>
+									<option value='[문자온] 기업회원의 전화번호 중 직원명의로 가입된 일반전화의 발신번호 등록을 위해서는 "통신서비스이용증명원", "재직증명서류(재직증명서, 4대보험 가입증명서 등)"가 반드시 첨부되어야 합니다. 해당 서류 첨부(문자온 로그인-마이페이지-발신번호관리 메뉴-서류제출-파일 등록)하여 재신청해 주시면 빠른 승인 도와드리겠습니다.'>기업(직원 명의 일반전화)</option>
+									<option value='[문자온] 기업 재직 직원명의의 휴대폰 발신번호를 등록하기 위해서는 "통신서비스이용증명원(직원 명의 본인의 휴대폰 인증 대체 가능)", "재직증명서류(재직증명서, 4대보험 가입증명서 등)"가 반드시 첨부되어야 합니다. 해당 서류 첨부(문자온 로그인-마이페이지-발신번호관리 메뉴-서류제출-파일 등록)하여 재신청해 주시면 빠른 승인 도와드리겠습니다.'>기업(직원 명의 휴대폰)</option>
+									<option value='[문자온] 기업 자사 명의 외 타사 일반전화 및 타사 명의의 휴대폰 발신번호 등록을 위해서는 "거래관계확인서(계약서, 세금계산서 등)", "발신번호 명의업체의 사업자등록증", "대리인 신분증 사본(문자온에 가입하신 대리인의 신분증, 주민번호 뒷자리 마스킹 처리)", "발신번호 명의업체의 위임장", "통신서비스이용증명원"이 반드시 첨부되어야 합니다. 해당 서류 첨부(문자온 로그인-마이페이지-발신번호관리 메뉴-서류제출-파일 등록)하여 재신청해 주시면 빠른 승인 도와드리겠습니다.'>기업(타사 일반전화 또는 타사 휴대폰)</option>
+									<option value='[문자온] 기업 자사 명의 외 타사 일반전화 및 타사 명의의 휴대폰 발신번호 등록을 위해서는 "거래관계확인서(계약서, 세금계산서 등)", "발신번호 명의업체의 사업자등록증", "대리인 신분증 사본(문자온에 가입하신 대리인의 신분증, 주민번호 뒷자리 마스킹 처리)", "발신번호 명의업체의 위임장", "통신서비스이용증명원", "재직증명서류(재직증명서, 4대보험 가입증명서 등)"가 반드시 첨부되어야 합니다. 해당 서류 첨부(문자온 로그인-마이페이지-발신번호관리 메뉴-서류제출-파일 등록)하여 재신청해 주시면 빠른 승인 도와드리겠습니다.'>기업(타사 직원 일반전화 또는 타사 직원 휴대폰)</option>
+									</c:when>
+									<c:otherwise>
+									<option value='[문자온] 일반전화 발신번호 등록을 위해서는 "통신서비스이용증명원"이 반드시 첨부되어야 합니다. 해당 서류 첨부(문자온 로그인-마이페이지-발신번호관리 메뉴-서류제출-파일 등록)하여 재신청해 주시면 빠른 승인 도와드리겠습니다.'>개인(본인 일반전화)</option>							
+									<option value='[문자온] 타인의 일반전화 발신번호 등록을 위해서는 "통신서비스이용증명원", "발신번호 명의자의 위임장", "대리인 신분증 사본(문자온에 가입하신 대리인의 신분증, 주민번호 뒷자리 마스킹 처리)"이 반드시 첨부되어야 합니다. 해당 서류 첨부(문자온 로그인-마이페이지-발신번호관리 메뉴-서류제출-파일 등록)하여 재신청해 주시면 빠른 승인 도와드리겠습니다.'>개인(타인 일반전화)</option>
+									<option value='[문자온] 타인 명의의 휴대폰 번호를 발신번호로 사용하실 경우 해당번호에 대한 "통신서비스이용증명원(타인 명의 본인의 휴대폰 인증 대체 가능)", "발신번호 명의자의 위임장", "대리인 신분증 사본(문자온에 가입하신 대리인의 신분증, 주민번호 뒷자리 마스킹 처리)"이 반드시 첨부되어야 됩니다. 해당 서류 첨부(문자온 로그인-마이페이지-발신번호관리 메뉴-서류제출-파일 등록)하여 재신청해 주시면 빠른 승인 도와드리겠습니다.'>개인(타인 휴대폰)</option>
+									<option value='[문자온] 개인회원이 회사 명의의 일반전화 또는 회사 명의의 휴대폰 발신번호를 등록하기 위해서는 "통신서비스이용증명원", "사업자등록증", "재직증명서(문자온 회원 가입자가 사업자등록증 상의 대표자가 아닌 경우에 한함)"가 반드시 첨부되어야 합니다. 해당 서류 첨부(문자온 로그인-마이페이지-발신번호관리 메뉴-서류제출-파일 등록)하여 재신청해 주시면 빠른 승인 도와드리겠습니다.'>개인(회사 일반전화 또는 회사 휴대폰, 재직증명가능)</option>
+									<option value='[문자온] 개인회원 중 재직증명서 제출이 불가한 자가(가족, 자원봉사자 등) 회사 명의의 일반전화 또는 회사 명의의 휴대폰 발신번호를 등록하기 위해서는 "통신서비스이용증명원", "발신번호 명의업체의 사업자등록증", "발신번호 명의자의 위임장", "대리인 신분증 사본(문자온에 가입하신 대리인의 신분증, 주민번호 뒷자리 마스킹 처리)"이 반드시 첨부되어야 합니다. 해당 서류 첨부(문자온 로그인-마이페이지-발신번호관리 메뉴-서류제출-파일 등록)하여 재신청해 주시면 빠른 승인 도와드리겠습니다.'>개인(회사 일반전화 또는 회사 휴대폰, 재직증명불가)</option>
+									</c:otherwise>
+									</c:choose>										
+								</select>
+							</c:if>
+						</td>
+					</tr>						
+					<tr>
+						<th>반려사유</th>
+						<td class="left">
+							<textarea style="width: 87%; height: 160px" name="rejectReason" id="rejectReason" maxlength="200" <c:if test="${authYn eq 'C'}">readonly</c:if>>${rejectReason}</textarea>
+						</td>
+					</tr>
+				</thead>
+				</table>
+				<div class="button_box" style="margin-top: 15px;">
+					<c:if test="${authYn eq 'H'}">
+						<button type="button" class="btnType btnType20" onClick="authYnC(); return false;" style="background-color: blue;">반려</button>
+					</c:if>
+						<button type="button" class="btnType btnType20" onClick="setRejectAreaCall('HIDE'); return false;">취소</button>
+				</div>
+			</form>
+		</div>
+		<br /><br />
+	</div>	
+
+
+	<c:if test="${not empty fileList}">
+		<div style="width: 100%; text-align: center; margin: 30px 0 30px 0;">		
+		<c:set var="plusCnt" value="0"/>
+		<c:set var="btnClass" value="btnType1"/>
+		<c:forEach var="result" items="${fileList}" varStatus="status">
+			<c:choose>
+				<c:when test="${result.fileSn eq fileSn}">
+					<c:set var="btnClass" value="btnType2"/>
+				</c:when>									
+				<c:otherwise>
+					<c:set var="btnClass" value="btnType1"/>
+				</c:otherwise>
+			</c:choose>			
+			<c:set var="plusCnt" value="${plusCnt + 1}"/>
+			<button class="<c:out value="${btnClass}"/>" onclick="pdfViewPhonePop('${result.atchFileId}','${result.fileSn}'); return false;"> 첨부파일 <c:out value="${plusCnt}"/> </button>
+		</c:forEach>
+		</div>
+	</c:if>
+
+	<c:if test="${fileType eq 'etc'}">
+		<div style="width: 100%; text-align: center; margin: 30px 0 30px 0; color: red;">
+			PDF 뷰어에서 지원하지 않는 형식의 파일입니다. 첨부파일 다운로드후 확인해주세요.
+		</div>
+	</c:if>		
+	<canvas id="the-canvas" name="the-canvas" style="min-width: 600px; max-width: 1000px; margin-top: 25px; margin-bottom: 25px;"></canvas>
+
+	<div>
+	  <button class="btnType" id="prev">Previous</button>
+	  &nbsp;<span>Page: <span id="page_num"></span> / <span id="page_count"></span></span>&nbsp;
+	  <button class="btnType" id="next">Next</button>
+	  
+	  <div style="float: right; margin-right: 10px;"><button onclick="javascript:opener.location.reload(); self.window.close();" class="btnType">CLOSE</button></div>
+	</div>
+</div>
+
+<br /><br />
+
+<form name="authForm" method="post">
+<input type="hidden" name="phmId"/>
+<input type="hidden" name="authYn"/>
+<input type="hidden" name="userId"/>
+</form>
+
+<form name="pdfForm" method="post">
+<input type="hidden" name="atchFileId"/>
+<input type="hidden" name="fileSn"/>
+<input type="hidden" name="phmId" value="${phmId}"/>
+<input type="hidden" name="phoneNumber" value="${phoneNumber}"/>
+<input type="hidden" name="userId" value="${userId}"/>
+<input type="hidden" name="userName" value="${userName}"/>
+<input type="hidden" name="managerNm" value="${managerNm}"/>
+<input type="hidden" name="dept" value="${dept}"/>
+<input type="hidden" name="nameType" value="${nameType}"/>
+<input type="hidden" name="phmType" value="${phmType}"/>
+<input type="hidden" name="authYn" value="${authYn}"/>
+<input type="hidden" name="authYnTxt" value="${authYnTxt}"/>
+<input type="hidden" name="phmAuthTypeTxt" value="${phmAuthTypeTxt}"/>
+<input type="hidden" name="ownerName" value="${ownerName}"/>
+</form>
 
 </body>
 </html>

From eae766b3bd20e0cf2cccf4013fb1c067739afa30 Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Thu, 3 Aug 2023 15:19:43 +0900
Subject: [PATCH 02/19] =?UTF-8?q?=EA=B8=B0=EC=97=85=ED=9A=8C=EC=9B=90=20?=
 =?UTF-8?q?=EC=B2=A8=EB=B6=80=ED=8C=8C=EC=9D=BC=20=EB=B7=B0=EC=96=B4=20?=
 =?UTF-8?q?=EC=82=AC=EC=97=85=EC=9E=90=EB=93=B1=EB=A1=9D=EC=A6=9D/?=
 =?UTF-8?q?=EC=9E=AC=EC=A7=81=EC=A6=9D=EB=AA=85=EC=84=9C=20=ED=95=9C?=
 =?UTF-8?q?=ED=99=94=EB=A9=B4=EC=97=90=EC=84=9C=20=EB=B3=B4=EA=B8=B0=20?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/itn/com/cmm/util/PdfUtil.java   |  4 +-
 .../cmm/web/EgovFileDownloadController.java   |  4 +-
 .../let/mjo/msg/web/MjonMsgController.java    | 26 +++++---
 .../cmm/uss/umt/EgovMberCmpHstListByType.jsp  | 10 ++-
 .../WEB-INF/jsp/uss/ion/msg/pdfView.jsp       | 65 ++++++++++++++++++-
 5 files changed, 91 insertions(+), 18 deletions(-)

diff --git a/src/main/java/itn/com/cmm/util/PdfUtil.java b/src/main/java/itn/com/cmm/util/PdfUtil.java
index 97014445..5be56982 100644
--- a/src/main/java/itn/com/cmm/util/PdfUtil.java
+++ b/src/main/java/itn/com/cmm/util/PdfUtil.java
@@ -131,8 +131,8 @@ public final class PdfUtil {
             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");
-            //doc.save("C:/TEST/" + uuid + ".pdf");
+            //doc.save("/usr/local/tomcat/file/sht/pdf/" + uuid + ".pdf");
+            doc.save("C:/TEST/" + uuid + ".pdf");
             
         } catch (Exception e) {
             System.out.println("Exception! : " + e.getMessage());
diff --git a/src/main/java/itn/com/cmm/web/EgovFileDownloadController.java b/src/main/java/itn/com/cmm/web/EgovFileDownloadController.java
index 4408051f..eb98c264 100644
--- a/src/main/java/itn/com/cmm/web/EgovFileDownloadController.java
+++ b/src/main/java/itn/com/cmm/web/EgovFileDownloadController.java
@@ -465,8 +465,8 @@ public class EgovFileDownloadController {
 		String fileNm = (String) commandMap.get("fileNm");
 			try {
 			
-			File uFile = new File("/usr/local/tomcat/file/sht/pdf/", fileNm);
-			//File uFile = new File("C:/TEST/", fileNm);
+			//File uFile = new File("/usr/local/tomcat/file/sht/pdf/", fileNm);
+			File uFile = new File("C:/TEST/", fileNm);
 			
 			long fSize = uFile.length();
 
diff --git a/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java b/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java
index 00b45d58..b96210cd 100644
--- a/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java
+++ b/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java
@@ -5046,7 +5046,21 @@ public class MjonMsgController {
    	public String pdfView(FileVO fileVO
    			, ModelMap model
    			, HttpServletRequest request) throws Exception {
-    	
+
+    	// 파라미터
+		String docuDiv = request.getParameter("docuDiv");
+		String atchFileId = request.getParameter("atchFileId");
+		String workAtchFileId = request.getParameter("workAtchFileId");
+		String mberNm = request.getParameter("mberNm");
+		String bizNo = request.getParameter("bizNo");
+		String ceoNm = request.getParameter("ceoNm");
+		String hstManagerNm = request.getParameter("hstManagerNm");
+		String hstMbtlNum = request.getParameter("hstMbtlNum");
+
+		if (docuDiv.equals("2")) {
+			fileVO.setAtchFileId(workAtchFileId);
+		}
+		
 		FileVO fvo = fileService.selectFileInf(fileVO);
 		String path = "";
 		String fileType = "";
@@ -5068,15 +5082,11 @@ public class MjonMsgController {
 			}
 		}
 		
-		String mberNm = request.getParameter("mberNm");
-		String bizNo = request.getParameter("bizNo");
-		String ceoNm = request.getParameter("ceoNm");
-		String hstManagerNm = request.getParameter("hstManagerNm");
-		String hstMbtlNum = request.getParameter("hstMbtlNum");
-		
 		model.addAttribute("pdfPath", path);
 		model.addAttribute("fileType", fileType);
-		model.addAttribute("atchFileId", fileVO.getAtchFileId());
+		model.addAttribute("docuDiv", docuDiv);
+		model.addAttribute("atchFileId", atchFileId);
+		model.addAttribute("workAtchFileId", workAtchFileId);
 		model.addAttribute("mberNm", mberNm);
 		model.addAttribute("bizNo", bizNo);
 		model.addAttribute("ceoNm", ceoNm);
diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstListByType.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstListByType.jsp
index 669be8b0..c93442b4 100644
--- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstListByType.jsp
+++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstListByType.jsp
@@ -22,8 +22,10 @@ $( document ).ready(function() {
 });
 
 // PdfView
-function pdfViewPop(atchFileId,mberNm,bizNo,ceoNm,hstManagerNm,hstMbtlNum) {
+function pdfViewPop(docuDiv,atchFileId,workAtchFileId,mberNm,bizNo,ceoNm,hstManagerNm,hstMbtlNum) {
+	document.pdfForm.docuDiv.value = docuDiv;
 	document.pdfForm.atchFileId.value = atchFileId;
+	document.pdfForm.workAtchFileId.value = workAtchFileId;
 	document.pdfForm.fileSn.value = 0;
 	document.pdfForm.mberNm.value = mberNm;
 	document.pdfForm.bizNo.value = bizNo;
@@ -284,7 +286,9 @@ function fnSetCalMonth(val) {
 <body>
 
 <form name="pdfForm" method="post">
+	<input type="hidden" name="docuDiv"/>
 	<input type="hidden" name="atchFileId"/>
+	<input type="hidden" name="workAtchFileId"/>
 	<input type="hidden" name="fileSn"/>
 	<input type="hidden" name="mberNm"/>
 	<input type="hidden" name="bizNo"/>
@@ -469,7 +473,7 @@ function fnSetCalMonth(val) {
 					            <!--/cmm/fms/selectAddrAgencyFileInfs.do--> 
 					            <!--/cmm/fms/selectMberFileInfs.do-->
                                 <c:if test="${result.atchFileId ne '' && result.atchFileId ne null}">
-									<button class="btnType btnType20" onclick="pdfViewPop('${result.atchFileId}','${result.mberNm}','${result.bizNo}','${result.ceoNm}','${result.hstManagerNm}','${result.hstMbtlNum}'); return false;" style="height:20px !important; padding:0 2px !important;">V</button>
+									<button class="btnType btnType20" onclick="pdfViewPop('1','${result.atchFileId}','${result.workAtchFileId}','${result.mberNm}','${result.bizNo}','${result.ceoNm}','${result.hstManagerNm}','${result.hstMbtlNum}'); return false;" style="height:20px !important; padding:0 2px !important;">V</button>
 					            </c:if>
 					            
 				            </td>							
@@ -481,7 +485,7 @@ function fnSetCalMonth(val) {
 					            </c:if>
  
                                 <c:if test="${result.workAtchFileId ne '' && result.workAtchFileId ne null}">
-									<button class="btnType btnType20" onclick="pdfViewPop('${result.workAtchFileId}','${result.mberNm}','${result.bizNo}','${result.ceoNm}','${result.hstManagerNm}','${result.hstMbtlNum}'); return false;" style="height:20px !important; padding:0 2px !important;">V</button>
+									<button class="btnType btnType20" onclick="pdfViewPop('2','${result.atchFileId}','${result.workAtchFileId}','${result.mberNm}','${result.bizNo}','${result.ceoNm}','${result.hstManagerNm}','${result.hstMbtlNum}'); return false;" style="height:20px !important; padding:0 2px !important;">V</button>
 					            </c:if>
 					            
 				            </td>											            							
diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp
index d39d309d..527a3d57 100644
--- a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp
@@ -41,6 +41,21 @@ html {
   overflow-y: auto;
 }	
 </style>
+
+<script type="text/javaScript" language="javascript">
+
+$(document).ready(function() {
+
+});
+
+//PdfView
+function pdfViewPop(docuDiv) {
+	document.pdfForm.docuDiv.value = docuDiv;
+    document.pdfForm.action = "<c:url value='/uss/ion/msg/pdfView.do'/>";
+    document.pdfForm.submit();	
+}
+
+</script>
 </head>
 <body>
 
@@ -76,15 +91,46 @@ html {
 					<td title="${hstManagerNm}">${hstManagerNm}</td>
 					<td title="${hstMbtlNum}">${hstMbtlNum}</td>
 					<td>
-		           		<c:import url="/cmm/fms/selectMberFileInfs.do" charEncoding="utf-8">
-							<c:param name="param_atchFileId" value="${atchFileId}" />
-						</c:import>											
+						<c:choose>
+							<c:when test="${docuDiv eq '1'}">
+								<c:import url="/cmm/fms/selectMberFileInfs.do" charEncoding="utf-8">
+									<c:param name="param_atchFileId" value="${atchFileId}" />
+								</c:import>								
+							</c:when>
+							<c:otherwise>
+								<c:import url="/cmm/fms/selectMberFileInfs.do" charEncoding="utf-8">
+									<c:param name="param_atchFileId" value="${workAtchFileId}" />
+								</c:import>
+							</c:otherwise>
+						</c:choose>		           							
 					</td>
 				</tr>
 			</tbody>
 		</table>	
 	</div>
 	
+	<c:if test="${not empty atchFileId || not empty workAtchFileId}">
+		<div style="width: 100%; text-align: center; margin: 30px 0 30px 0;">
+			<c:set var="btnClass1" value="btnType1"/>
+			<c:set var="btnClass2" value="btnType1"/>
+			<c:choose>
+				<c:when test="${docuDiv eq '1'}">
+					<c:set var="btnClass1" value="btnType2"/>
+				</c:when>									
+				<c:otherwise>
+					<c:set var="btnClass2" value="btnType2"/>
+				</c:otherwise>
+			</c:choose>			
+						
+			<c:if test="${not empty atchFileId}">		
+				<button class="<c:out value="${btnClass1}"/>" onclick="pdfViewPop('1'); return false;"> 사업자등록증  </button>
+			</c:if>
+			<c:if test="${not empty workAtchFileId}">
+				<button class="<c:out value="${btnClass2}"/>" onclick="pdfViewPop('2'); return false;"> 재직증명서  </button>
+			</c:if>
+		</div>
+	</c:if>	
+	
 	<c:if test="${fileType eq 'etc'}">
 		<div style="width: 100%; text-align: center; margin: 30px 0 30px 0; color: red;">
 			PDF 뷰어에서 지원하지 않는 형식의 파일입니다. 첨부파일 다운로드후 확인해주세요.
@@ -102,6 +148,19 @@ html {
 </div>
 <br /><br />
 
+<form name="pdfForm" method="post">
+<input type="hidden" name="atchFileId" value="${atchFileId}"/>
+<input type="hidden" name="workAtchFileId" value="${workAtchFileId}"/>
+<input type="hidden" name="0"/>
+<input type="hidden" name="fileType" value="${fileType}"/>
+<input type="hidden" name="docuDiv"/>
+<input type="hidden" name="mberNm" value="${mberNm}"/>
+<input type="hidden" name="bizNo" value="${bizNo}"/>
+<input type="hidden" name="ceoNm" value="${ceoNm}"/>
+<input type="hidden" name="hstManagerNm" value="${hstManagerNm}"/>
+<input type="hidden" name="hstMbtlNum" value="${hstMbtlNum}"/>
+</form>
+
 </body>
 </html>
 	<script type="text/javaScript" language="javascript">

From afc7e523889a8a0a4a48067a7fee4c91fb1ebacd Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Thu, 3 Aug 2023 15:20:43 +0900
Subject: [PATCH 03/19] =?UTF-8?q?=ED=8C=8C=EC=9D=BC=EA=B2=BD=EB=A1=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/itn/com/cmm/util/PdfUtil.java                   | 4 ++--
 src/main/java/itn/com/cmm/web/EgovFileDownloadController.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/itn/com/cmm/util/PdfUtil.java b/src/main/java/itn/com/cmm/util/PdfUtil.java
index 5be56982..97014445 100644
--- a/src/main/java/itn/com/cmm/util/PdfUtil.java
+++ b/src/main/java/itn/com/cmm/util/PdfUtil.java
@@ -131,8 +131,8 @@ public final class PdfUtil {
             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");
-            doc.save("C:/TEST/" + uuid + ".pdf");
+            doc.save("/usr/local/tomcat/file/sht/pdf/" + uuid + ".pdf");
+            //doc.save("C:/TEST/" + uuid + ".pdf");
             
         } catch (Exception e) {
             System.out.println("Exception! : " + e.getMessage());
diff --git a/src/main/java/itn/com/cmm/web/EgovFileDownloadController.java b/src/main/java/itn/com/cmm/web/EgovFileDownloadController.java
index eb98c264..4408051f 100644
--- a/src/main/java/itn/com/cmm/web/EgovFileDownloadController.java
+++ b/src/main/java/itn/com/cmm/web/EgovFileDownloadController.java
@@ -465,8 +465,8 @@ public class EgovFileDownloadController {
 		String fileNm = (String) commandMap.get("fileNm");
 			try {
 			
-			//File uFile = new File("/usr/local/tomcat/file/sht/pdf/", fileNm);
-			File uFile = new File("C:/TEST/", fileNm);
+			File uFile = new File("/usr/local/tomcat/file/sht/pdf/", fileNm);
+			//File uFile = new File("C:/TEST/", fileNm);
 			
 			long fSize = uFile.length();
 

From 29a33f6ec5f59db24182d726f0d35ecbc83db5f4 Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Thu, 3 Aug 2023 16:09:03 +0900
Subject: [PATCH 04/19] =?UTF-8?q?=EC=B2=A8=EB=B6=80=ED=8C=8C=EC=9D=BC=20?=
 =?UTF-8?q?=EB=B7=B0=EC=96=B4=20=EC=95=84=EC=9D=B4=EC=BD=98=20=EC=A0=81?=
 =?UTF-8?q?=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsp/cmm/uss/umt/EgovMberCmpHstListByType.jsp  |   4 ++--
 .../WEB-INF/jsp/uss/ion/msg/SendNumberList.jsp    |   2 +-
 .../webapp/publish/images/content/file_view.png   | Bin 0 -> 551 bytes
 3 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 src/main/webapp/publish/images/content/file_view.png

diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstListByType.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstListByType.jsp
index c93442b4..1d6d0d46 100644
--- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstListByType.jsp
+++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstListByType.jsp
@@ -473,7 +473,7 @@ function fnSetCalMonth(val) {
 					            <!--/cmm/fms/selectAddrAgencyFileInfs.do--> 
 					            <!--/cmm/fms/selectMberFileInfs.do-->
                                 <c:if test="${result.atchFileId ne '' && result.atchFileId ne null}">
-									<button class="btnType btnType20" onclick="pdfViewPop('1','${result.atchFileId}','${result.workAtchFileId}','${result.mberNm}','${result.bizNo}','${result.ceoNm}','${result.hstManagerNm}','${result.hstMbtlNum}'); return false;" style="height:20px !important; padding:0 2px !important;">V</button>
+									<a href="#" onclick="pdfViewPop('1','${result.atchFileId}','${result.workAtchFileId}','${result.mberNm}','${result.bizNo}','${result.ceoNm}','${result.hstManagerNm}','${result.hstMbtlNum}'); return false;"><img src="/publish/images/content/file_view.png" style="vertical-align:middle;" /></a>
 					            </c:if>
 					            
 				            </td>							
@@ -485,7 +485,7 @@ function fnSetCalMonth(val) {
 					            </c:if>
  
                                 <c:if test="${result.workAtchFileId ne '' && result.workAtchFileId ne null}">
-									<button class="btnType btnType20" onclick="pdfViewPop('2','${result.atchFileId}','${result.workAtchFileId}','${result.mberNm}','${result.bizNo}','${result.ceoNm}','${result.hstManagerNm}','${result.hstMbtlNum}'); return false;" style="height:20px !important; padding:0 2px !important;">V</button>
+									<a href="#" onclick="pdfViewPop('2','${result.atchFileId}','${result.workAtchFileId}','${result.mberNm}','${result.bizNo}','${result.ceoNm}','${result.hstManagerNm}','${result.hstMbtlNum}'); return false;"><img src="/publish/images/content/file_view.png" style="vertical-align:middle;" /></a>
 					            </c:if>
 					            
 				            </td>											            							
diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendNumberList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendNumberList.jsp
index 18eb9ee5..08bb731c 100644
--- a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendNumberList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendNumberList.jsp
@@ -440,7 +440,7 @@ function fnSetCalMonth(val) {
 							</td>
 							<td>
                                 <c:if test="${result.atchFileId ne '' && result.atchFileId ne null}">
-									<button class="btnType btnType20" onclick="pdfViewPhonePop('${result.atchFileId}','${result.phmId}','${result.phoneNumber}','${result.userId}','${result.userName}','${result.managerNm}','${result.dept}','${result.nameType}','${result.phmType}','${result.authYn}','${result.authYnTxt}','${result.phmAuthTypeTxt}','${result.ownerName}'); return false;" style="height:20px !important; padding:0 2px !important;">V</button>
+									<a href="#" onclick="pdfViewPhonePop('${result.atchFileId}','${result.phmId}','${result.phoneNumber}','${result.userId}','${result.userName}','${result.managerNm}','${result.dept}','${result.nameType}','${result.phmType}','${result.authYn}','${result.authYnTxt}','${result.phmAuthTypeTxt}','${result.ownerName}'); return false;"><img src="/publish/images/content/file_view.png" style="vertical-align:middle;" /></a>
 					            </c:if>
 							</td>
 							<td><c:out value="${result.admNm}"/></td>
diff --git a/src/main/webapp/publish/images/content/file_view.png b/src/main/webapp/publish/images/content/file_view.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d5e94153cb6c7f49d828dea41fbf398b2acb024
GIT binary patch
literal 551
zcmV+?0@(eDP)<h;3K|Lk000e1NJLTq000jF000yS1^@s6QpaZ!0005*Nkl<ZIE|&0
zO=uHA7>1v07HV56M3Npv3o4696~Rec1WCYKB+%MJ52APy^(Kft*;6bY1h2h`lr|d$
zsn(yOAjC^gT?(!Br^b_)C`p<SiDla)WhNvx+l>%>k2Bx%z3(?OyB;Bg37iIOnxzB#
zfgI2cj9Qkpy1POabS}lL6SUT0xf7faaUsM-%d%4SO6?y|la^xEN#MB<;!xW#wFdpb
z8zDrmE4)?q@W=MDxusF9x;8ikEC?aG_4?xPO)s%IgAZR05C{Y)7K?Q0MJ7g4oHaI_
zJw5?O!&!nqY=QY?mfLr3G5>0g;jwFsCyw*|SC<nmH)6}E(sA<sJrW5MP1CS#o6A=&
zF*tM%bMc_-8ED~fczC<4si^t<29ZdFP$-1o?<bv36C4PV`nkuMcs#zWoIReZn$a)}
zN~Mz8%x1Ird_Hoy96kHWO<*({z1oP~p;y%5%+8n!NG6k1Di!ki0`o6ka=t&~8e6Y9
zqfT{v`Vs42*HzTDkDnD-C=`%mwS=YQbv(Ylg1MOC?bCNE>WxrFfe#ms;MJ;(4y4^-
zsbjq*?vA8zN`enwA62Wn8|Zr~T~r6A-uJZ+*Bza)+xjq^`Y%}iNuB{cK<#z>RR_=q
pd~@N>02k!UHv#v@+gjVe+76mtttE%kWKaMA002ovPDHLkV1n2E_@e*-

literal 0
HcmV?d00001


From 41e9811de4252cc1cc96bc6b372b66fcfc92eb7c Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Fri, 4 Aug 2023 11:01:58 +0900
Subject: [PATCH 05/19] =?UTF-8?q?=EA=B8=B0=EC=97=85=ED=9A=8C=EC=9B=90,=20?=
 =?UTF-8?q?=EB=B0=9C=EC=8B=A0=EB=B2=88=ED=98=B8=20=EC=B2=A8=EB=B6=80?=
 =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EB=B7=B0=EC=96=B4=EC=97=90=20=EC=8A=B9?=
 =?UTF-8?q?=EC=9D=B8/=EB=B0=98=EB=A0=A4=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../let/mjo/msg/web/MjonMsgController.java    |  35 +-
 .../cmm/uss/umt/EgovMberCmpHstListByType.jsp  |  20 +-
 .../WEB-INF/jsp/uss/ion/msg/pdfView.jsp       | 394 +++++++++++++++++-
 .../WEB-INF/jsp/uss/ion/msg/pdfViewPhone.jsp  |  37 +-
 4 files changed, 463 insertions(+), 23 deletions(-)

diff --git a/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java b/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java
index b96210cd..3a70b678 100644
--- a/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java
+++ b/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java
@@ -5049,14 +5049,25 @@ public class MjonMsgController {
 
     	// 파라미터
 		String docuDiv = request.getParameter("docuDiv");
-		String atchFileId = request.getParameter("atchFileId");
-		String workAtchFileId = request.getParameter("workAtchFileId");
-		String mberNm = request.getParameter("mberNm");
-		String bizNo = request.getParameter("bizNo");
-		String ceoNm = request.getParameter("ceoNm");
 		String hstManagerNm = request.getParameter("hstManagerNm");
 		String hstMbtlNum = request.getParameter("hstMbtlNum");
-
+		String cmphstId = request.getParameter("cmphstId");
+		String atchFileId = request.getParameter("atchFileId");
+		String workAtchFileId = request.getParameter("workAtchFileId");
+		
+		// 조회
+		MberCmpHstVO mberCmpHstVO = new MberCmpHstVO();
+		mberCmpHstVO.setCmphstId(cmphstId);
+		mberCmpHstVO = egovMberCmpHstService.selectMberCmpHstDetail(mberCmpHstVO);
+		String hstSttus = mberCmpHstVO.getHstSttus();
+		String hstType = mberCmpHstVO.getHstType();
+		String mberNm = mberCmpHstVO.getMberNm();
+		String bizNo = mberCmpHstVO.getBizNo();
+		String ceoNm = mberCmpHstVO.getCeoNm();
+		String mberId = mberCmpHstVO.getMberId();
+		String managerNm = mberCmpHstVO.getManagerNm();
+		String mbtlNum = mberCmpHstVO.getMbtlNum();
+		
 		if (docuDiv.equals("2")) {
 			fileVO.setAtchFileId(workAtchFileId);
 		}
@@ -5092,7 +5103,15 @@ public class MjonMsgController {
 		model.addAttribute("ceoNm", ceoNm);
 		model.addAttribute("hstManagerNm", hstManagerNm);
 		model.addAttribute("hstMbtlNum", hstMbtlNum);		
-    	
+		model.addAttribute("hstSttus", hstSttus);
+		model.addAttribute("cmphstId", cmphstId);
+		model.addAttribute("hstType", hstType);
+		model.addAttribute("mberId", mberId);
+		model.addAttribute("managerNm", managerNm);
+		model.addAttribute("mbtlNum", mbtlNum);
+		model.addAttribute("atchFileSttus", mberCmpHstVO.getAtchFileSttus());
+		model.addAttribute("workAtchFileSttus", mberCmpHstVO.getWorkAtchFileSttus());
+		
     	return "/uss/ion/msg/pdfView";
     }
 	
@@ -5127,6 +5146,7 @@ public class MjonMsgController {
 		List<FileVO> fileList = fileService.selectFileInfs(fileVO);
 		model.addAttribute("fileList", fileList);
 		
+		// 파라미터
 		String phmId = request.getParameter("phmId");
 		String managerNm = request.getParameter("managerNm");
 		String dept = request.getParameter("dept");
@@ -5134,6 +5154,7 @@ public class MjonMsgController {
 		String phmAuthTypeTxt = request.getParameter("phmAuthTypeTxt");
 		String ownerName = request.getParameter("ownerName");
 
+		// 조회
 		MjPhoneMemberVO mjPhoneMemberVO = new MjPhoneMemberVO();
 		mjPhoneMemberVO = mjonMsgService.selectSendPhoneNumberByPhmId(phmId);		
 		String phoneNumber = mjPhoneMemberVO.getPhoneNumber();
diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstListByType.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstListByType.jsp
index 1d6d0d46..3b3e5a39 100644
--- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstListByType.jsp
+++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstListByType.jsp
@@ -22,7 +22,7 @@ $( document ).ready(function() {
 });
 
 // PdfView
-function pdfViewPop(docuDiv,atchFileId,workAtchFileId,mberNm,bizNo,ceoNm,hstManagerNm,hstMbtlNum) {
+function pdfViewPop(docuDiv,atchFileId,workAtchFileId,mberNm,bizNo,ceoNm,hstManagerNm,hstMbtlNum,hstSttus,cmphstId,hstType,mberId,managerNm,mbtlNum) {
 	document.pdfForm.docuDiv.value = docuDiv;
 	document.pdfForm.atchFileId.value = atchFileId;
 	document.pdfForm.workAtchFileId.value = workAtchFileId;
@@ -32,6 +32,12 @@ function pdfViewPop(docuDiv,atchFileId,workAtchFileId,mberNm,bizNo,ceoNm,hstMana
 	document.pdfForm.ceoNm.value = ceoNm;
 	document.pdfForm.hstManagerNm.value = hstManagerNm;
 	document.pdfForm.hstMbtlNum.value = hstMbtlNum;
+	document.pdfForm.hstSttus.value = hstSttus;
+	document.pdfForm.cmphstId.value = cmphstId;
+	document.pdfForm.hstType.value = hstType;
+	document.pdfForm.mberId.value = mberId;
+	document.pdfForm.managerNm.value = managerNm;
+	document.pdfForm.mbtlNum.value = mbtlNum;
 	window.open("about:blank", 'pdfPopup', 'width=1020, height=800, top=100, left=0, fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=no, location=no, scrollbars=no');
     document.pdfForm.action = "<c:url value='/uss/ion/msg/pdfView.do'/>";
     document.pdfForm.target = "pdfPopup";
@@ -294,7 +300,13 @@ function fnSetCalMonth(val) {
 	<input type="hidden" name="bizNo"/>
 	<input type="hidden" name="ceoNm"/>
 	<input type="hidden" name="hstManagerNm"/>
-	<input type="hidden" name="hstMbtlNum"/>	
+	<input type="hidden" name="hstMbtlNum"/>
+	<input type="hidden" name="hstSttus"/>
+	<input type="hidden" name="cmphstId"/>
+	<input type="hidden" name="hstType"/>
+	<input type="hidden" name="mberId"/>
+	<input type="hidden" name="managerNm"/>
+	<input type="hidden" name="mbtlNum"/>		
 </form>
 
 <form name="popupForm" action="<c:url value='/uss/umt/user/EgovMberCmpHstListPop.do'/>" method="post">
@@ -473,7 +485,7 @@ function fnSetCalMonth(val) {
 					            <!--/cmm/fms/selectAddrAgencyFileInfs.do--> 
 					            <!--/cmm/fms/selectMberFileInfs.do-->
                                 <c:if test="${result.atchFileId ne '' && result.atchFileId ne null}">
-									<a href="#" onclick="pdfViewPop('1','${result.atchFileId}','${result.workAtchFileId}','${result.mberNm}','${result.bizNo}','${result.ceoNm}','${result.hstManagerNm}','${result.hstMbtlNum}'); return false;"><img src="/publish/images/content/file_view.png" style="vertical-align:middle;" /></a>
+									<a href="#" onclick="pdfViewPop('1','${result.atchFileId}','${result.workAtchFileId}','${result.mberNm}','${result.bizNo}','${result.ceoNm}','${result.hstManagerNm}','${result.hstMbtlNum}','${result.hstSttus}','${result.cmphstId}','${result.hstType}','${result.mberId}','${result.managerNm}','${result.mbtlNum}'); return false;"><img src="/publish/images/content/file_view.png" style="vertical-align:middle;" /></a>
 					            </c:if>
 					            
 				            </td>							
@@ -485,7 +497,7 @@ function fnSetCalMonth(val) {
 					            </c:if>
  
                                 <c:if test="${result.workAtchFileId ne '' && result.workAtchFileId ne null}">
-									<a href="#" onclick="pdfViewPop('2','${result.atchFileId}','${result.workAtchFileId}','${result.mberNm}','${result.bizNo}','${result.ceoNm}','${result.hstManagerNm}','${result.hstMbtlNum}'); return false;"><img src="/publish/images/content/file_view.png" style="vertical-align:middle;" /></a>
+									<a href="#" onclick="pdfViewPop('2','${result.atchFileId}','${result.workAtchFileId}','${result.mberNm}','${result.bizNo}','${result.ceoNm}','${result.hstManagerNm}','${result.hstMbtlNum}','${result.hstSttus}','${result.cmphstId}','${result.hstType}','${result.mberId}','${result.managerNm}','${result.mbtlNum}'); return false;"><img src="/publish/images/content/file_view.png" style="vertical-align:middle;" /></a>
 					            </c:if>
 					            
 				            </td>											            							
diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp
index 527a3d57..92ffa684 100644
--- a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp
@@ -29,7 +29,7 @@
 <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 type="text/javascript" src="<c:url value='/js/EgovMultiFile.js'/>"></script>
@@ -40,12 +40,33 @@ html {
   overflow-x: hidden;
   overflow-y: auto;
 }	
+
+input[type="checkbox"]{display: inline;}
+input[type="checkbox"] {
+  width: 1.263rem;
+  height: 1.263rem;
+  margin-right: 25px;
+  border: 1px solid var(--color-gray);
+  border-radius: 50%;
+  cursor: pointer;
+  position: relative;
+  vertical-align: middle;
+}
 </style>
 
 <script type="text/javaScript" language="javascript">
+var biznoCall = "N";
 
 $(document).ready(function() {
-
+	// change 함수
+	$("#changeWord").change(function() {
+	    // 변경된 값으로 비교 후 alert 표출
+	    if($(this).val() == ""){
+	    	$("#returnCn").val('');
+	    } else {
+	    	$("#returnCn").val($(this).val());
+	    }
+	});
 });
 
 //PdfView
@@ -55,6 +76,249 @@ function pdfViewPop(docuDiv) {
     document.pdfForm.submit();	
 }
 
+// 머니핀
+function biznoPop() {
+	//반려 Hide
+	setRejectAreaHide();
+	
+	if (biznoCall == "Y") {
+		// 머니핀 Hide
+		setMoneyPinHide();
+	}
+	else {
+		// 머니핀 Show
+		setMoneyPinShow();
+	}
+}
+
+// 머니핀 Show
+function setMoneyPinShow() {
+	$("#btnMoneypin").text("머니핀 페이지 CLOSE");
+	$("#btnMoneypin").removeClass("btnType1");
+	$("#btnMoneypin").addClass("btnType2");
+	
+	var p_bizno	= "${bizNo}";	
+	$("#iFrame").attr("width","100%").attr("height","500px");
+	$("#iFrame").attr("src","https://moneypin.biz/bizno/detail/"+p_bizno);
+	biznoCall = "Y";			
+}
+
+// 머니핀 Hide
+function setMoneyPinHide() {
+	$("#btnMoneypin").text("머니핀 페이지 OPEN");
+	$("#btnMoneypin").removeClass("btnType2");
+	$("#btnMoneypin").addClass("btnType1");
+	
+	var p_bizno	= "${bizNo}";	
+	$("#iFrame").attr("width","100%").attr("height","0px");
+	$("#iFrame").attr("src","");
+	biznoCall = "N";			
+}
+
+
+//세무서에서 해당 값 체크하기
+function setHomeTaxApi() {
+
+	var v_start_dt	=	$('#start_dt').val();
+	
+	if (v_start_dt==""){
+		alert("설립일은 필수값 입니다.\n제출한 사업자 등록증에서 해당 값을 확인 하시고 입력해주세요~");
+		return;	
+	}
+	
+	$.ajax({
+        url : "<c:url value='/uss/umt/user/checkBizNoTaxAjax.do' />", 
+        type : 'POST', 
+        data : { 
+        	"b_no": "${bizNo}"			//사업자등록번호
+        	, "b_nm": "${mberNm}"		//업체명
+        	, "p_nm": "${ceoNm}"		//대표자명
+        	, "start_dt": v_start_dt	//설립일자
+       	},
+        dataType:'json',
+        async: false,
+        success: function (data) {
+        	/*
+        	
+		     * 					02	-	확인할 수 없습니다.
+		     * 					00	-	알수없는오류(0V)
+		     * 
+		     * STEP2. 사업자등록번호 확인 :  	
+		     * 	            	 *  -1:알수없는 오류
+			            	 *  0:국세청에 등록되지 않은 사업자등록번호입니다.
+			            	 *  11: 계속사업자,
+			            	 *  12: 휴업자,
+			            	 *  13: 폐업자        	
+        	*/
+			if (data.result=='11') {
+				alert('기업이름, 사업자번호, 대표자 성명, 설립일 모두 정상값으로 확인되었습니다.');
+			} 
+			else {
+				alert("데이터 검증에 실패했습니다."+data.msg);
+			}
+		},
+        error: function (e) { 
+        	alert("저장에 실패하였습니다."); 
+        	alert("ERROR : " + JSON.stringify(e)); 
+        }
+    });
+	
+}
+
+//기업회원 신청 승인/반려 처리
+function setMberCmpHstStatusSave(hstSttus) {
+	var sMsg = "";
+	if (hstSttus == "02") {
+		sMsg = "승인";
+	}
+	else if (hstSttus == "03") {
+		sMsg = "반려";
+	}
+	
+	if (confirm(sMsg + " 하시겠습니까?")) {
+		var form = document.pdfForm;
+		form.hstSttus.value = hstSttus;
+		var data = new FormData(form);
+		url = "/uss/umt/user/mberCmpHstStatusSaveAjax.do";
+
+		if("${hstType}" == '02' && hstSttus == '02'){ //기업회원 전환 승인이라면 기존 mberNm -> managerNm 으로 수정
+			form.managerNm.value = "${managerNm}";
+		}
+		else {
+			form.managerNm.value = "";			
+		}
+		
+		$.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);
+					}else{
+						alert(data.msg);
+					}
+					
+					opener.location.reload(); 
+					self.close();
+				} 
+				else {
+					alert(data.msg);
+					form.managerNm.value = "${managerNm}";
+					form.hstSttus.value = "${hstSttus}";					
+				}
+			},
+	        error: function (e) { 
+	        	alert("저장에 실패하였습니다."); 
+	        	alert("ERROR : " + JSON.stringify(e)); 
+	    		form.managerNm.value = "${managerNm}";
+	    		form.hstSttus.value = "${hstSttus}";	        	
+	        }
+	    });
+	}
+	
+}
+
+//반려화면 Call
+function setRejectAreaCall(sType) {
+	// 머니핀 Hide
+	setMoneyPinHide();
+	
+	if (sType == "SHOW") {
+		if ($("#rejectArea").css("display") == "block") {
+			//반려 Hide
+			setRejectAreaHide();
+		}
+		else {
+			// 반려 Show
+			setRejectAreaShow();			
+		}
+	}
+	else {
+		//반려 Hide
+		setRejectAreaHide();
+	}
+}
+
+// 반려 Show
+function setRejectAreaShow() {
+	$("#rejectArea").show();
+	
+	$("#btnReject").text("반려 CLOSE");
+	$("#btnReject").removeClass("btnType1");
+	$("#btnReject").addClass("btnType2");			
+}
+
+//반려 Hide
+function setRejectAreaHide() {
+	$("#rejectArea").hide();
+
+	$("#btnReject").text("반려 OPEN");
+	$("#btnReject").removeClass("btnType2");
+	$("#btnReject").addClass("btnType1");
+}
+
+//기업회원 신청 승인/반려 처리
+function fn_Update() {
+	
+	if($(".chk:checked").length == '0'){
+		alert("반려항목을 선택해주세요.");
+		return false;
+	}
+	
+	if( $("#returnCn").val() == '' ){
+		alert("반려사유를 입력해주세요.");
+		return false;
+	}
+	
+	if (confirm("반려 하시겠습니까?")) {
+	
+		var form = document.returnPopForm;
+			if(document.getElementById("atchFileSttusYN").checked == true){
+				document.getElementById("atchFileSttus").value = "N" 
+			}
+			if(document.getElementById("workAtchFileSttusYN").checked == true){
+				document.getElementById("workAtchFileSttus").value = "N"
+			}
+		
+		var data = new FormData(form);
+		url = "/uss/umt/user/mberCmpHstStatusReturnAjax.do";
+		
+		$.ajax({
+	        type: "POST",
+	        url: url,
+	        data: data,
+	        dataType:'json',
+	        async: false,
+	        processData: false,
+	        contentType: false,
+	        cache: false,
+	        success: function (data) {
+				if (data.isSuccess) { 
+					// 초기화
+					alert(data.msg);
+					opener.location.reload();
+					self.close();
+				} 
+				else {
+					alert(data.msg);
+				}
+			},
+	        error: function (e) { 
+	        	alert("저장에 실패하였습니다."); 
+	        	alert("ERROR : " + JSON.stringify(e)); 
+	        }
+	    });
+	}
+	
+}
+
 </script>
 </head>
 <body>
@@ -71,7 +335,8 @@ function pdfViewPop(docuDiv) {
 				<col style="width: 15%">
 				<col style="width: 15%">
 				<col style="width: 12%">
-				<col style="width: 10%">
+				<col style="width: 6%">
+				<col style="width: 5%">
 			</colgroup>
 			<thead>
 				<tr>
@@ -80,7 +345,8 @@ function pdfViewPop(docuDiv) {
 					<th>대표자</th>
 					<th>담당자</th>
 					<th>휴대폰</th>
-					<th>다운로드</th>
+					<th>사업자</th>
+					<th>재직</th>
 				</tr>
 			</thead>
 			<tbody>
@@ -90,6 +356,21 @@ function pdfViewPop(docuDiv) {
 					<td title="${ceoNm}">${ceoNm}</td>
 					<td title="${hstManagerNm}">${hstManagerNm}</td>
 					<td title="${hstMbtlNum}">${hstMbtlNum}</td>
+					<td>
+						<c:if test="${not empty atchFileId}">
+							<c:import url="/cmm/fms/selectMberFileInfs.do" charEncoding="utf-8">
+								<c:param name="param_atchFileId" value="${atchFileId}" />
+							</c:import>								
+						</c:if>
+					</td>					
+					<td>
+						<c:if test="${not empty workAtchFileId}">
+							<c:import url="/cmm/fms/selectMberFileInfs.do" charEncoding="utf-8">
+								<c:param name="param_atchFileId" value="${workAtchFileId}" />
+							</c:import>
+						</c:if>					
+					</td>
+					<%-- 
 					<td>
 						<c:choose>
 							<c:when test="${docuDiv eq '1'}">
@@ -104,11 +385,110 @@ function pdfViewPop(docuDiv) {
 							</c:otherwise>
 						</c:choose>		           							
 					</td>
+					--%>
 				</tr>
 			</tbody>
 		</table>	
 	</div>
 	
+	
+	<br /><br />
+	<!-- 사업자정보 체크 -->
+	<div class="listTop" style="float: left; margin-top: 0px; padding-top: 0px;">
+		<p class="tType5">사업자정보 검증</p>
+	</div>
+	<div class="tableWrap">
+		<table class="tbType1">
+			<colgroup>
+				<col style="width: *%">
+				<col style="width: 25%">
+			</colgroup>
+			<thead>
+				<tr>
+					<td class="left" style="padding: 10px 0 10px 0; line-height: 1.6em;">
+						<button id="btnMoneypin" class="btnType1" onclick="biznoPop();return false;">머니핀 페이지 OPEN</button>
+						&nbsp;&nbsp;&nbsp;
+						<input id="start_dt" name="start_dt" class="recentSearch" type="text" value="" size="25" title="설립일" maxlength="10" placeholder="설립일(개업일) ex:2018-02-08"/>						
+						<button class="btnType1" onclick="setHomeTaxApi(); return false;">국세청 API호출</button>
+					</td>
+					<td style="padding: 10px 0 10px 0; vertical-align: middle;">
+						<c:if test="${hstSttus eq '01'}">
+							<button class="btnType1" onclick="setMberCmpHstStatusSave('02'); return false;" style="background-color: blue;">승인</button>
+							<button class="btnType1" onclick="setRejectAreaCall('SHOW'); return false;" id="btnReject">반려 OPEN</button>
+						</c:if>
+					</td>
+				</tr>
+			</thead>
+			</tbody>
+		</table>	
+	</div>	
+	
+	<!-- 반려 -->
+	<div id="rejectArea" class="rejectAreaClass" style="display: none;">
+		<br /><br />
+		<div class="listTop" style="float: left; margin-top: 0px; padding-top: 0px;">
+			<p class="tType5">반려</p>
+		</div>
+		<div class="tableWrap">
+			<form id="returnPopForm" name="returnPopForm" method="post">
+			<input type="hidden" name="cmphstId" id="cmphstId" value="${cmphstId}"/>
+			<input type="hidden" name="hstSttus" id="hstSttus" value="03"/>
+			<input type="hidden" name="hstType" id="hstType" value="${hstType}"/>
+			<input type="hidden" name="mbtlNum" id="mbtlNum" value="${mbtlNum}"/>
+			<input type="hidden" name="atchFileSttus" id="atchFileSttus" value="Y"/>
+			<input type="hidden" name="workAtchFileSttus" id="workAtchFileSttus" value="Y"/>
+				<table class="tbType3">
+				<colgroup>
+					<col style="width: 15%">
+					<col style="width: *%">
+				</colgroup>
+				<thead>
+					<tr>
+						<th>반려항목</th>
+						<td class="left" style="vertical-align: middle;">
+							<div style="display:flex;">
+								<!-- 담당자 정보 변경 시 미노출 -->
+								<div <c:if test="${hstType eq '04'}">style="display:none;"</c:if>>
+									사업자등록증 반려	<input type="checkbox" class="chk" id="atchFileSttusYN" <c:if test="${atchFileSttus eq 'N'}">checked</c:if> <c:if test="${hstSttus ne '01'}">disabled</c:if> />
+								</div>
+								<span style="margin:0 3px;"></span>
+								<!-- 기업정보 변경 시 미노출 -->
+								<div <c:if test="${hstType eq '03'}">style="display:none;"</c:if>>
+									재직증명서 반려 <input type="checkbox" class="chk" id="workAtchFileSttusYN" <c:if test="${workAtchFileSttus eq 'N'}">checked</c:if> <c:if test="${hstSttus ne '01'}">disabled</c:if> />
+								</div>
+							</div>
+						</td>
+					</tr>
+					<tr>
+						<th>반려문구</th>
+						<td class="left">
+							<select id="changeWord" name="changeWord" style="width: 89%;">
+								<option value="">직접입력</option>
+								<option value="[문자온] 기업회원은 사업자등록증이 반드시 첨부되어야 합니다. 사업자등록증 첨부(문자온 로그인 시 파일 업로드 화면 확인 가능) 후 재신청해 주시면 빠른 승인 도와드리겠습니다.">사업자등록증 누락</option>
+								<option value="[문자온] 기업회원 신청자가 대표자 본인이 아닌 경우, 재직증명서를 첨부해주셔야 합니다. 재직증명서 첨부(문자온 로그인 시 파일 업로드 화면 확인 가능) 후 재신청해 주시면 빠른 승인 도와드리겠습니다.">재직증명서 누락</option>
+								<option value="[문자온] 기업회원 신청 시 사업자등록증 및 재직증명서(대표자 본인이 신청하지 않는 경우에 한함)가 반드시 첨부되어야 합니다. 해당 서류 첨부(문자온 로그인 시 파일 업로드 화면 확인 가능)하여 재신청해 주시면 빠른 승인 도와드리겠습니다.">사업자등록증 및 재직증명서 누락</option>
+							</select>
+						</td>
+					</tr>						
+					<tr>
+						<th>반려사유</th>
+						<td class="left">
+							<textarea style="width: 87%; height: 160px" name="returnCn" id="returnCn" maxlength="250">${returnCn}</textarea>
+						</td>
+					</tr>
+				</thead>
+				</table>
+				<div class="button_box" style="margin-top: 15px;">
+						<button type="button" class="btnType btnType20" onClick="fn_Update(); return false;" style="background-color: blue;">반려</button>
+						<button type="button" class="btnType btnType20" onClick="setRejectAreaCall('HIDE'); return false;">취소</button>
+				</div>
+			</form>
+		</div>
+		<br /><br />
+	</div>	
+	
+	<iframe src="" title="" id="iFrame" name="iFrame" width="100%" height="0px"></iframe>
+		
 	<c:if test="${not empty atchFileId || not empty workAtchFileId}">
 		<div style="width: 100%; text-align: center; margin: 30px 0 30px 0;">
 			<c:set var="btnClass1" value="btnType1"/>
@@ -159,6 +539,12 @@ function pdfViewPop(docuDiv) {
 <input type="hidden" name="ceoNm" value="${ceoNm}"/>
 <input type="hidden" name="hstManagerNm" value="${hstManagerNm}"/>
 <input type="hidden" name="hstMbtlNum" value="${hstMbtlNum}"/>
+<input type="hidden" name="hstSttus" value="${hstSttus}"/>
+<input type="hidden" name="cmphstId" value="${cmphstId}"/>
+<input type="hidden" name="hstType" value="${hstType}"/>
+<input type="hidden" name="mberId" value="${mberId}"/>
+<input type="hidden" name="managerNm" value="${managerNm}"/>
+<input type="hidden" name="mbtlNum" value="${mbtlNum}"/>
 </form>
 
 </body>
diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfViewPhone.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfViewPhone.jsp
index 677685df..4836b4bc 100644
--- a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfViewPhone.jsp
+++ b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfViewPhone.jsp
@@ -146,21 +146,42 @@ function authYnC() {
 	
 }
 
-// 반려화면 Call
+//반려화면 Call
 function setRejectAreaCall(sType) {
 	if (sType == "SHOW") {
 		if ($("#rejectArea").css("display") == "block") {
-			$("#rejectArea").hide();
+			//반려 Hide
+			setRejectAreaHide();
 		}
 		else {
-			$("#rejectArea").show();
+			// 반려 Show
+			setRejectAreaShow();			
 		}
 	}
 	else {
-		$("#rejectArea").hide();
+		//반려 Hide
+		setRejectAreaHide();
 	}
 }
 
+// 반려 Show
+function setRejectAreaShow() {
+	$("#rejectArea").show();
+	
+	$("#btnReject").text("반려 CLOSE");
+	$("#btnReject").removeClass("btnType1");
+	$("#btnReject").addClass("btnType2");			
+}
+
+//반려 Hide
+function setRejectAreaHide() {
+	$("#rejectArea").hide();
+
+	$("#btnReject").text("반려 OPEN");
+	$("#btnReject").removeClass("btnType2");
+	$("#btnReject").addClass("btnType1");
+}
+
 </script>
 
 </head>
@@ -294,15 +315,15 @@ function setRejectAreaCall(sType) {
 		<table class="tbType1">
 			<colgroup>
 				<col style="width: *%">
-				<col style="width: 20%">
+				<col style="width: 25%">
 			</colgroup>
 			<thead>
 				<tr>
 					<td class="left" style="padding: 10px 0 10px 0; line-height: 1.6em;">${requiredDocuments}</td>
-					<td style="padding: 10px 0 10px 0; vertical-align:middle;">
+					<td style="padding: 10px 0 10px 0; vertical-align: middle;">
 						<c:if test="${authYn eq 'H'}">
-							<button class="btnType btnType20" onclick="updateAuthYn('<c:out value='${phmId}'/>', 'Y', '<c:out value='${userId}'/>'); return false;" style="background-color: blue;">인증완료</button>
-							<button class="btnType btnType20" onclick="setRejectAreaCall('SHOW'); return false;">반려</button>
+							<button class="btnType1" onclick="updateAuthYn('<c:out value='${phmId}'/>', 'Y', '<c:out value='${userId}'/>'); return false;" style="background-color: blue;">인증완료</button>
+							<button class="btnType1" onclick="setRejectAreaCall('SHOW'); return false;" id="btnReject">반려 OPEN</button>
 						</c:if>
 					</td>
 				</tr>

From 15fdce717f3fed703e32c542da1064badd05657c Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Fri, 4 Aug 2023 11:22:37 +0900
Subject: [PATCH 06/19] =?UTF-8?q?=EA=B8=B0=EC=97=85=ED=9A=8C=EC=9B=90=20?=
 =?UTF-8?q?=EC=B2=A8=EB=B6=80=ED=8C=8C=EC=9D=BC=20=EB=B7=B0=EC=96=B4?=
 =?UTF-8?q?=EC=97=90=20=EA=B8=B0=EC=97=85=EC=9C=A0=ED=98=95=20=EB=93=B1=20?=
 =?UTF-8?q?=ED=95=AD=EB=AA=A9=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../let/mjo/msg/web/MjonMsgController.java    | 11 ++++++++++
 .../WEB-INF/jsp/uss/ion/msg/pdfView.jsp       | 22 +++++++++++++++----
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java b/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java
index 3a70b678..004ccc10 100644
--- a/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java
+++ b/src/main/java/itn/let/mjo/msg/web/MjonMsgController.java
@@ -5062,6 +5062,7 @@ public class MjonMsgController {
 		String hstSttus = mberCmpHstVO.getHstSttus();
 		String hstType = mberCmpHstVO.getHstType();
 		String mberNm = mberCmpHstVO.getMberNm();
+		String bizType = mberCmpHstVO.getBizType();
 		String bizNo = mberCmpHstVO.getBizNo();
 		String ceoNm = mberCmpHstVO.getCeoNm();
 		String mberId = mberCmpHstVO.getMberId();
@@ -5093,12 +5094,22 @@ public class MjonMsgController {
 			}
 		}
 		
+		//기업유형
+		ComDefaultCodeVO voComCode = new ComDefaultCodeVO();
+		voComCode.setCodeId("ITN033");
+		model.addAttribute("bizTypeList", cmmUseService.selectCmmCodeDetail(voComCode));		
+		
+		// 유형 코드조회
+		voComCode.setCodeId("ITN048");
+		model.addAttribute("hstTypeList", cmmUseService.selectCmmCodeDetail(voComCode));		
+
 		model.addAttribute("pdfPath", path);
 		model.addAttribute("fileType", fileType);
 		model.addAttribute("docuDiv", docuDiv);
 		model.addAttribute("atchFileId", atchFileId);
 		model.addAttribute("workAtchFileId", workAtchFileId);
 		model.addAttribute("mberNm", mberNm);
+		model.addAttribute("bizType", bizType);
 		model.addAttribute("bizNo", bizNo);
 		model.addAttribute("ceoNm", ceoNm);
 		model.addAttribute("hstManagerNm", hstManagerNm);
diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp
index 92ffa684..90312497 100644
--- a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp
@@ -331,20 +331,24 @@ function fn_Update() {
 		<table class="tbType1">
 			<colgroup>
 				<col style="width: *%">
-				<col style="width: 12%">
-				<col style="width: 15%">
-				<col style="width: 15%">
-				<col style="width: 12%">
 				<col style="width: 6%">
+				<col style="width: 10%">
+				<col style="width: 13%">
+				<col style="width: 10%">
+				<col style="width: 12%">
+				<col style="width: 8%">
+				<col style="width: 5%">
 				<col style="width: 5%">
 			</colgroup>
 			<thead>
 				<tr>
 					<th>기업명</th>
+					<th>구분</th>
 					<th>사업자번호</th>
 					<th>대표자</th>
 					<th>담당자</th>
 					<th>휴대폰</th>
+					<th>유형</th>
 					<th>사업자</th>
 					<th>재직</th>
 				</tr>
@@ -352,11 +356,21 @@ function fn_Update() {
 			<tbody>
 				<tr>
 					<td title="${mberNm}">${mberNm}</td>
+					<td>
+                        <c:forEach var="item" items="${bizTypeList}" varStatus="status">
+                            <c:if test="${bizType == item.code}"><c:out value="${fn:substring(item.codeNm,0,2)}"/></c:if>
+                        </c:forEach>
+					</td>
 					<td title="${bizNo}">${bizNo}</td>
 					<td title="${ceoNm}">${ceoNm}</td>
 					<td title="${hstManagerNm}">${hstManagerNm}</td>
 					<td title="${hstMbtlNum}">${hstMbtlNum}</td>
 					<td>
+                        <c:forEach var="item" items="${hstTypeList}" varStatus="status">
+                            <c:if test="${hstType == item.code}"><c:out value="${item.codeNm}"/></c:if>
+                        </c:forEach>					
+					</td>
+					<td>
 						<c:if test="${not empty atchFileId}">
 							<c:import url="/cmm/fms/selectMberFileInfs.do" charEncoding="utf-8">
 								<c:param name="param_atchFileId" value="${atchFileId}" />

From 9f82da028a270dbae7733ff495fd3e6ccdaf933a Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Fri, 4 Aug 2023 14:26:16 +0900
Subject: [PATCH 07/19] =?UTF-8?q?=EA=B8=B0=EC=97=85=ED=9A=8C=EC=9B=90=20?=
 =?UTF-8?q?=EC=B2=A8=EB=B6=80=ED=8C=8C=EC=9D=BC=EB=B7=B0=EC=96=B4=20?=
 =?UTF-8?q?=EC=8A=B9=EC=9D=B8=20=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/jsp/uss/ion/msg/pdfView.jsp       | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp
index 90312497..f13dbb82 100644
--- a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp
@@ -167,16 +167,9 @@ function setHomeTaxApi() {
 
 //기업회원 신청 승인/반려 처리
 function setMberCmpHstStatusSave(hstSttus) {
-	var sMsg = "";
-	if (hstSttus == "02") {
-		sMsg = "승인";
-	}
-	else if (hstSttus == "03") {
-		sMsg = "반려";
-	}
 	
-	if (confirm(sMsg + " 하시겠습니까?")) {
-		var form = document.pdfForm;
+	if (confirm("승인 하시겠습니까?")) {
+		var form = document.confirmForm;
 		form.hstSttus.value = hstSttus;
 		var data = new FormData(form);
 		url = "/uss/umt/user/mberCmpHstStatusSaveAjax.do";
@@ -184,9 +177,6 @@ function setMberCmpHstStatusSave(hstSttus) {
 		if("${hstType}" == '02' && hstSttus == '02'){ //기업회원 전환 승인이라면 기존 mberNm -> managerNm 으로 수정
 			form.managerNm.value = "${managerNm}";
 		}
-		else {
-			form.managerNm.value = "";			
-		}
 		
 		$.ajax({
 	        type: "POST",
@@ -210,15 +200,13 @@ function setMberCmpHstStatusSave(hstSttus) {
 				} 
 				else {
 					alert(data.msg);
-					form.managerNm.value = "${managerNm}";
 					form.hstSttus.value = "${hstSttus}";					
 				}
 			},
 	        error: function (e) { 
 	        	alert("저장에 실패하였습니다."); 
 	        	alert("ERROR : " + JSON.stringify(e)); 
-	    		form.managerNm.value = "${managerNm}";
-	    		form.hstSttus.value = "${hstSttus}";	        	
+				form.hstSttus.value = "${hstSttus}";
 	        }
 	    });
 	}
@@ -561,6 +549,15 @@ function fn_Update() {
 <input type="hidden" name="mbtlNum" value="${mbtlNum}"/>
 </form>
 
+<form name="confirmForm" method="post">
+<input type="hidden" name="hstSttus" value="${hstSttus}"/>
+<input type="hidden" name="cmphstId" value="${cmphstId}"/>
+<input type="hidden" name="hstType" value="${hstType}"/>
+<input type="hidden" name="mberId" value="${mberId}"/>
+<input type="hidden" name="managerNm"/>
+<input type="hidden" name="mbtlNum" value="${mbtlNum}"/>
+</form>
+
 </body>
 </html>
 	<script type="text/javaScript" language="javascript">

From 1566b0cbe36fdb6132d59ecab95abb9c39c923f5 Mon Sep 17 00:00:00 2001
From: name <mail>
Date: Fri, 4 Aug 2023 14:39:44 +0900
Subject: [PATCH 08/19] =?UTF-8?q?=ED=9C=B4=EB=A8=BC=ED=9A=8C=EC=9B=90=20?=
 =?UTF-8?q?=EC=A0=84=ED=99=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../human/web/MjonHumanPageController.java    |  98 +++++++++
 .../let/uat/uia/web/EgovLoginController.java  |  17 +-
 .../let/uat/uia/EgovLoginUsr_SQL_Mysql.xml    | 160 ++++++++-------
 .../let/uss/umt/EgovUserManage_SQL_Mysql.xml  |  22 ++-
 .../WEB-INF/jsp/web/login/humanPage.jsp       |  47 +++++
 .../web/login/humanPageAuthenticatedPage.jsp  | 186 ++++++++++++++++++
 6 files changed, 437 insertions(+), 93 deletions(-)
 create mode 100644 src/main/java/itn/let/mjo/human/web/MjonHumanPageController.java
 create mode 100644 src/main/webapp/WEB-INF/jsp/web/login/humanPage.jsp
 create mode 100644 src/main/webapp/WEB-INF/jsp/web/login/humanPageAuthenticatedPage.jsp

diff --git a/src/main/java/itn/let/mjo/human/web/MjonHumanPageController.java b/src/main/java/itn/let/mjo/human/web/MjonHumanPageController.java
new file mode 100644
index 00000000..5883e447
--- /dev/null
+++ b/src/main/java/itn/let/mjo/human/web/MjonHumanPageController.java
@@ -0,0 +1,98 @@
+package itn.let.mjo.human.web;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+import itn.let.mjo.msgdata.web.MjonMsgDataController;
+import itn.let.uss.umt.service.EgovMberManageService;
+import itn.let.uss.umt.service.EgovUserManageService;
+import itn.let.uss.umt.service.MberManageVO;
+import itn.let.uss.umt.service.UserManageVO;
+
+@Controller
+public class MjonHumanPageController {
+	
+	/** userManageService */
+	@Resource(name = "userManageService")
+	private EgovUserManageService userManageService;
+	
+	/** mberManageService */
+	@Resource(name = "mberManageService")
+	private EgovMberManageService mberManageService;
+	
+	private static final Logger logger = LoggerFactory.getLogger(MjonMsgDataController.class);
+	
+	@RequestMapping(value="/web/user/humanPage.do")
+	public String humanPageIndex() throws Exception {
+		
+		return "web/login/humanPage";
+	}
+	
+	@RequestMapping(value="/web/user/humanPageAuthenticatedPage.do")
+	public String humanPageAuthenticatedUser() throws Exception {
+		
+		return "web/login/humanPageAuthenticatedPage";
+	}
+	
+	@RequestMapping(value="/web/user/humanCertifiedAjax.do")
+	public ModelAndView humanCertifiedAjax(
+			HttpServletRequest request, HttpServletResponse response, ModelMap model,
+			@ModelAttribute("userManageVO") UserManageVO userManageVO) throws Exception {
+		
+		ModelAndView modelAndView = new ModelAndView();
+		modelAndView.setViewName("jsonView");
+		
+		try {
+			
+			UserManageVO userInfoVO = new UserManageVO();
+			userInfoVO.setEmplyrNm(userManageVO.getEmplyrNm()); // 이름
+			userInfoVO.setMblDn(userManageVO.getMblDn());		// Dn
+			
+			List<UserManageVO> usedNmList = userManageService.selectUserIdAjax(userInfoVO);
+			
+			boolean TorF = usedNmList.size() > 0 ? true : false;
+			
+			if (!TorF) {
+				System.out.println(TorF);
+				System.out.println(TorF);
+
+				modelAndView.addObject("message", "입력하신 아이디/이름 정보에 맞는 회원이 없습니다.");
+				modelAndView.addObject("result", "fail-check");
+				modelAndView.addObject("resultSts", "0");
+				modelAndView.addObject("resultBlockSts", "0");
+
+				return modelAndView;
+			}
+			
+			MberManageVO mberManageVO = new MberManageVO();
+			// 회원 휴면회원에서 일반회원으로 업데이트
+			mberManageVO.setMberId(usedNmList.get(0).getEmplyrId()); //탈퇴사유 중 직접입력으로 타입 지정
+			mberManageVO.setDormantYn("N");
+			
+			int updateCount = mberManageService.updateUserDormant(mberManageVO); 
+			
+			if(updateCount != 0) {
+				modelAndView.addObject("result", "success");
+			}else {
+				modelAndView.addObject("result", "fail");
+			}
+		}catch (Exception e) {
+			logger.error(e.getMessage(), e);
+			
+		}
+		
+		
+		return modelAndView;
+	}
+}
diff --git a/src/main/java/itn/let/uat/uia/web/EgovLoginController.java b/src/main/java/itn/let/uat/uia/web/EgovLoginController.java
index 62f0cf26..e0006e1e 100644
--- a/src/main/java/itn/let/uat/uia/web/EgovLoginController.java
+++ b/src/main/java/itn/let/uat/uia/web/EgovLoginController.java
@@ -1635,9 +1635,10 @@ public class EgovLoginController {
 		 * 작업자 : 원영현 과장 
 		 */
 		
-		/*if(resultVO.getDormantYn().equals("Y") || resultVO.getDormantYn() == "Y") {
-		
-		}*/
+		if(resultVO.getDormantYn().equals("Y") || resultVO.getDormantYn() == "Y") {
+			
+			return "redirect:/web/user/humanPage.do";
+		}
 		
 		
 		
@@ -2936,12 +2937,12 @@ public class EgovLoginController {
 				 * 일   시 : 2023.07.25
 				 * 담당자 : 원영현 과장 수정
 				 * 내   용 : Dn 으로 회원정보 조회가 가능하도록 기능 수정
-				 *       변경된 핸드폰 번호로 조회시 정보조회가 안되기 때문에 무조건 true 로 변경
+				 *       변경된 핸드폰 번호로 조회시 정보조회가 안되기 때문에  이름과 ID를 이용하여 조건 수정
 				 * */
-				/*List<UserManageVO> usedNmList = new ArrayList<>();
+				userManageVO.setMoblphonNo("");
+				List<UserManageVO> usedNmList = new ArrayList<>();
 				usedNmList = userManageService.selectUserIdAjax2(userManageVO);
-				TorF = usedNmList.size() > 0 ? true : false;*/ 
-				TorF = true;
+				TorF = usedNmList.size() > 0 ? true : false; 
 			}
 
 
@@ -2950,7 +2951,7 @@ public class EgovLoginController {
 			if (!TorF) {
 				System.out.println(" In if TorF :: "+TorF);
 
-				modelAndView.addObject("message", "입력하신 아이디/이름/휴대폰 번호에 맞는 회원이 없습니다.");
+				modelAndView.addObject("message", "입력하신 아이디/이름에 맞는 회원이 없습니다.");
 				modelAndView.addObject("result", "fail-check");
 				modelAndView.addObject("resultSts", "0");
 				modelAndView.addObject("resultBlockSts", "0");
diff --git a/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Mysql.xml
index dd911457..1f6e57e5 100644
--- a/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Mysql.xml
@@ -26,6 +26,7 @@
 		<result property="crtfcDnValue" column="crtfcDnValue" columnIndex="16"/>
 		<result property="dept" column="dept" columnIndex="17"/>
 		<result property="outerCertYn" column="outerCertYn" columnIndex="18"/>
+		<result property="dormantYn" column="dormantYn" columnIndex="19"/>
 	</resultMap>
 	
 	<!-- 아이디 찾기를 위한 resultMap 
@@ -42,32 +43,35 @@
 	<select id="loginDAO.actionLogin" resultMap="login">
 		<isEqual property="userSe" compareValue="GNR">
 			<![CDATA[
-            SELECT MBER_ID          AS id ,
-			       MBER_NM          AS name ,
-			       PASSWORD         AS password ,
-			       IHIDNUM          AS ihidNum ,
-			       MBER_EMAIL_ADRES AS email ,
-			       'GNR'            AS userSe ,
-			       NULL		 		AS orgnztId,
-			       ESNTL_ID         AS uniqId ,
-			       PASS_MISS        AS passMiss ,
-			       'P'              AS emplyrSttusCode,
-			       SHORT_PRICE   	AS shortPrice , 
-			       LONG_PRICE 		AS longPrice , 
-			       PICTURE_PRICE  	AS picturePrice ,
-			       USER_MONEY       AS userMoney ,
-			       MBTLNUM			AS moblphonNo ,
-			       CRTFC_DN_VALUE	AS crtfcDnValue ,
-			       DEPT             AS dept,
-			       ''				AS outerCertYn
-              FROM lettngnrlmber A
-             WHERE MBER_ID = #id#
-               AND PASSWORD = #password#
-               AND MBER_STTUS = 'Y'
-            ]]>   
-            <isEmpty property="statusAll">
-            	AND EMPLYR_STTUS_CODE = 'P'
-            </isEmpty>
+			SELECT
+				MBER_ID				AS id
+				, MBER_NM			AS name
+				, PASSWORD			AS password
+				, IHIDNUM			AS ihidNum
+				, MBER_EMAIL_ADRES	AS email
+				, 'GNR'				AS userSe
+				, NULL				AS orgnztId
+				, ESNTL_ID			AS uniqId
+				, PASS_MISS			AS passMiss
+				, 'P'				AS emplyrSttusCode
+				, SHORT_PRICE		AS shortPrice
+				, LONG_PRICE		AS longPrice
+				, PICTURE_PRICE		AS picturePrice
+				, USER_MONEY		AS userMoney
+				, MBTLNUM			AS moblphonNo
+				, CRTFC_DN_VALUE	AS crtfcDnValue
+				, DEPT				AS dept
+				, ''				AS outerCertYn
+				, DORMANT_YN		AS dormantYn
+			FROM
+				lettngnrlmber A
+			WHERE MBER_ID = #id#
+				AND PASSWORD = #password#
+				AND MBER_STTUS = 'Y'
+			]]>
+			<isEmpty property="statusAll">
+				AND EMPLYR_STTUS_CODE = 'P'
+			</isEmpty>
 		</isEqual>
 		
 		<!-- // TODO : 본인인증 DI 추가 -->
@@ -316,29 +320,32 @@
 	<select id="loginDAO.siteActionLogin" resultMap="login">
 		<isEqual property="userSe" compareValue="USR">
 			<![CDATA[
-            SELECT EMPLYR_ID AS id
-                 , USER_NM AS name
-                 , PASSWORD AS password
-                 , IHIDNUM AS ihidNum
-                 , EMAIL_ADRES AS email
-                 , 'USR' AS userSe
-                 , ORGNZT_ID AS orgnztId
-                 , ESNTL_ID AS uniqId
-                 , PASS_MISS AS passMiss
-                 , EMPLYR_STTUS_CODE AS emplyrSttusCode,
-                 , SHORT_PRICE   	AS shortPrice  
-			     , LONG_PRICE 		AS longPrice  
-			     , PICTURE_PRICE  	AS picturePrice 
-			     , USER_MONEY       	AS userMoney 
-			     , ''				AS outerCertYn
-              FROM LETTNEMPLYRINFO A
-             WHERE EMPLYR_ID = #id#
-             AND PASSWORD = #password#
-             AND EMPLYR_STTUS_CODE = 'P'
-             ]]>
-            <isEmpty property="statusAll">
-           		AND EMPLYR_STTUS_CODE = 'P'
-           	</isEmpty>
+			SELECT
+				EMPLYR_ID			AS id
+				, USER_NM			AS name
+				, PASSWORD			AS password
+				, IHIDNUM			AS ihidNum
+				, EMAIL_ADRES		AS email
+				, 'USR'				AS userSe
+				, ORGNZT_ID			AS orgnztId
+				, ESNTL_ID			AS uniqId
+				, PASS_MISS			AS passMiss
+				, EMPLYR_STTUS_CODE	AS emplyrSttusCode,
+				, SHORT_PRICE		AS shortPrice  
+				, LONG_PRICE		AS longPrice  
+				, PICTURE_PRICE		AS picturePrice 
+				, USER_MONEY		AS userMoney 
+				, ''				AS outerCertYn
+				, DORMANT_YN		AS dormantYn
+			FROM
+				LETTNEMPLYRINFO A
+			WHERE EMPLYR_ID = #id#
+				AND PASSWORD = #password#
+				AND EMPLYR_STTUS_CODE = 'P'
+			]]>
+			<isEmpty property="statusAll">
+				AND EMPLYR_STTUS_CODE = 'P'
+			</isEmpty>
 		</isEqual>
 	</select>
 	
@@ -507,32 +514,35 @@
 	<select id="loginDAO.actionLoginCmpChk" resultMap="login">
 		<isEqual property="userSe" compareValue="GNR">
 			<![CDATA[
-            SELECT MBER_ID          AS id ,
-			       MBER_NM          AS name ,
-			       PASSWORD         AS password ,
-			       IHIDNUM          AS ihidNum ,
-			       MBER_EMAIL_ADRES AS email ,
-			       'GNR'            AS userSe ,
-			       NULL		 		AS orgnztId,
-			       ESNTL_ID         AS uniqId ,
-			       PASS_MISS        AS passMiss ,
-			       'P'              AS emplyrSttusCode,
-			       SHORT_PRICE   	AS shortPrice , 
-			       LONG_PRICE 		AS longPrice , 
-			       PICTURE_PRICE  	AS picturePrice ,
-			       USER_MONEY       AS userMoney ,
-			       MBTLNUM			AS moblphonNo ,
-			       CRTFC_DN_VALUE	AS crtfcDnValue ,
-			       DEPT             AS dept,
-			       ''				AS outerCertYn
-              FROM lettngnrlmber A
-             WHERE MBER_ID = #id#
-               AND PASSWORD = #password#
-               AND MBER_STTUS = #emplyrSttusCode#
-            ]]>   
-            <isEmpty property="statusAll">
-            	AND EMPLYR_STTUS_CODE = 'P'
-            </isEmpty>
+			SELECT
+				MBER_ID				AS id
+				, MBER_NM			AS name
+				, PASSWORD			AS password
+				, IHIDNUM			AS ihidNum
+				, MBER_EMAIL_ADRES	AS email
+				, 'GNR'				AS userSe
+				, NULL				AS orgnztId
+				, ESNTL_ID			AS uniqId
+				, PASS_MISS			AS passMiss
+				, 'P'				AS emplyrSttusCode
+				, SHORT_PRICE		AS shortPrice
+				, LONG_PRICE		AS longPrice
+				, PICTURE_PRICE		AS picturePrice
+				, USER_MONEY		AS userMoney
+				, MBTLNUM			AS moblphonNo
+				, CRTFC_DN_VALUE	AS crtfcDnValue
+				, DEPT				AS dept
+				, ''				AS outerCertYn
+				, DORMANT_YN		AS dormantYn
+			FROM
+				lettngnrlmber A
+			WHERE MBER_ID = #id#
+				AND PASSWORD = #password#
+				AND MBER_STTUS = #emplyrSttusCode#
+			]]>
+			<isEmpty property="statusAll">
+				AND EMPLYR_STTUS_CODE = 'P'
+			</isEmpty>
 		</isEqual>
 		
 		<isEqual property="userSe" compareValue="USR">
diff --git a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml
index 5de708d5..a1cf33f3 100644
--- a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml
@@ -515,22 +515,24 @@
     </select>
     
     <select id="userManageDAO.selectUserIdAjax" 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
-		WHERE  (a.MBER_NM          = #emplyrNm#
-		OR a.MANAGER_NM          = #emplyrNm#)
+		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
+			AND (a.MBER_NM = #emplyrNm# OR a.MANAGER_NM = #emplyrNm#)
 		<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="mblDn">
-			AND    a.CRTFC_DN_VALUE = #mblDn#
+			AND a.CRTFC_DN_VALUE = #mblDn#
 		</isNotEmpty>
-    </select>
+	</select>
 
     <select id="userManageDAO.selectUserIdAjax2" parameterClass="userVO" resultClass="userVO">
 		SELECT
diff --git a/src/main/webapp/WEB-INF/jsp/web/login/humanPage.jsp b/src/main/webapp/WEB-INF/jsp/web/login/humanPage.jsp
new file mode 100644
index 00000000..c607334d
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/web/login/humanPage.jsp
@@ -0,0 +1,47 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+
+<script type="text/javascript">
+function humanCancel(){
+	window.location.href='/web/main/mainPage.do';
+}
+
+function humanAuthenticatedPage(){
+	window.location.href='/web/user/humanPageAuthenticatedPage.do';
+}
+</script>
+
+
+<form:form id="userManageVO" name="userManageVO" action="" method="post">
+	<!-- content 영역 -->
+	<div class="inner">
+		<!-- send top -->
+		<div class="send_top">
+			<!-- 마이페이지 - 로그인 -->
+			<div class="mypage_content current">
+				<div class="heading">
+					<h2>로그인</h2>
+				</div>
+				<div class="mem_cont_in widthM login_wrap">
+					<div class="img_area">
+						<img src="/publish/images/mem/img_logindormant_bg.png" alt="">
+					</div>
+					<div class="input_list">
+						<p class="welcome">회원님은 <span>장기 미이용</span> 회원이십니다.</p>
+						<p class="welcome_sub">아래 확인 버튼을 클릭하시면 문자온의 모든 서비스를 정상적으로 이용하기 위한 절차를 진행합니다.</p>
+						
+						<div class="mem_btnWrap4">
+							<button type="button" class="mem_btnok" onclick="humanAuthenticatedPage(); return false;">확인</button>
+							<button type="button" class="mem_btncancel" onclick="humanCancel(); return false;">취소</button>
+						</div>
+					</div>
+				</div>
+			</div>
+			<!--// 마이페이지 - 로그인 -->
+		</div>
+		<!--// send top -->
+	</div>
+	<!--// content 영역 -->
+</form:form>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/web/login/humanPageAuthenticatedPage.jsp b/src/main/webapp/WEB-INF/jsp/web/login/humanPageAuthenticatedPage.jsp
new file mode 100644
index 00000000..3acf61e6
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/web/login/humanPageAuthenticatedPage.jsp
@@ -0,0 +1,186 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+
+<script type="text/javascript">
+function humanCancel(){
+	window.location.href='/web/main/mainPage.do';
+}
+
+function humanAuthenticated(){
+	
+	var userId 		= $('#humanPage_userId').val().toLowerCase();
+	var userNm 		= $('#humanPage_userNm').val(); 
+	var moblphonNo 	= $('#humanPage_userPhone').val();
+	
+	if(userId == ''){
+		alert("아이디를 입력해주세요.");
+		$('#humanPage_userId').focus();
+		return;
+	}
+	if(userNm == ''){
+		alert("이름을 입력해주세요.");
+		$('#humanPage_userNm').focus();
+		return;
+	}
+	if(moblphonNo == ''){
+		alert("휴대폰 번호를 입력해주세요.");
+		$('#humanPage_userPhone').focus();
+		return;
+	}
+	
+	document.reqKMCISForm.mberNm.value = $('#humanPage_userNm').val();
+	document.reqKMCISForm.moblphonNo.value = $('#humanPage_userPhone').val();
+	document.reqKMCISForm.mberId.value = $('#humanPage_userId').val().toLowerCase();
+	
+	var kmcPopUpForm = $("form[name=reqKMCISForm]").serialize() ;
+	$.ajax({
+		url : "<c:url value='/web/user/login/kmcPopupIdPwPramAjax.do' />"
+		, type : 'POST'
+		, data : kmcPopUpForm
+		, dataType:'json'
+		, success : function(returnData, status){
+			if(status == "success") {
+				if (returnData.result=="success"){
+					$("#tr_cert").val(returnData.tr_cert);
+					$("#tr_url").val(returnData.tr_url);
+					$("#tr_add").val(returnData.tr_add);
+					openKMCISWindow();
+				}else{
+					alert(returnData.message);
+				}
+			}else{
+				alert("실패");return;
+			}
+		}
+		, error : function(request , status, error){
+			alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
+		}
+	});
+}
+
+function openKMCISWindow(){
+	var UserAgent = navigator.userAgent;
+	/* 모바일 접근 체크*/
+	// 모바일일 경우 (변동사항 있을경우 추가 필요)
+	if(UserAgent.match(/iPhone|iPod|Android|Windows CE|BlackBerry|Symbian|Windows Phone|webOS|Opera Mini|Opera Mobi|POLARIS|IEMobile|lgtelecom|nokia|SonyEricsson/i) != null || UserAgent.match(/LG|SAMSUNG|Samsung/) != null) {
+		document.reqKMCISForm.target = 'KMCISWindow';  // 모바일
+	}
+
+	// 모바일이 아닐 경우
+	else {
+		KMCIS_window = window.open('', 'KMCISWindow', 'width=425, height=550, resizable=0, scrollbars=no, status=0, titlebar=0, toolbar=0, left=435, top=250' );
+		
+		if(KMCIS_window == null){
+		alert(" ※ 윈도우 XP SP2 또는 인터넷 익스플로러 7 사용자일 경우에는 \n    화면 상단에 있는 팝업 차단 알림줄을 클릭하여 팝업을 허용해 주시기 바랍니다. \n\n※ MSN,야후,구글 팝업 차단 툴바가 설치된 경우 팝업허용을 해주시기 바랍니다.");
+	}
+		document.reqKMCISForm.target = 'KMCISWindow';
+	}
+
+	document.reqKMCISForm.action = 'https://www.kmcert.com/kmcis/web/kmcisReq.jsp';
+	document.reqKMCISForm.submit();
+
+}
+
+
+function fnAddUserView() {
+	
+	var resultForm = $("form[name=resultForm]").serialize() ;
+	$.ajax({
+		url : "<c:url value='/web/user/humanCertifiedAjax.do' />"
+		, type : 'POST'
+		, data : resultForm
+		, dataType:'json'
+		, success : function(returnData, status){
+			if(status == "success") {
+				if (returnData.result=="success"){
+					alert("회원정보 복원이 완료되었습니다.\n고객님의 안전한 사아트 이용을 위하여 다시 로그인 부탁드립니다.");
+					location.href="/web/user/login/login.do";
+					return;
+				}else{
+					alert("회원정보 복원에 오류가 발행했습니다.\n다시 인증 부탁드립니다.");
+					return;
+				}
+			}else{
+				alert("실패");return;
+			}
+		}
+		, error : function(request , status, error){
+			alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
+		}
+	});
+}
+
+</script>
+
+<!-- kmc 본인인증 결과 데이터 set -->
+<form name="resultForm" id="resultForm" method="post" action="#">
+	<input type="hidden" name="emplyrNm" id="emplyrNm" value="">
+	<input type="hidden" name="moblphonNo" id="moblphonNo" value="">
+	<input type="hidden" name="mblDn" id="mblDn" value="">
+	<input type="hidden" name="findType" id="findType" value="kmc">
+	<input type="hidden" name="emplyrId" id="emplyrId" value="">
+</form>
+
+<form name="reqKMCISForm" method="post" action="#">
+	<input type="hidden" name="tr_cert" id="tr_cert" value = "${tr_cert}">
+	<input type="hidden" name="tr_url"  id="tr_url" value = "${tr_url}">
+	<input type="hidden" name="tr_add"  id="tr_add" value = "${tr_add}">
+	<input type="hidden" name="mberNm" id="mberNm" value="">
+	<input type="hidden" name="moblphonNo" id="moblphonNo" value="">
+	<input type="hidden" name="mberId" id="mberId" value="">
+	<input type="hidden" name="authRUrl" id="authRUrl" value="/web/cop/kmc/authRequestFindIdPwAjax.do">
+	<input type="hidden" name="authRUrlCode" id="authRUrlCode" value="001005">
+</form>
+
+<!-- content 영역 -->
+<div class="inner">
+	<!-- send top -->
+	<div class="send_top">
+		<!-- 마이페이지 - 로그인 -->
+		<div class="mypage_content current">
+			<div class="heading">
+				<h2>로그인</h2>
+			</div>
+			<div class="mem_cont_in widthM login_wrap">
+				<div class="img_area">
+					<img src="/publish/images/mem/img_logindormant_bg.png" alt="">
+				</div>
+				<div class="input_list dormant_input_list">
+					<p class="welcome">회원님은 <span>장기 미이용</span> 회원이십니다.</p>
+					<div class="input_list listType1">
+						<div class="input_list_item">
+							<div class="input_left">아이디</div>
+							<div class="input_right">
+								<label for="humanPage_userId" class="label">아이디 입력</label>
+								<input type="text" name="humanPage_userId" id="humanPage_userId" class="list_inputType1 colorLight" placeholder="아이디를 입력하세요" onfocus="this.placeholder=''" onblur="this.placeholder='아이디를 입력하세요'">
+							</div>
+						</div>
+						<div class="input_list_item">
+							<div class="input_left">이름</div>
+							<div class="input_right">
+								<label for="humanPage_userNm" class="label">이름 입력</label>
+								<input type="text" name="humanPage_userNm" id="humanPage_userNm" class="list_inputType1 colorLight" placeholder="이름을 입력하세요" onfocus="this.placeholder=''" onblur="this.placeholder='이름을 입력하세요'">
+							</div>
+						</div>
+						<div class="input_list_item">
+							<div class="input_left">휴대폰번호</div>
+							<div class="input_right">
+								<label for="humanPage_userPhoneCheck" class="label">휴대폰번호 입력</label>
+								<input type="text" class="list_inputType1" name="humanPage_userPhone" id="humanPage_userPhone" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');" placeholder="‘-’ 없이 숫자만 입력" onfocus="this.placeholder=''" onblur="this.placeholder='‘-’ 없이 숫자만 입력'">
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="mem_btnWrap4">
+					<button type="button" class="mem_btnok" onclick="humanAuthenticated(); return false;">확인</button>
+					<button type="button" class="mem_btncancel" onclick="humanCancel(); return false;">취소</button>
+				</div>
+			</div>
+		</div>
+		<!--// 마이페이지 - 로그인 -->
+	</div>
+	<!--// send top -->
+</div>
+<!--// content 영역 -->

From 3c83d28a082a61de80ef35d41d64d8249ad0bcc5 Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Fri, 4 Aug 2023 15:02:13 +0900
Subject: [PATCH 09/19] =?UTF-8?q?=EA=B8=B0=EC=97=85=ED=9A=8C=EC=9B=90?=
 =?UTF-8?q?=EC=8B=A0=EC=B2=AD=ED=9B=84=20=EC=9D=B4=EB=AF=B8=20=EC=8A=B9?=
 =?UTF-8?q?=EC=9D=B8=EC=B2=98=EB=A6=AC=EB=90=9C=EA=B2=BD=EC=9A=B0=20?=
 =?UTF-8?q?=EC=A4=91=EB=B3=B5=20=EC=8B=A0=EC=B2=AD=20=EC=95=88=EB=90=98?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EB=B3=B4=EC=99=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../let/uat/uia/web/EgovMypageController.java |   6 +-
 .../WEB-INF/jsp/uss/ion/msg/pdfView.jsp       |   6 +-
 .../WEB-INF/jsp/uss/ion/msg/pdfViewPhone.jsp  |   2 +
 .../jsp/web/user/membershipChangeOk.jsp       | 122 ++++++++++++++++++
 4 files changed, 132 insertions(+), 4 deletions(-)
 create mode 100644 src/main/webapp/WEB-INF/jsp/web/user/membershipChangeOk.jsp

diff --git a/src/main/java/itn/let/uat/uia/web/EgovMypageController.java b/src/main/java/itn/let/uat/uia/web/EgovMypageController.java
index 1407da45..69db77e0 100644
--- a/src/main/java/itn/let/uat/uia/web/EgovMypageController.java
+++ b/src/main/java/itn/let/uat/uia/web/EgovMypageController.java
@@ -1003,8 +1003,10 @@ public class EgovMypageController {
 				}else if("03".equals(cmpChangeManageVO.getHstSttus())) { //가장 마지막 기업회원전환이 반려 상태일 시
 					model.addAttribute("cmpChangeManageVO", cmpChangeManageVO);
 					return "web/user/membershipChangeReturn";
-				}
-				
+				}else if("02".equals(cmpChangeManageVO.getHstSttus())) { //가장 마지막 기업회원전환이 승인 상태일 시
+					model.addAttribute("cmpChangeManageVO", cmpChangeManageVO);
+					return "web/user/membershipChangeOk";
+				}				
 			}
 		}
 		
diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp
index f13dbb82..698f12bf 100644
--- a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp
@@ -481,8 +481,10 @@ function fn_Update() {
 				</thead>
 				</table>
 				<div class="button_box" style="margin-top: 15px;">
-						<button type="button" class="btnType btnType20" onClick="fn_Update(); return false;" style="background-color: blue;">반려</button>
-						<button type="button" class="btnType btnType20" onClick="setRejectAreaCall('HIDE'); return false;">취소</button>
+				<%-- 
+					<button type="button" class="btnType btnType20" onClick="fn_Update(); return false;" style="background-color: blue;">반려</button>
+					<button type="button" class="btnType btnType20" onClick="setRejectAreaCall('HIDE'); return false;">취소</button>
+				--%>
 				</div>
 			</form>
 		</div>
diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfViewPhone.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfViewPhone.jsp
index 4836b4bc..783f6add 100644
--- a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfViewPhone.jsp
+++ b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfViewPhone.jsp
@@ -322,8 +322,10 @@ function setRejectAreaHide() {
 					<td class="left" style="padding: 10px 0 10px 0; line-height: 1.6em;">${requiredDocuments}</td>
 					<td style="padding: 10px 0 10px 0; vertical-align: middle;">
 						<c:if test="${authYn eq 'H'}">
+							<%-- 
 							<button class="btnType1" onclick="updateAuthYn('<c:out value='${phmId}'/>', 'Y', '<c:out value='${userId}'/>'); return false;" style="background-color: blue;">인증완료</button>
 							<button class="btnType1" onclick="setRejectAreaCall('SHOW'); return false;" id="btnReject">반려 OPEN</button>
+							--%>
 						</c:if>
 					</td>
 				</tr>
diff --git a/src/main/webapp/WEB-INF/jsp/web/user/membershipChangeOk.jsp b/src/main/webapp/WEB-INF/jsp/web/user/membershipChangeOk.jsp
new file mode 100644
index 00000000..d8f3b78c
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/web/user/membershipChangeOk.jsp
@@ -0,0 +1,122 @@
+	<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@ taglib prefix="ec" uri="/WEB-INF/tld/ecnet_tld.tld"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+
+<script src="https://t1.daumcdn.net/mapjsapi/bundle/postcode/prod/postcode.v2.js"></script>
+<script language=javascript>
+$(document).ready(function(){
+	$(".fileView").children('img').remove()
+});
+
+
+var doubleSubmitFlag = false; //중복 등록 방지를 위한 변수
+function membershipChange(){
+	
+	var form = document.mberManageVO;
+	
+	 if($("#atFileBasicWrite").val() == '' && $("#atchFileSttus").val() == 'N'){
+		alert("사업자등록증을 첨부해주세요.")
+		return false;
+	}
+	if($("#atFileBasicWriteWork").val() == '' && $("#workAtchFileSttus").val() == 'N' ){
+		alert("재직증명서를 첨부해주세요.")
+		return false;
+	}
+	 
+	/* if($("#atFileBasicWriteWork").val() == ''){
+		alert("재직증명서를 첨부해주세요.")
+		return false;
+	} */
+	
+
+	if(doubleSubmitFlag){
+		alert("이미 재등록하셨습니다.");
+		return false;
+	}else{	
+		var _fileForm2 = new Array();
+		var data = new FormData(form);
+		_fileForm2.forEach(function(obj, idx) {
+			if (obj) data.append("file"+idx, obj.fileObj);
+		});
+		$.ajax({
+			cache : false
+			,url : "<c:url value='/web/user/updateMembershipChangeAjax.do'/>"
+			,async:false
+			,type : 'POST'
+			,data : data
+			,dataType:'json'
+			,processData: false
+			,contentType: false
+			,success : function(returnData, status){
+				if(returnData.result == "success") {
+					alert("기업회원전환 재등록이 완료되었습니다.");
+					doubleSubmitFlag = true;
+					 location.href='/web/user/membershipChange.do'; //마이페이지로 이동
+				} else{ 
+					alert(returnData.message);
+					return;
+				}
+			}
+			,error : function(request , status, error){
+				alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
+			}
+		});
+	}
+}
+
+function changeValue(obj){ 
+	$('#atFileBasicWrite').val(obj.value);
+}
+
+function changeValueWork(obj){ 
+	$('#atFileBasicWriteWork').val(obj.value);
+}
+
+</script>
+<div class="inner">
+	<!-- send top -->
+	<div class="send_top">
+		<!-- tab button -->
+		<%@include file="/WEB-INF/jsp/web/user/mypageHeader.jsp" %>
+		<!--// tab button -->
+		<!-- 마이페이지 - 기업회원 전환 -->
+		<form id="mberManageVO" name="mberManageVO" action="/web/user/login/usrJoinInsert.do" method="post" enctype="Multipart/form-data">
+			<input type="hidden" name="mberId" value="${cmpChangeManageVO.mberId}"/>
+			<input type="hidden" name="uniqId" value="${cmpChangeManageVO.uniqId}"/>
+			<input type="hidden" name="bizType" value="${cmpChangeManageVO.bizType}"/>
+			<input type="hidden" name="mberNm" value="${cmpChangeManageVO.mberNm}"/>
+			<input type="hidden" name="ceoNm" value="${cmpChangeManageVO.ceoNm}"/>
+			<input type="hidden" name="bizNo" value="${cmpChangeManageVO.bizNo}"/>
+			<input type="hidden" name="managerNm" value="${loginVO.name}"/> <!-- 담당자 명 -->
+			<input type="hidden" name="atchFileSttus" id="atchFileSttus" value="${cmpChangeManageVO.atchFileSttus}"/>
+			<input type="hidden" name="workAtchFileSttus" id="workAtchFileSttus" value="${cmpChangeManageVO.workAtchFileSttus}"/>
+			<!-- 재등록 전 기존 첨부파일 ID, atchFIleId를 사용하지 못하는 이유 - 첨부파일 다운로드 공통(selectBBSFileInfs.do)에서 이미 name="atchFileId" 사용 -->
+			<input type="hidden" name="beforeAtchFileId" id="beforeAtchFileId" value="${cmpChangeManageVO.atchFileId}"/>
+			<input type="hidden" name="beforeWorkAtchFileId" id="beforeWorkAtchFileId" value="${cmpChangeManageVO.workAtchFileId}"/>
+			
+			<div class="mypage_content current" id="tab5_2">
+				<div class="heading">
+					<h2>기업회원 전환</h2>
+				</div>
+				<div class="mem_cont_in">
+					<div class="text_top">
+						<p>
+							고객님이 신청한 기업회원 전환신청은  <strong>승인</strong>되었습니다.<br/>재로그인해주세요.
+						</p>
+					</div>
+					
+					<br /><br />
+					<div class="mem_btnWrap2">
+						<button type="button" class="mem_btn3" style="width: 100%;" onclick="location.href='/web/uat/uia/actionLogout.do'">로그아웃</button>
+					</div>
+				</div>
+			</div>
+			<!--// 마이페이지 - 비밀번호 변경 -->
+		</form>
+	</div>
+	<!--// send top --> 
+</div>
+<!--// content 영역 -->

From 5971f7cdafba81caeb9cffd75198959f29fc473d Mon Sep 17 00:00:00 2001
From: name <mail>
Date: Fri, 4 Aug 2023 17:48:17 +0900
Subject: [PATCH 10/19] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EB=A1=9C?=
 =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Mysql.xml  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Mysql.xml
index 1f6e57e5..839dde41 100644
--- a/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/let/uat/uia/EgovLoginUsr_SQL_Mysql.xml
@@ -95,6 +95,7 @@
 			     , CRTFC_DN_VALUE	AS crtfcDnValue
 			     , ''             	AS dept
 			     , OUTER_CERT_YN	AS outerCertYn
+			     , ''				AS dormantYn
               FROM LETTNEMPLYRINFO A
              WHERE EMPLYR_ID = #id#
                AND PASSWORD = #password#

From e6bd02d0a12b691017c85aafa2f5d7bc014d2527 Mon Sep 17 00:00:00 2001
From: jiwoo <jiwoo@DESKTOP-SIDMR4Q>
Date: Mon, 7 Aug 2023 10:59:23 +0900
Subject: [PATCH 11/19] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20?=
 =?UTF-8?q?=EB=B3=B4=EC=95=88=EC=B7=A8=EC=95=BD=EC=A0=90=20=EC=A1=B0?=
 =?UTF-8?q?=EC=B9=98.=2010=EA=B0=9C=EC=9D=98=20URL=20=EA=B2=80=EC=83=89=20?=
 =?UTF-8?q?=EC=B0=A8=EB=8B=A8=EC=9D=84=20=EC=9C=84=ED=95=B4=20robots.txt?=
 =?UTF-8?q?=EC=97=90=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/robots.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)

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

From c9724e7fc487ba25da43d9bd98e3ba0bba09ac2d Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Mon, 7 Aug 2023 14:04:29 +0900
Subject: [PATCH 12/19] =?UTF-8?q?=EC=B2=A8=EB=B6=80=ED=8C=8C=EC=9D=BC=20?=
 =?UTF-8?q?=EB=B7=B0=EC=96=B4=EC=97=90=20=EC=8A=B9=EC=9D=B8/=EB=B0=98?=
 =?UTF-8?q?=EB=A0=A4=20=EA=B8=B0=EB=8A=A5=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itn/let/uss/umt/web/EgovMberCmpHstController.java     | 8 ++++++++
 src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp       | 6 +++---
 src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfViewPhone.jsp  | 2 --
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main/java/itn/let/uss/umt/web/EgovMberCmpHstController.java b/src/main/java/itn/let/uss/umt/web/EgovMberCmpHstController.java
index 41a8d16a..42fd91ac 100644
--- a/src/main/java/itn/let/uss/umt/web/EgovMberCmpHstController.java
+++ b/src/main/java/itn/let/uss/umt/web/EgovMberCmpHstController.java
@@ -329,6 +329,10 @@ public class EgovMberCmpHstController {
     		msg = "오류 : " + e.getMessage();
     	}
 		
+		System.out.println("############### 기업회원 승인 ###############");
+		System.out.println("updtCnt : " + updtCnt);
+		System.out.println("mberCmpHstVO.getHstType() : " + mberCmpHstVO.getHstType());
+		
 		//심사처리 완료 시 문자 발송 - 회원가입, 기업회원전환 안내만 발송되게 수정 220613
     	if(updtCnt == 1 && ("01".equals(mberCmpHstVO.getHstType()) || "02".equals(mberCmpHstVO.getHstType()))) { 
     		
@@ -712,6 +716,10 @@ public class EgovMberCmpHstController {
 			msg = "오류 : " + e.getMessage();
 		}
 		
+		System.out.println("############### 기업회원 반려 ###############");
+		System.out.println("updtCnt : " + updtCnt);
+		System.out.println("mberCmpHstVO.getHstType() : " + mberCmpHstVO.getHstType());
+			
 		//심사처리 완료 시 문자 발송 - 회원가입, 기업회원전환 안내만 발송되게 수정 220613
 		if(updtCnt == 1 && ("01".equals(mberCmpHstVO.getHstType()) || "02".equals(mberCmpHstVO.getHstType()))) { 
 			
diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp
index 698f12bf..5bb4c75a 100644
--- a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp
@@ -481,10 +481,10 @@ function fn_Update() {
 				</thead>
 				</table>
 				<div class="button_box" style="margin-top: 15px;">
-				<%-- 
-					<button type="button" class="btnType btnType20" onClick="fn_Update(); return false;" style="background-color: blue;">반려</button>
+					<c:if test="${hstSttus eq '01'}">
+						<button type="button" class="btnType btnType20" onClick="fn_Update(); return false;" style="background-color: blue;">반려</button>
+					</c:if>				
 					<button type="button" class="btnType btnType20" onClick="setRejectAreaCall('HIDE'); return false;">취소</button>
-				--%>
 				</div>
 			</form>
 		</div>
diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfViewPhone.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfViewPhone.jsp
index 783f6add..4836b4bc 100644
--- a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfViewPhone.jsp
+++ b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfViewPhone.jsp
@@ -322,10 +322,8 @@ function setRejectAreaHide() {
 					<td class="left" style="padding: 10px 0 10px 0; line-height: 1.6em;">${requiredDocuments}</td>
 					<td style="padding: 10px 0 10px 0; vertical-align: middle;">
 						<c:if test="${authYn eq 'H'}">
-							<%-- 
 							<button class="btnType1" onclick="updateAuthYn('<c:out value='${phmId}'/>', 'Y', '<c:out value='${userId}'/>'); return false;" style="background-color: blue;">인증완료</button>
 							<button class="btnType1" onclick="setRejectAreaCall('SHOW'); return false;" id="btnReject">반려 OPEN</button>
-							--%>
 						</c:if>
 					</td>
 				</tr>

From daf95739afba0de3a140641a03a6f72650f12572 Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Mon, 7 Aug 2023 15:23:39 +0900
Subject: [PATCH 13/19] =?UTF-8?q?=EA=B8=B0=EC=97=85=ED=9A=8C=EC=9B=90=20?=
 =?UTF-8?q?=EC=B2=A8=EB=B6=80=ED=8C=8C=EC=9D=BC=20=EB=B7=B0=EC=96=B4=20?=
 =?UTF-8?q?=EA=B5=AD=EC=84=B8=EC=B2=AD=20API=20=EA=B8=B0=EB=8A=A5=20?=
 =?UTF-8?q?=EB=B3=B4=EC=99=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/jsp/uss/ion/msg/pdfView.jsp       | 34 ++++++++++++-------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp
index 5bb4c75a..f3237c58 100644
--- a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp
@@ -52,6 +52,12 @@ input[type="checkbox"] {
   position: relative;
   vertical-align: middle;
 }
+input[type="text"] {
+  padding: 0 7px 0 7px;
+  min-width: 70px;
+  width: 90px;  
+}
+
 </style>
 
 <script type="text/javaScript" language="javascript">
@@ -93,7 +99,7 @@ function biznoPop() {
 
 // 머니핀 Show
 function setMoneyPinShow() {
-	$("#btnMoneypin").text("머니핀 페이지 CLOSE");
+	$("#btnMoneypin").text("머니핀 CLOSE");
 	$("#btnMoneypin").removeClass("btnType1");
 	$("#btnMoneypin").addClass("btnType2");
 	
@@ -105,7 +111,7 @@ function setMoneyPinShow() {
 
 // 머니핀 Hide
 function setMoneyPinHide() {
-	$("#btnMoneypin").text("머니핀 페이지 OPEN");
+	$("#btnMoneypin").text("머니핀 OPEN");
 	$("#btnMoneypin").removeClass("btnType2");
 	$("#btnMoneypin").addClass("btnType1");
 	
@@ -122,17 +128,17 @@ function setHomeTaxApi() {
 	var v_start_dt	=	$('#start_dt').val();
 	
 	if (v_start_dt==""){
-		alert("설립일은 필수값 입니다.\n제출한 사업자 등록증에서 해당 값을 확인 하시고 입력해주세요~");
+		alert("설립일(개업일)은 필수값 입니다.\n제출한 사업자 등록증에서 해당 값을 확인 하시고 입력해주세요~");
 		return;	
 	}
-	
+
 	$.ajax({
         url : "<c:url value='/uss/umt/user/checkBizNoTaxAjax.do' />", 
         type : 'POST', 
         data : { 
-        	"b_no": "${bizNo}"			//사업자등록번호
-        	, "b_nm": "${mberNm}"		//업체명
-        	, "p_nm": "${ceoNm}"		//대표자명
+        	"b_no": $("#bizNo").val()			//사업자등록번호
+        	, "b_nm": $("#mberNmC").val()		//업체명
+        	, "p_nm": $("#ceoNm").val()		//대표자명
         	, "start_dt": v_start_dt	//설립일자
        	},
         dataType:'json',
@@ -151,7 +157,7 @@ function setHomeTaxApi() {
 			            	 *  13: 폐업자        	
         	*/
 			if (data.result=='11') {
-				alert('기업이름, 사업자번호, 대표자 성명, 설립일 모두 정상값으로 확인되었습니다.');
+				alert('기업정보 모두 정상값으로 확인되었습니다.\n기업이름, 사업자번호, 대표자 성명, 설립일');
 			} 
 			else {
 				alert("데이터 검증에 실패했습니다."+data.msg);
@@ -403,15 +409,19 @@ function fn_Update() {
 		<table class="tbType1">
 			<colgroup>
 				<col style="width: *%">
-				<col style="width: 25%">
+				<col style="width: 20%">
 			</colgroup>
 			<thead>
 				<tr>
 					<td class="left" style="padding: 10px 0 10px 0; line-height: 1.6em;">
-						<button id="btnMoneypin" class="btnType1" onclick="biznoPop();return false;">머니핀 페이지 OPEN</button>
+						<button id="btnMoneypin" class="btnType1" onclick="biznoPop();return false;">머니핀 OPEN</button>
+
 						&nbsp;&nbsp;&nbsp;
-						<input id="start_dt" name="start_dt" class="recentSearch" type="text" value="" size="25" title="설립일" maxlength="10" placeholder="설립일(개업일) ex:2018-02-08"/>						
-						<button class="btnType1" onclick="setHomeTaxApi(); return false;">국세청 API호출</button>
+						<input type="text" name="mberNmC" id="mberNmC" value="${mberNm}" style="width: 120px;" />	<!-- 회사명 -->
+						<input type="text" name="ceoNm" id="ceoNm" value="${ceoNm}"/>	<!-- 대표자명 -->
+						<input type="text" name="bizNo" id="bizNo" value="${bizNo}"/>	<!-- 사업자등록번호 -->													
+						<input type="text" name="start_dt" id="start_dt" style="width: 160px !important;" value="" title="설립일" maxlength="10" placeholder="설립일 Ex:20180208"/>						
+						<button class="btnType1" onclick="setHomeTaxApi(); return false;">국세청</button>							
 					</td>
 					<td style="padding: 10px 0 10px 0; vertical-align: middle;">
 						<c:if test="${hstSttus eq '01'}">

From 6e19c8275870e718975a10ad42266fd70cc3b656 Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Mon, 7 Aug 2023 15:32:07 +0900
Subject: [PATCH 14/19] =?UTF-8?q?[=EC=9D=B4=EC=9A=A9=EC=A0=95=EC=A7=80]=20?=
 =?UTF-8?q?=3D>=20[=EB=B0=9C=EC=86=A1=EC=B7=A8=EC=86=8C]=20=EB=A1=9C=20?=
 =?UTF-8?q?=EB=AC=B8=EA=B5=AC=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsp/cmm/uss/umt/EgovGnrlUserSelectMsgDataListPop.jsp      | 2 +-
 .../webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp | 4 ++--
 .../ion/kakaoat/EgovGnrlselectedUserKakaoATDataListAjax.jsp   | 2 +-
 .../webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp | 2 +-
 .../webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp    | 2 +-
 .../webapp/WEB-INF/jsp/uss/ion/kakaoft/SendKakaoFTList.jsp    | 2 +-
 src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp       | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectMsgDataListPop.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectMsgDataListPop.jsp
index 5831cc10..5c5f71ab 100644
--- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectMsgDataListPop.jsp
+++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectMsgDataListPop.jsp
@@ -670,7 +670,7 @@ function fn_updateSendRealTime(userId, msgGroupId){
 										<c:choose>
 											<c:when test="${result.delayCompleteYn eq 'Y' && not empty result.cancelDate}">
 												<span style="color: blue;">
-													[이용정지]<br/>
+													[발송취소]<br/>
 													<c:out value="${result.cancelDate}"/>
 												</span>
 											</c:when>
diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp
index 613195f1..ed73997d 100644
--- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp
+++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp
@@ -3815,7 +3815,7 @@ function kakaoATDelayCancel(msgGroupId){
 																	</c:when>
 																	<c:when test="${mjonMsgSentList.delayYn eq 'Y' && mjonMsgSentList.delayCompleteYn eq 'Y' && not empty mjonMsgSentList.cancelDate}">
 																		<span style="color: red;">
-																			[이용정지]<br />
+																			[발송취소]<br />
 																			<fmt:formatDate value="${mjonMsgSentList.cancelDate}" pattern="MM-dd HH:mm"/>
 																		</span>
 																	</c:when>
@@ -4022,7 +4022,7 @@ function kakaoATDelayCancel(msgGroupId){
 																	</c:when>
 																	<c:when test="${mjonMsgSentList.delayYn eq 'Y' && mjonMsgSentList.delayCompleteYn eq 'Y' && not empty mjonMsgSentList.cancelDate}">
 																		<span style="color: red;">
-																			[이용정지]<br />
+																			[발송취소]<br />
 																			<fmt:formatDate value="${mjonMsgSentList.cancelDate}" pattern="yyyy-MM-dd HH:mm"/>
 																		</span>
 																	</c:when>
diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/EgovGnrlselectedUserKakaoATDataListAjax.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/EgovGnrlselectedUserKakaoATDataListAjax.jsp
index 4c74f4cc..cc5d5adc 100644
--- a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/EgovGnrlselectedUserKakaoATDataListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/EgovGnrlselectedUserKakaoATDataListAjax.jsp
@@ -594,7 +594,7 @@ function msgDetailClose(obj){
 										<c:choose>
 											<c:when test="${result.delayCompleteYn eq 'Y' && not empty result.cancelDate}">
 												<span style="color: blue;">
-													[이용정지]<br/>
+													[발송취소]<br/>
 													<c:out value="${result.cancelDate}"/>
 												</span>
 											</c:when>
diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp
index 76e2033c..7855cc2f 100644
--- a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp
@@ -554,7 +554,7 @@ function fnSmishingUpdate(flag) {
 										<c:choose>
 											<c:when test="${result.atDelayCompleteYn eq 'Y' && not empty result.cancelDate}">
 												<span style="color: #0000FF;">
-													<c:if test="${result.smishingYn eq 'Y'}">온</c:if><c:if test="${result.smishingYn eq 'N'}">오프</c:if>[이용정지]
+													<c:if test="${result.smishingYn eq 'Y'}">온</c:if><c:if test="${result.smishingYn eq 'N'}">오프</c:if>[발송취소]
 													<span style="overflow:hidden;text-overflow:ellipsis;white-space:nowrap;display:block;margin-top:3px;" title="<c:out value="${result.cancelDate}"/>">
 														<fmt:parseDate value="${result.cancelDate}" var="cancelDateValue" pattern="yyyy-MM-dd HH:mm"/>
 														<fmt:formatDate value="${cancelDateValue}" pattern="MM-dd HH:mm"/>														
diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp
index c727f5b8..9dd1fc07 100644
--- a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp
@@ -565,7 +565,7 @@ function fnAtSmishingUpdate(flag) {
 											<c:when test="${result.atDelayCompleteYn eq 'Y' && not empty result.cancelDate}">
 												<span style="color: #0000FF;">
 													<c:if test="${result.atSmishingYn eq 'Y'}">온</c:if>
-													<c:if test="${result.atSmishingYn eq 'N'}">오프</c:if>[이용정지]
+													<c:if test="${result.atSmishingYn eq 'N'}">오프</c:if>[발송취소]
 													<span style="overflow:hidden;text-overflow:ellipsis;white-space:nowrap;display:block;margin-top:3px;" title="<c:out value="${result.cancelDate}"/>">
 														<fmt:parseDate value="${result.cancelDate}" var="cancelDateValue" pattern="yyyy-MM-dd HH:mm"/>
 														<fmt:formatDate value="${cancelDateValue}" pattern="MM-dd HH:mm"/>
diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoft/SendKakaoFTList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoft/SendKakaoFTList.jsp
index 4b22d4e2..8d760bd9 100644
--- a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoft/SendKakaoFTList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoft/SendKakaoFTList.jsp
@@ -546,7 +546,7 @@ function fnSmishingUpdate(flag) {
 										<c:choose>
 											<c:when test="${result.delayCompleteYn eq 'Y' && not empty result.cancelDate}">
 												<span style="color: #0000FF;">
-													<c:if test="${result.smishingYn eq 'Y'}">온</c:if><c:if test="${result.smishingYn eq 'N'}">오프</c:if>[이용정지]
+													<c:if test="${result.smishingYn eq 'Y'}">온</c:if><c:if test="${result.smishingYn eq 'N'}">오프</c:if>[발송취소]
 													<span style="overflow:hidden;text-overflow:ellipsis;white-space:nowrap;display:block;margin-top:3px;" title="<c:out value="${result.cancelDate}"/>">
 														<fmt:parseDate value="${result.cancelDate}" var="cancelDateValue" pattern="yyyy-MM-dd HH:mm"/>
 														<fmt:formatDate value="${cancelDateValue}" pattern="MM-dd HH:mm"/>														
diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp
index afcdf480..b423c9a5 100644
--- a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp
@@ -550,7 +550,7 @@ function fnSmishingUpdate(flag) {
 										<c:choose>
 											<c:when test="${result.delayCompleteYn eq 'Y' && not empty result.cancelDate}">
 												<span style="color: #0000FF;">
-													<c:if test="${result.smishingYn eq 'Y'}">온</c:if><c:if test="${result.smishingYn eq 'N'}">오프</c:if>[이용정지]
+													<c:if test="${result.smishingYn eq 'Y'}">온</c:if><c:if test="${result.smishingYn eq 'N'}">오프</c:if>[발송취소]
 													<span style="overflow:hidden;text-overflow:ellipsis;white-space:nowrap;display:block;margin-top:3px;" title="<c:out value="${result.cancelDate}"/>">
 														<fmt:parseDate value="${result.cancelDate}" var="cancelDateValue" pattern="yyyy-MM-dd HH:mm"/>
 														<fmt:formatDate value="${cancelDateValue}" pattern="MM-dd HH:mm"/>														

From 2bb1e739310bae4c441b0b6479835952893ace0f Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Mon, 7 Aug 2023 16:21:53 +0900
Subject: [PATCH 15/19] =?UTF-8?q?=EB=93=B1=EA=B8=89=EC=A0=9C=20=EC=A3=BC?=
 =?UTF-8?q?=EC=84=9D=ED=95=B4=EC=A7=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../let/mjo/pay/web/MjonPayController.java    |   4 +
 .../jsp/web/msgcampain/MsgDataSMLView.jsp     |   2 +-
 .../msgcampain/excel/MsgExcelDataSMLView.jsp  |   2 +-
 .../jsp/web/msgdata/MsgDataSMLView.jsp        |   2 +-
 .../web/msgdata/excel/MsgExcelDataSMLView.jsp |   2 +-
 .../webapp/WEB-INF/jsp/web/pay/PayGuide.jsp   |   4 +-
 .../WEB-INF/jsp/web/pay/PayListAllAjax.jsp    |   2 +-
 .../webapp/WEB-INF/jsp/web/pay/PayView.jsp    | 115 ++++++++++++++++++
 .../webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp  |   4 +-
 .../WEB-INF/jsp/web/user/mberInfoIndex.jsp    |   2 +-
 10 files changed, 129 insertions(+), 10 deletions(-)

diff --git a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java
index b923ab59..e63b1580 100644
--- a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java
+++ b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java
@@ -1837,6 +1837,10 @@ public class MjonPayController {
    		}
     	model.addAttribute("tabType", tabType);
     	
+    	MberGrdVO mberGrdVO = new MberGrdVO();
+    	List<MberGrdVO> mberGrdSettingList = mberGrdService.selectMberGrdSettingList(mberGrdVO);
+    	model.addAttribute("mberGrdSettingList", mberGrdSettingList);
+    	
 		return "/web/pay/PayView";
 	}
     
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
index bd4c7359..998bc195 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
@@ -322,7 +322,7 @@ function getMberSettingDetail() {
 
 $(document).ready(function (){
 	//등급제 시행 ON/OFF 체크
-	//getMberSettingDetail();
+	getMberSettingDetail();
 	
 	//미리보기 이미지 영역 숨김 처리
 	$('.preiew_img').hide();
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgcampain/excel/MsgExcelDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgcampain/excel/MsgExcelDataSMLView.jsp
index 9add99e4..17ed1cc9 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgcampain/excel/MsgExcelDataSMLView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgcampain/excel/MsgExcelDataSMLView.jsp
@@ -467,7 +467,7 @@ function getMberSettingDetail() {
 
 $(document).ready(function (){
 	//등급제 시행 ON/OFF 체크
-	//getMberSettingDetail();
+	getMberSettingDetail();
 	
 	$('.preiew_img').hide();
 	$('.prePhoto').hide();
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
index e3fb4dd0..e4170654 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
@@ -474,7 +474,7 @@ function getMberSettingDetail() {
 
 $(document).ready(function (){
 	//등급제 시행 ON/OFF 체크
-	//getMberSettingDetail();
+	getMberSettingDetail();
 			
 	// Bline 확연 및 라디오 버튼 클릭 이벤트 추가
 	var blineCodeYn = $("#blineCode").val();
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/excel/MsgExcelDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/excel/MsgExcelDataSMLView.jsp
index 285e7453..29125f10 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgdata/excel/MsgExcelDataSMLView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/excel/MsgExcelDataSMLView.jsp
@@ -618,7 +618,7 @@ function getMberSettingDetail() {
 
 $(document).ready(function (){
 	//등급제 시행 ON/OFF 체크
-	//getMberSettingDetail();
+	getMberSettingDetail();
 	
 	// Bline 확연 및 라디오 버튼 클릭 이벤트 추가
 	var blineCodeYn = $("#blineCode").val();
diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayGuide.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayGuide.jsp
index 9909f3e2..caa11d9e 100644
--- a/src/main/webapp/WEB-INF/jsp/web/pay/PayGuide.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayGuide.jsp
@@ -66,10 +66,10 @@ $(document).ready(function () {
 	}
 	
 	//등급제 시행 ON/OFF 체크
-	//getMberSettingDetail();
+	getMberSettingDetail();
 		
 	// 등급제 대상 여부
-	//getMberGrdChk();
+	getMberGrdChk();
 	
 });
 
diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayListAllAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayListAllAjax.jsp
index 80aec80e..aec92b1f 100644
--- a/src/main/webapp/WEB-INF/jsp/web/pay/PayListAllAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayListAllAjax.jsp
@@ -90,7 +90,7 @@ $(document).ready(function(){
 	})
 	
 	// 등급제 대상 여부
-	//getMberGrdChk();	
+	getMberGrdChk();	
 });
 
 
diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayView.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayView.jsp
index 4b510fb1..99bec45c 100644
--- a/src/main/webapp/WEB-INF/jsp/web/pay/PayView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayView.jsp
@@ -25,6 +25,11 @@ $(document).ready(function(){
 		$("#btnDdedicatedAccount").trigger("click");
 	}
 	
+	//등급제 시행 ON/OFF 체크
+	getMberSettingDetail();
+		
+	// 등급제 대상 여부
+	getMberGrdChk();		
 });
 
 
@@ -426,6 +431,57 @@ function TabTypePay(obj, tabId) {
 	// 충전금액 세팅
 	setPriceMake();	
 }
+
+//등급제 시행 ON/OFF 체크
+function getMberSettingDetail() {
+	$.ajax({
+        type: "POST",
+        url: "/web/grd/mberSettDetailAjax.do",
+        data: {},
+        dataType:'json',
+        async: false,
+        success: function (data) {
+			if (data.isSuccess) {
+				// 문자(등급별 요금 안내)
+				$("#mberGrdSettingArea").show();
+			} 
+			else {
+				//alert("Msg : " + data.msg);
+			}
+		},
+        error: function (e) { 
+        	//alert("ERROR : " + JSON.stringify(e)); 
+        }
+    });				
+}		
+
+// 등급제 대상 여부
+function getMberGrdChk() {
+	$.ajax({
+        type: "POST",
+        url: "/web/grd/mberGrdChkAjax.do",
+        data: {},
+        dataType:'json',
+        async: false,
+        success: function (data) {
+			if (data.isSuccess) {
+				// 등급제 누적결제액 세부내역
+				var sHtml = "";
+				sHtml += "<p>등급 : <span><img src='/publish/images/level/level_icon/level_small/" + data.rtnMberGrdVO.grdSetIcon + "_small_icon.png' alt='등급 스몰 아이콘'>" + data.rtnMberGrdVO.grdSetNm;
+				sHtml += "(누적결제액 : &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;  &nbsp;  &nbsp;<span>" + numberWithCommas(data.rtnMberGrdVO.totAmt) + "</span>원)</span></p>";
+				$("#grdShowArea").html(sHtml);
+				$("#grdShowArea").show();
+				$("#levelSubTitle").html("(" + data.rtnMberGrdVO.grdDate + " ~ 현재)");				
+			} 
+			else {
+				//alert("Msg : " + data.msg);
+			}
+		},
+        error: function (e) { 
+        	//alert("ERROR : " + JSON.stringify(e)); 
+        }
+    });				
+}		
 </script>
 
 <!-- </head>
@@ -788,6 +844,65 @@ function TabTypePay(obj, tabId) {
 						</div>
 						<!-- //즉시이체 -->
 					</div>
+					
+					<!--누적결제액별 등급 및 단가 추가 시작-->
+					<div class="accrue_price" id="grdShowArea" style="display: none;">
+					</div>
+					<div class="accrue_level" id="mberGrdSettingArea" style="display: none;">
+						<p class="tType1_title level"><img src="/publish/images/level/accrue.png" alt="누적결제액별 등급 및 단가 아이콘"> 누적결제액별 등급 및 단가
+						</p>
+						<table class="tType2 tType2_level">
+							<caption></caption>
+							<colgroup>
+								<col style="width: 13%;">
+								<col style="width: auto;">
+								<col style="width: 11%;">
+								<col style="width: 11%;">
+								<col style="width: 11%;">
+								<col style="width: 11%;">
+								<col style="width: 11%;">
+							</colgroup>
+							<thead>
+								<tr>
+									<th>등급</th>
+									<th class="th_second">누적결제액<span id="levelSubTitle"></span></th>
+									<th>단문</th>
+									<th>장문</th>
+									<th>그림(1장)</th>
+									<th>그림(2장)</th>
+									<th>그림(3장)</th>
+								</tr>
+							</thead>
+							<tbody>
+			    				<c:forEach var="result" items="${mberGrdSettingList}" varStatus="status">
+								<tr>
+									<th><c:out value="${result.grdSetNm}"/></th>
+									<td class="level_price"><c:out value="${result.stdAmtComma}"/></td>
+									<td><c:out value="${result.shortPrice}"/></td>
+									<td><c:out value="${result.longPrice}"/></td>
+									<td><c:out value="${result.picturePrice}"/></td>
+									<td><c:out value="${result.picture2Price}"/></td>
+									<td><c:out value="${result.picture3Price}"/></td>
+								</tr>
+								</c:forEach>																				
+							</tbody>
+						</table>
+						<span class="reqTxt4">
+							* 등급별 요금제는 당사의 정책 및 운영의 필요상 수정, 중단 또는 변경될 수 있습니다. <br>
+							* 누적결제액은 등급별 요금제 적용일로부터 적립된 결제금액을 말하며, 누적결제액에 따라 등급은 자동으로 적용됩니다. <br>
+							* "첫결제 이벤트" 등 이벤트 결제금액은 등급별 요금제 누적결제액에서 제외됩니다. <br>
+						</span>
+						<p class="reqTxt4 reqTxt4_last">
+							* 문자피싱, 스미싱, 주식, 도박, 로또, 스팸, 사기, 협박, 범죄, 유사투자, 유사수신 등을 목적으로 하거나 교사 또는 방조하는 내용의 정보, 발신번호 조작
+							등으로 인지되는 문자에 대해서는
+							사전 또는 즉시 발송을 차단하고
+							이용을 정지시킬 수 있으며, 이에 대한 어떠한 환불이나 보상을 실시하지 않습니다. 또한, 상기 문자를 발송한 회원에 대해서는 그 즉시 등급별 요금제 혜택을
+							취소합니다.
+						</p>
+					</div>            
+					<!--문자_등급별 요금 안내 추가 끝-->    					
+					
+					
 				</div><!-- 결제관리 - 결제하기 -->
             </div><!--// send top -->
         </div>
diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp
index 3d6cf07a..776b1d14 100644
--- a/src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp
@@ -30,10 +30,10 @@ $(document).ready(function(){
 	}
 	
 	//등급제 시행 ON/OFF 체크
-	//getMberSettingDetail();
+	getMberSettingDetail();
 		
 	// 등급제 대상 여부
-	//getMberGrdChk();	
+	getMberGrdChk();	
 });
 
 
diff --git a/src/main/webapp/WEB-INF/jsp/web/user/mberInfoIndex.jsp b/src/main/webapp/WEB-INF/jsp/web/user/mberInfoIndex.jsp
index 9fd02da2..46d7af54 100644
--- a/src/main/webapp/WEB-INF/jsp/web/user/mberInfoIndex.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/user/mberInfoIndex.jsp
@@ -18,7 +18,7 @@ $(document).ready(function(){
 	payUserListAjax(1);
 	
 	// 등급제 대상 여부
-	//getMberGrdChk();	
+	getMberGrdChk();	
 	
 	var date = new Date() ;
 	//이전달 첫날/마지막날 조회

From 0fe0920aa2a701b0a30c1f6d27435d18798232df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?ITN=5F=EB=94=94=EC=9E=90=EC=9D=B8=ED=8C=80?=
 <ITN_디자인팀@ITN>
Date: Mon, 7 Aug 2023 16:27:27 +0900
Subject: [PATCH 16/19] =?UTF-8?q?2023/08/07=20=EB=B0=9C=EC=86=A1=EA=B2=B0?=
 =?UTF-8?q?=EA=B3=BC=20>=20=ED=85=8C=EC=9D=B4=EB=B8=94=20=ED=8D=BC?=
 =?UTF-8?q?=EB=B8=94=EB=A6=AC=EC=8B=B1=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp | 8 ++++----
 .../WEB-INF/jsp/web/msgsent/MsgSentCompleteListAjax.jsp   | 8 ++++----
 .../WEB-INF/jsp/web/msgsent/MsgSentFailListAjax.jsp       | 6 +++---
 .../WEB-INF/jsp/web/msgsent/MsgSentReadyListAjax.jsp      | 8 ++++----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
index 4588cb2d..5b9bd03a 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
@@ -79,9 +79,9 @@ $(document).ready(function(){
 				<col style="width: 15%;">
 				<col style="width: 8%;">
 				<col style="width: 90px;">
-				<col style="width: 17%;">
+				<col style="width: 10%;">
+				<col style="width: 12%;">
 				<col style="width: 12%;">
-				<col style="width: 8%;">
 				<col style="width: 8%;">
 			<c:if test="${mjonMsgSentVO.listType eq 'groupList'}">
 				<col style="width: 8%;">
@@ -392,10 +392,10 @@ $(document).ready(function(){
 					<c:otherwise>
 					<tr>
 						<c:if test="${mjonMsgSentVO.listType eq 'groupList'}">
-							<td colspan="10">발송 내역이 없습니다.</td>
+							<td colspan="11">발송 내역이 없습니다.</td>
 						</c:if>
 						<c:if test="${mjonMsgSentVO.listType ne 'groupList'}">
-							<td colspan="8">발송 내역이 없습니다.</td>
+							<td colspan="9">발송 내역이 없습니다.</td>
 						</c:if>
 					</tr>
 					</c:otherwise>
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentCompleteListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentCompleteListAjax.jsp
index a2338d70..7b0585a3 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentCompleteListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentCompleteListAjax.jsp
@@ -72,9 +72,9 @@ $(document).ready(function(){
 				<col style="width: 15%;">
 				<col style="width: 8%;">
 				<col style="width: 90px;">
-				<col style="width: 17%;">
+				<col style="width: 10%;">
+				<col style="width: 12%;">
 				<col style="width: 12%;">
-				<col style="width: 8%;">
 				<col style="width: 8%;">
 			<c:if test="${mjonMsgSentVO.listType eq 'groupList'}">
 				<col style="width: 8%;">
@@ -291,10 +291,10 @@ $(document).ready(function(){
 					<c:otherwise>
 					<tr>
 						<c:if test="${mjonMsgSentVO.listType eq 'groupList'}">
-							<td colspan="10">발송 내역이 없습니다.</td>
+							<td colspan="11">발송 내역이 없습니다.</td>
 						</c:if>
 						<c:if test="${mjonMsgSentVO.listType ne 'groupList'}">
-							<td colspan="8">발송 내역이 없습니다.</td>
+							<td colspan="9">발송 내역이 없습니다.</td>
 						</c:if>
 					</tr>
 					</c:otherwise>
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentFailListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentFailListAjax.jsp
index 80655790..f04c9625 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentFailListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentFailListAjax.jsp
@@ -72,9 +72,9 @@ $(document).ready(function(){
 				<col style="width: 15%;">
 				<col style="width: 8%;">
 				<col style="width: 90px;">
-				<col style="width: 17%;">
+				<col style="width: 10%;">
+				<col style="width: 12%;">
 				<col style="width: 12%;">
-				<col style="width: 8%;">
 				<col style="width: 8%;">
 				<col style="width: 8%;">
 				<col style="width: 8%;">
@@ -252,7 +252,7 @@ $(document).ready(function(){
 					</c:when>
 					<c:otherwise>
 					<tr>
-						<td colspan="10">발송 내역이 없습니다.</td>
+						<td colspan="11">발송 내역이 없습니다.</td>
 					</tr>
 					</c:otherwise>
 				</c:choose>
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentReadyListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentReadyListAjax.jsp
index bc44b2c3..54ba3242 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentReadyListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentReadyListAjax.jsp
@@ -72,9 +72,9 @@ $(document).ready(function(){
 				<col style="width: 15%;">
 				<col style="width: 8%;">
 				<col style="width: 90px;">
-				<col style="width: 17%;">
+				<col style="width: 10%;">
+				<col style="width: 12%;">
 				<col style="width: 12%;">
-				<col style="width: 8%;">
 				<col style="width: 8%;">
 			<c:if test="${mjonMsgSentVO.listType eq 'groupList'}">
 				<col style="width: 8%;">
@@ -291,10 +291,10 @@ $(document).ready(function(){
 					<c:otherwise>
 					<tr>
 						<c:if test="${mjonMsgSentVO.listType eq 'groupList'}">
-							<td colspan="10">발송 내역이 없습니다.</td>
+							<td colspan="11">발송 내역이 없습니다.</td>
 						</c:if>
 						<c:if test="${mjonMsgSentVO.listType ne 'groupList'}">
-							<td colspan="8">발송 내역이 없습니다.</td>
+							<td colspan="9">발송 내역이 없습니다.</td>
 						</c:if>
 					</tr>
 					</c:otherwise>

From d17f40ed906fdd24ad83a8b607d445d69e0ec910 Mon Sep 17 00:00:00 2001
From: name <mail>
Date: Mon, 7 Aug 2023 17:22:10 +0900
Subject: [PATCH 17/19] =?UTF-8?q?=ED=9A=8C=EC=9B=90=20ID=20=ED=95=84?=
 =?UTF-8?q?=ED=84=B0=20=EC=9D=BC=EB=B6=80=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/itn/com/cmm/util/XssFilterUtil.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/itn/com/cmm/util/XssFilterUtil.java b/src/main/java/itn/com/cmm/util/XssFilterUtil.java
index 43fcbc71..b39a028d 100644
--- a/src/main/java/itn/com/cmm/util/XssFilterUtil.java
+++ b/src/main/java/itn/com/cmm/util/XssFilterUtil.java
@@ -81,7 +81,6 @@ public class XssFilterUtil {
 				test_str_low.contains("kill")||
 				test_str_low.contains("batch")||
 				test_str_low.contains("shutdown")||
-				test_str_low.contains("touch")||
 				test_str_low.contains("wget")||
 				test_str_low.contains("iptables")||
 				test_str_low.contains("traceroute")||

From 63ca91361673b13273c2ce2fe7f1745f9c491dc9 Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Mon, 7 Aug 2023 18:04:24 +0900
Subject: [PATCH 18/19] =?UTF-8?q?=EB=93=B1=EA=B8=89=EC=A0=9C=20=ED=97=A4?=
 =?UTF-8?q?=EB=8D=94=20=EC=95=84=EC=9D=B4=EC=BD=98=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../let/sym/grd/web/MberGrdController.java    | 29 +++++++------
 .../let/sym/grd/web/MberGrdMngController.java | 42 ++++++++++---------
 .../WEB-INF/jsp/web/com/webCommonHeader.jsp   | 31 +++++++++++++-
 3 files changed, 69 insertions(+), 33 deletions(-)

diff --git a/src/main/java/itn/let/sym/grd/web/MberGrdController.java b/src/main/java/itn/let/sym/grd/web/MberGrdController.java
index 1860a1f6..f5d632ea 100644
--- a/src/main/java/itn/let/sym/grd/web/MberGrdController.java
+++ b/src/main/java/itn/let/sym/grd/web/MberGrdController.java
@@ -92,7 +92,7 @@ public class MberGrdController {
         try{
         	MberGrdVO mberGrdVO1 = new MberGrdVO();
 			mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);
-			if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate() && mberGrdVO1.getGrdDatePrgYn().equals("Y")) {
+			if (mberGrdVO1.getGrdNoti().equals("Y")) {
        			isSuccess = true;			
 			}
 		}
@@ -127,17 +127,22 @@ public class MberGrdController {
         	if (StringUtils.isNotEmpty(userId)) {
 	        	mberGrdVO.setMberId(userId);
 	        	
-	        	// 회원별 이벤트 진행여부
-	        	int mberEventPrgCnt = mberGrdService.selectMberEventPrgCnt(mberGrdVO.getMberId());
-	        	if (mberEventPrgCnt == 0) {
-	           		rtnMberGrdVO = mberGrdService.selectMberGrdInfo(mberGrdVO.getMberId());
-	           		if (null != rtnMberGrdVO) {
-	           			isSuccess = true;
-	           		}
-	           		else {
-	        			msg = "종료";       			
-	           		}
-	        	}
+	    		// Step 1. 등급제 시행 ON 일경우(시행일자 진행여부 Y일경우)
+	    		MberGrdVO mberGrdVO1 = new MberGrdVO();
+	    		mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);
+	    		if (mberGrdVO1.getGrdNoti().equals("Y")) {
+		        	// Step 2. 회원별 이벤트 진행여부
+		        	int mberEventPrgCnt = mberGrdService.selectMberEventPrgCnt(mberGrdVO.getMberId());
+		        	if (mberEventPrgCnt == 0) {
+		           		rtnMberGrdVO = mberGrdService.selectMberGrdInfo(mberGrdVO.getMberId());
+		           		if (null != rtnMberGrdVO) {
+		           			isSuccess = true;
+		           		}
+		           		else {
+		        			msg = "종료";       			
+		           		}
+		        	}	    			
+	    		}
         	}
 		}
 		catch(Exception e) {
diff --git a/src/main/java/itn/let/sym/grd/web/MberGrdMngController.java b/src/main/java/itn/let/sym/grd/web/MberGrdMngController.java
index 99664375..66971f04 100644
--- a/src/main/java/itn/let/sym/grd/web/MberGrdMngController.java
+++ b/src/main/java/itn/let/sym/grd/web/MberGrdMngController.java
@@ -182,7 +182,7 @@ public class MberGrdMngController {
     		// Step 1. 등급제 시행 ON 일경우
     		MberGrdVO mberGrdVO1 = new MberGrdVO();
     		mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);
-    		if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate() && mberGrdVO1.getGrdDatePrgYn().equals("Y")) {
+    		if (mberGrdVO1.getGrdNoti().equals("Y")) {
     			mberGrdVO.setGrdNewDate(mberGrdVO1.getGrdNewDate());
     			
            		// 회원별 등급 초기화
@@ -318,24 +318,26 @@ public class MberGrdMngController {
    		
     	// 로그인VO에서  사용자 정보 가져오기
     	LoginVO	loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
-    	String frstRegisterId = loginVO == null ? "" : loginVO.getId();
-    	mberGrdVO.setEditId(frstRegisterId);		// 최초등록자ID
-
-        try{
-       		rtnMberGrdVO = mberGrdService.selectMberGrdInfo(mberGrdVO.getMberId());
-       		if (null != rtnMberGrdVO) {
-       			// 등급제 적용
-
-       		}
-       		else {
-    			isSuccess = false;
-    			msg = "종료";       			
-       		}
-		}
-		catch(Exception e) {
-			isSuccess = false;
-			msg = e.getMessage();
-		}		
+    	if (loginVO != null) {
+	    	String frstRegisterId = loginVO == null ? "" : loginVO.getId();
+	    	mberGrdVO.setEditId(frstRegisterId);		// 최초등록자ID
+	
+	        try{
+	       		rtnMberGrdVO = mberGrdService.selectMberGrdInfo(mberGrdVO.getMberId());
+	       		if (null != rtnMberGrdVO) {
+	       			// 등급제 적용
+	
+	       		}
+	       		else {
+	    			isSuccess = false;
+	    			msg = "종료";       			
+	       		}
+			}
+			catch(Exception e) {
+				isSuccess = false;
+				msg = e.getMessage();
+			}		
+    	}
 
         modelAndView.addObject("rtnMberGrdVO", rtnMberGrdVO);
 		modelAndView.addObject("isSuccess", isSuccess);
@@ -433,7 +435,7 @@ public class MberGrdMngController {
     		// Step 1. 등급제 시행 ON 일경우
     		MberGrdVO mberGrdVO1 = new MberGrdVO();
     		mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);
-    		if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate() && mberGrdVO1.getGrdDatePrgYn().equals("Y")) {
+    		if (mberGrdVO1.getGrdNoti().equals("Y")) {
     			mberGrdVO.setGrdNewDate(mberGrdVO1.getGrdNewDate());
     			
             	// 회원 등급 변경(환불후) => 기존등급 상관없이 업데이트
diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
index 967dd730..a7e9ea54 100644
--- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
@@ -101,8 +101,37 @@ $(document).ready(function (){
 	<c:if test="${!loginPage}">
 		getid();
 	</c:if>	
+	
+	if(!${empty LoginVO}){
+		//등급제 대상 여부(헤더)
+		getMberGrdChk_Header();
+	}
 });	
 
+//등급제 대상 여부
+function getMberGrdChk_Header() {
+	$.ajax({
+        type: "POST",
+        url: "/web/grd/mberGrdChkAjax.do",
+        data: {},
+        dataType:'json',
+        async: false,
+        success: function (data) {
+			if (data.isSuccess) {
+				// 등급제 누적결제액 세부내역
+				var levelIcon = "/publish/images/level/level_icon/" + data.rtnMberGrdVO.grdSetIcon + "_icon.png";
+				$("#commonHeaderGradeIcon").attr("src", levelIcon);
+			} 
+			else {
+				//alert("Msg : " + data.msg);
+			}
+		},
+        error: function (e) { 
+        	//alert("ERROR : " + JSON.stringify(e)); 
+        }
+    });				
+}
+
 //남은 시간 계산해주기(화면 새로고침해도 시간은 계속 유지됨)
 function getTimer(date) { 
 	var _vDate = new Date(date); 
@@ -1534,7 +1563,7 @@ function actionLogin() {
 		                <div class="login_left">
 		                    <div class="login_info">
 		                    	<input type="hidden" id="loginId" name="loginId" value="${LoginVO.id}">
-								<i></i>
+								<i><img src="/publish/images/mypageIcon2.png" id="commonHeaderGradeIcon" /></i>
 								<div class="login2_name" onclick="location.href='/web/user/mberInfoChange.do'" style="cursor:pointer;">
 		                        	<p><c:out value="${LoginVO.name}"/></p>
 		                        	<c:choose>

From 0c4e7f6510868c8f0d416aa61a1705122af11baf Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Tue, 8 Aug 2023 09:58:12 +0900
Subject: [PATCH 19/19] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EC=83=81=EC=84=B8=20?=
 =?UTF-8?q?=EB=93=B1=EA=B8=89=20=ED=95=AD=EB=AA=A9=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../let/sym/grd/web/MberGrdMngController.java | 47 +++++++++++--------
 .../sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml  |  1 +
 .../cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp    | 38 ++++++++++++---
 .../jsp/web/grd/MberGrdHistListAjax.jsp       |  2 +-
 4 files changed, 61 insertions(+), 27 deletions(-)

diff --git a/src/main/java/itn/let/sym/grd/web/MberGrdMngController.java b/src/main/java/itn/let/sym/grd/web/MberGrdMngController.java
index 66971f04..408ecf4d 100644
--- a/src/main/java/itn/let/sym/grd/web/MberGrdMngController.java
+++ b/src/main/java/itn/let/sym/grd/web/MberGrdMngController.java
@@ -4,6 +4,7 @@ import java.util.List;
 
 import javax.annotation.Resource;
 
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -312,32 +313,38 @@ public class MberGrdMngController {
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.setViewName("jsonView");
 
-		boolean isSuccess = true;
+		boolean isSuccess = false;
 		String msg = "";
    		MberGrdVO rtnMberGrdVO = new MberGrdVO();
    		
     	// 로그인VO에서  사용자 정보 가져오기
     	LoginVO	loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
-    	if (loginVO != null) {
-	    	String frstRegisterId = loginVO == null ? "" : loginVO.getId();
-	    	mberGrdVO.setEditId(frstRegisterId);		// 최초등록자ID
+    	String frstRegisterId = loginVO == null ? "" : loginVO.getId();
+    	mberGrdVO.setEditId(frstRegisterId);		// 최초등록자ID
 	
-	        try{
-	       		rtnMberGrdVO = mberGrdService.selectMberGrdInfo(mberGrdVO.getMberId());
-	       		if (null != rtnMberGrdVO) {
-	       			// 등급제 적용
-	
-	       		}
-	       		else {
-	    			isSuccess = false;
-	    			msg = "종료";       			
-	       		}
-			}
-			catch(Exception e) {
-				isSuccess = false;
-				msg = e.getMessage();
-			}		
-    	}
+        try{
+        	if (StringUtils.isNotEmpty(mberGrdVO.getMberId())) {
+	    		// Step 1. 등급제 시행 ON 일경우(시행일자 진행여부 Y일경우)
+	    		MberGrdVO mberGrdVO1 = new MberGrdVO();
+	    		mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);
+	    		if (mberGrdVO1.getGrdNoti().equals("Y")) {
+		        	// Step 2. 회원별 이벤트 진행여부
+		        	int mberEventPrgCnt = mberGrdService.selectMberEventPrgCnt(mberGrdVO.getMberId());
+		        	if (mberEventPrgCnt == 0) {
+		           		rtnMberGrdVO = mberGrdService.selectMberGrdInfo(mberGrdVO.getMberId());
+		           		if (null != rtnMberGrdVO) {
+		           			isSuccess = true;
+		           		}
+		           		else {
+		        			msg = "종료";       			
+		           		}
+		        	}	    			
+	    		}
+        	}
+		}
+		catch(Exception e) {
+			msg = e.getMessage();
+		}		
 
         modelAndView.addObject("rtnMberGrdVO", rtnMberGrdVO);
 		modelAndView.addObject("isSuccess", isSuccess);
diff --git a/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml
index 0477dc32..60ce46ed 100644
--- a/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml
@@ -887,6 +887,7 @@
 		AND A.MBER_ID = #mberId#
 		AND IFNULL(TRIM(A.MOID), '') != ''
 		AND A.TOT_AMT > 0
+		AND A.GRD_DATE >= (SELECT S.GRD_DATE FROM MJ_MBER_GRD_INFO S WHERE S.MBER_ID = #mberId#)		
 		ORDER BY A.REG_DATE DESC
 		LIMIT  #recordCountPerPage# OFFSET #firstIndex#	
 	</select>
diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp
index ed73997d..dc924e40 100644
--- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp
+++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp
@@ -169,9 +169,37 @@ $(document).ready(function(){
 		$(this).val(value);
 	});
  
+	//등급제 적용 테스트
+	getMberGrdChk();
 });
 
 
+//등급제 적용 테스트
+function getMberGrdChk() {
+	$(".grdSetNm").html("");											
+	
+	var mberId = document.mberManageVO.mberSearchId.value;
+	
+	$.ajax({
+        type: "POST",
+        url: "/sym/grd/mberGrdChkAjax.do",
+        data: {"mberId" : mberId},
+        dataType:'json',
+        async: false,
+        success: function (data) {
+			if (data.isSuccess) {
+				$(".grdSetNm").html(data.rtnMberGrdVO.grdSetNm);
+			} 
+			else {
+				//alert("Msg : " + data.msg);
+			}
+		},
+        error: function (e) { 
+        	//alert("ERROR : " + JSON.stringify(e)); 
+        }
+    });				
+}	
+
 function fnCheckAll(){
     var checkField = document.delayForm.checkDelayField;
     
@@ -3064,9 +3092,8 @@ function kakaoATDelayCancel(msgGroupId){
 													<option value="N" <c:if test="${mberManageVO.spamYn == 'N'}">selected="selected"</c:if>>오프(Off)</option>
 												</select>
 											</td>
-											<th></th>
-											<td>
-											</td>											
+											<th>등급</th>
+											<td><span class="grdSetNm"></span></td>											
 										</tr>										
 										<tr>
 											<th>전화번호<button type="button" onclick="layerPopOpen('sms');">SMS</button></th>
@@ -3461,9 +3488,8 @@ function kakaoATDelayCancel(msgGroupId){
 													<option value="N" <c:if test="${mberManageVO.spamYn == 'N'}">selected="selected"</c:if>>오프(Off)</option>
 												</select>
 											</td>
-											<th></th>
-											<td>
-											</td>											
+											<th>등급</th>
+											<td><span class="grdSetNm"></span></td>											
 										</tr>										
 										<tr>
 											<th>전화번호<button type="button" onclick="layerPopOpen('sms');">SMS</button></th>
diff --git a/src/main/webapp/WEB-INF/jsp/web/grd/MberGrdHistListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/grd/MberGrdHistListAjax.jsp
index b0e9874f..5245a070 100644
--- a/src/main/webapp/WEB-INF/jsp/web/grd/MberGrdHistListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/grd/MberGrdHistListAjax.jsp
@@ -92,7 +92,7 @@ $(document).ready(function(){
 							</c:when>
 							<c:otherwise>
 								<tr>
-									<td colspan="5">
+									<td colspan="5" style="text-align: center;">
 										검색 결과가 없습니다.
 									</td>
 								</tr>