Merge remote-tracking branch 'TSIT/ST24PRJ-431' into develop

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

@@ -60,7 +60,8 @@ public class Plan extends TscBaseDomain{
 		private String goodsLimitYn;		//상품등록제한여부(Y:상품등록제한)
 		private String goodsLimitQty;		//상품등록제한수(상품등록제한여부가 "Y"일 떄)
 		private String delYn;				//삭제여부(Y:삭제)
-		private String openYn;				//오픈여부(Y:오픈)
+		private String openYn;				//노출여부(Y:오픈)
+		private String useYn;				//사용여부(Y:오픈)
 		private String stDate;
 		private String edDate;
 		@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)

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

@@ -56,7 +56,8 @@
 		                   , REG_DT
 		                     AS REG_DT              
 		                   , UPD_NO                 
-		                   , UPD_DT              
+		                   , UPD_DT
+		                   , USE_YN              
 		              FROM   TB_PLAN T JOIN ( SELECT @rownum := 0) R
 		              WHERE  1=1
 		              AND    DEL_YN = 'N'
@@ -148,7 +149,8 @@
 		     , REG_NO               
 		     , REG_DT                
 		     , UPD_NO                
-		     , UPD_DT                
+		     , UPD_DT
+		     , USE_YN               
 		   ) VALUES (
 		       #{planSq}
 		     , #{planNm}
@@ -186,6 +188,7 @@
 		     , now() 
 		     , #{updNo}
 		     , now()
+		     , #{useYn}
 		)
 	</insert>
 	
@@ -320,6 +323,7 @@
 		</if>
 		     , UPD_NO = #{updNo}
 		     , UPD_DT = now()
+		     , USE_YN = #{useYn}
 		WHERE  PLAN_SQ = #{planSq}
 	</update>
 	
@@ -937,6 +941,7 @@
 		          , REG_DT
 		          , UPD_NO
 		          , UPD_DT
+		          ,	USE_YN
 		      ) SELECT #{planSq}
 		             , PLAN_NM
 		             , PLAN_GB
@@ -973,6 +978,7 @@
 		             , now()
 		             , #{updNo}
 		             , now()
+		             , USE_YN
 		        FROM   TB_PLAN
 		        WHERE  PLAN_SQ = #{copyPlanSq}
 	</insert>

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

@@ -142,21 +142,27 @@
 								<input type="checkbox" name="usableCustGradeArr" value="G110_60" th:text="비회원" checked="checked" disabled="disabled"/>
 							</label>
 						</td>
-						<th>브랜드</th>
+						<th>사용여부<em class="required" title="필수"></em></th>
 						<td>
-						<select name="supplyCompCd" id="supplyCompCd">
-								<option th:if="${supplyCompList}" th:each="oneData, status : ${supplyCompList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
+							<select name="useYn" th:field="*{useYn}">
+								<option th:if="${useYnList}" th:each="oneData, status : ${useYnList}" th:value="${oneData.cd}" th:selected="${oneData.cd} == 'Y'" th:text="|${oneData.cdNm}|"></option>
 							</select>
-							<span id="multiBrand"></span>
 						</td>			
 					</tr>
 					<tr>
 						<th>사용가능고객구분</th>
-						<td  colspan="3">
+						<td>
 							<label class="chkBox">
 								<input type="checkbox" name="usableCustGbArr" value="G100_10" th:text="일반회원" checked="checked" disabled="disabled"/>
 							</label>
   						</td>
+  						<th>브랜드</th>
+						<td>
+						<select name="supplyCompCd" id="supplyCompCd">
+								<option th:if="${supplyCompList}" th:each="oneData, status : ${supplyCompList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
+							</select>
+							<span id="multiBrand"></span>
+						</td>
 					</tr>
 					<tr>
 						<th>목록 이미지<i id="pMimgStar"></i><br/>[삭제여부<label class="chkBox"><input type="checkbox" name="orgMainPimgDelYn" value="Y"/></label>]</th>
@@ -382,7 +388,7 @@
 						</td>
 						<th>노출여부<em class="required" title="필수"></em></th>
 						<td colspan="3">
-							<select name="openYn" required="required" data-valid-name="오픈여부">
+							<select name="openYn" required="required" data-valid-name="노출여부">
 								<option th:if="${useYnList}" th:each="oneData, status : ${useYnList}" th:value="${oneData.cd}" th:selected="${oneData.cd} == 'Y'" th:text="|${oneData.cdNm}|"></option>
 							</select>
 						</td>
@@ -399,22 +405,28 @@
 							<label class="chkBox">
 								<input type="checkbox" name="usableCustGradeArr" value="G110_60" th:text="비회원" checked="checked" disabled="disabled"/>
 							</label>
-						</td>
-						<th>브랜드</th>
+						</td>	
+						<th>사용여부<em class="required" title="필수"></em></th>
 						<td>
-						<select name="supplyCompCd" id="supplyCompCd">
-								<option th:if="${supplyCompList}" th:each="oneData, status : ${supplyCompList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
+							<select name="useYn" required="required" data-valid-name="사용여부">
+								<option th:if="${useYnList}" th:each="oneData, status : ${useYnList}" th:value="${oneData.cd}" th:selected="${oneData.cd} == 'Y'" th:text="|${oneData.cdNm}|"></option>
 							</select>
-							<span id="multiBrand"></span>
-						</td>						
+						</td>					
 					</tr>
 					<tr>
 						<th>사용가능고객구분</th>
-						<td  colspan="3">
+						<td>
 							<label class="chkBox">
 								<input type="checkbox" name="usableCustGbArr" value="G100_10" th:text="일반회원" checked="checked" disabled="disabled"/>
 							</label>
   						</td>
+  						<th>브랜드</th>
+						<td>
+						<select name="supplyCompCd" id="supplyCompCd">
+								<option th:if="${supplyCompList}" th:each="oneData, status : ${supplyCompList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
+							</select>
+							<span id="multiBrand"></span>
+						</td>
 					</tr>
 					<tr>
 						<th>목록 이미지<i id="pMimgStar"></i></th>
@@ -730,6 +742,7 @@
 							,dtlTitle1 : $('#planRegisterForm input[name=dtlTitle1]').val()
 							,cornerNmDispYn :  $('#planRegisterForm select[name=cornerNmDispYn]').val()
 							,openYn :  $('#planRegisterForm select[name=openYn]').val()
+							,useYn :  $('#planRegisterForm select[name=useYn]').val()
 							,siteCd :$('#planRegisterForm select[name=siteCd]').val()
 							,mainPimg :$('#planRegisterForm input[name=mainPimg]').val()
 							,mainMimg : $('#planRegisterForm input[name=mainMimg]').val()
@@ -819,6 +832,7 @@
 							,dtlTitle1 : $('#planUpdateForm input[name=dtlTitle1]').val()
 							,cornerNmDispYn :  $('#planUpdateForm select[name=cornerNmDispYn]').val()
 							,openYn :  $('#planUpdateForm select[name=openYn]').val()
+							,useYn :  $('#planUpdateForm select[name=useYn]').val()
 							,siteCd :$('#planUpdateForm select[name=siteCd]').val()
 							,mainPimg :$('#planUpdateForm input[name=mainPimg]').val()
 							,mainMimg : $('#planUpdateForm input[name=mainMimg]').val()

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

@@ -39,7 +39,7 @@
 								<option th:if="${supplyCompList}" th:each="oneData, status : ${supplyCompList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}" th:selected="${sessionInfo.supplyCompCd ==  oneData.cd}"></option>
 							</select>
 						</td>
-						<th>오픈여부</th>
+						<th>노출여부</th>
 						<td colspan="2"><select name="openYn">
 								<option value="">전체</option>
 								<option th:if="${useYnList}"
@@ -153,7 +153,7 @@
 			valueFormatter: function (params) { return gagaAgGrid.lookupValue(wmGbList, params.value); },
 			valueParser: function (params) { return gagaAgGrid.lookupKey(wmGbList, params.newValue); }
 		},
-		{headerName: "오픈여부"		, field:'openYn'	, width:80 , cellClass: 'text-center'},
+		{headerName: "노출여부"		, field:'openYn'	, width:80 , cellClass: 'text-center'},
 		{headerName: "기획전번호"		, field:'planSq'	, width:100, cellClass: 'text-center',
 			cellRenderer: function(params) { return '<a href="javascript:void(0);">' + params.value + '</a>'; }
 		},

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

@@ -74,7 +74,7 @@
 									<option value="P">기획전</option>
 							</select></td>
 							
-							<th>오픈여부</th>
+							<th>노출여부</th>
 							<td><select name="openYn">
 									<option value="">전체</option>
 									<option th:if="${useYnList}"
@@ -155,7 +155,7 @@
 			valueFormatter: function (params) { return gagaAgGrid.lookupValue(wmGbList, params.value); },
 			valueParser: function (params) { return gagaAgGrid.lookupKey(wmGbList, params.newValue); }
 		},
-		{headerName: "오픈여부"		, field:'openYn'	, width:80 , cellClass: 'text-center'},
+		{headerName: "노출여부"		, field:'openYn'	, width:80 , cellClass: 'text-center'},
 		{headerName: "기획전번호"		, field:'planSq'	, width:100, cellClass: 'text-center',
 			cellRenderer: function(params) { return '<a href="javascript:void(0);">' + params.value + '</a>'; }
 		},