Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.admin into develop

src/main/java/com/style24/persistence/domain/Plan.java

@@ -118,6 +118,7 @@ public class Plan extends TscBaseDomain{
 		private Integer entryCustNo;
 		private Integer custNo;
 		private String custNm;
+		private String custId;
 		private Integer planEntrySq;
 		private String sysFile;
 		
@@ -337,4 +338,8 @@ public class Plan extends TscBaseDomain{
 		public String getMaskingCustNm() {
 			return TsaSession.getInfo().getMaskingYn().equals("Y") ? MaskingUtils.name(getCustNm()) : getCustNm();
 		}
+		
+		public String getMaskingCustId() {
+			return TsaSession.getInfo().getMaskingYn().equals("Y") ? MaskingUtils.id(getCustId()) : getCustId();
+		}
 }

src/main/java/com/style24/persistence/mybatis/shop/TsaPlan.xml

@@ -1366,6 +1366,7 @@
 		                   , PE.ENTRY_CUST_NO AS CUST_NO
 		                   , PE.PLAN_ENTRY_SQ 
 		                   , C.CUST_NM
+		                   , C.CUST_ID
 		             FROM TB_PLAN P INNER JOIN TB_PLAN_ENTRY PE
 		                              ON P.PLAN_SQ = PE.PLAN_SQ
 		                             INNER JOIN TB_CUSTOMER C

src/main/webapp/WEB-INF/views/marketing/PlanListForm.html

@@ -179,7 +179,7 @@
 		{headerName: "댓글참여"		, field:'replyYn'	, width:300 , cellClass: 'text-center',
 			cellRenderer: function(params) {
 				if(params.value === 'Y'){
-					return '<a href="javascript:void(0);">' + params.value + '</a>';
+					return '<a href="javascript:void(0);">댓글 보기</a>';
 				}else{
 					return params.value;
 				}

src/main/webapp/WEB-INF/views/marketing/PlanReplyDetailForm.html

@@ -25,15 +25,15 @@
 		
 		<!-- CONTENT -->
 		<div class="panelContent">
-			<form id="reviewDetailForm" name="reviewDetailForm" action="#" th:method="post" >
+			<form id="replyDetailForm" name="replyDetailForm" action="#" th:method="post" >
 				
 				<div class="reviewWrap">
 					<div class="user_review">
 						<!-- 리뷰 파일 -->
-						<dl class="rvPic">
+						<dl class="rvPic" style="display: none;">
 							<dt>이미지</dt>
 							<dd>
-								<div class="picList" id="divPicList">
+								<div class="picList" id="divPicList" style="background: url() repeat 0 0;">
 									<th:block th:if="${attachList != null}" th:each="oneData, status : ${attachList}">
 										<a  href="javascript:void(0);" onclick="fnPopupOpen('layer_review_pic', this);">
 											<span th:style="${'background-image:url(' + @environment.getProperty('domain.image') + oneData.sysFile + ');'}">사진</span>
@@ -55,12 +55,30 @@
 		</div>
 	</div>
 </div>
-
+<div class="uPopupWrap off" id="layer_review_pic">
+	<div class="area reviewPic" style="width:500px; height:500px;">
+		<ul class="picList" th:object="${reviewInfo}">
+			<th:block th:if="${attachList != null}" th:each="oneData, status : ${attachList}">
+				<li><div class="img" th:style="${'background-image:url(' + @environment.getProperty('domain.image') + oneData.sysFile + ');'}"></div></li>
+			</th:block>
+		</ul>
+		<button type="button" class="btnArr prev" onclick="fnPicPrev('layer_review_pic');">이전</button>
+		<button type="button" class="btnArr next" onclick="fnPicNext('layer_review_pic');">다음</button>
+		<button type="button" class="btnClose">닫기</button>
+	</div>
+</div>
 
 <script th:inline="javascript">
 /*<![CDATA[*/
-	
-	
+	$(document).ready(function() {
+		let attachList = [[${attachList}]];
+		
+		if(attachList.length>0){
+			$(".rvPic").show();
+		}else{
+			$(".rvPic").hide();	
+		}
+	});
 	// 팝업 열기
 	function fnPopupOpen(id,el,kind) {
 		$("#"+id).removeClass("off");	//레이어 Open

src/main/webapp/WEB-INF/views/marketing/PlanReplyListForm.html

@@ -96,7 +96,7 @@
 		{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
 		{headerName: '회원번호', field: 'custNo', width: 200, cellClass: 'text-center', hide: true},
 		{
-			headerName: '회원명', field: 'maskingCustNm', width: 200, cellClass: 'text-center',
+			headerName: '회원아이디', field: 'maskingCustId', width: 200, cellClass: 'text-center',
 			cellRenderer: function(params) {
 				if (gagajf.isNull(params.value)) return '';
 				return '<a href="javascript:void(0);">' + params.value + '</a>';