Pārlūkot izejas kodu

[ST24PRJ-431][결함][BOS] 이벤트 페이지에 노출여부 N으로 설정하였는데 페이지 URL로 접근시 접근되지 않음

sshong 4 gadi atpakaļ
vecāks
revīzija
bb3a5a9f79

+ 2 - 1
src/main/java/com/style24/persistence/domain/Plan.java

@@ -64,7 +64,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)

+ 8 - 2
src/main/java/com/style24/persistence/mybatis/shop/TsaPlan.xml

@@ -44,7 +44,8 @@
 		     , REG_NO               
 		     , REG_DT                
 		     , UPD_NO                
-		     , UPD_DT                
+		     , UPD_DT
+		     , USE_YN
 		) VALUES (
 		       #{planSq}
 		     , #{planNm}
@@ -88,6 +89,7 @@
 		     , NOW()
 		     , #{updNo}
 		     , NOW()
+		     , #{useYn}
 		)
 	</insert>
 	
@@ -136,6 +138,7 @@
 					       AS REG_DT              
 					     , UPD_NO                 
 					     , UPD_DT              
+					     , USE_YN
 					FROM   TB_PLAN T JOIN ( SELECT @rownum := 0) R
 					WHERE  1=1
 					AND    DEL_YN = 'N'
@@ -306,7 +309,7 @@
 		     , PLAN_NM = #{planNm}
 		    <if test='planGb == "C"'>
 		     , DISP_STDT = DATE_FORMAT(#{startSearchDate} , '%Y-%m-01 %H:%i:%s')
-		     , DISP_EDDT =DATE_FORMAT(LAST_DAY(#{startSearchDate}) , '%Y-%m-%d 23:59:59')
+		     , DISP_EDDT = DATE_FORMAT(LAST_DAY(#{startSearchDate}) , '%Y-%m-%d 23:59:59')
 		    </if>
 		    <if test='planGb != "C"'>
 		     , DISP_STDT = DATE_FORMAT(#{dispStdt} , '%Y-%m-%d %H:%i:%s')
@@ -346,6 +349,7 @@
 		</if>
 		     , UPD_NO = #{updNo}
 		     , UPD_DT = now()
+		     , USE_YN = #{useYn}
 		WHERE  PLAN_SQ = #{planSq}
 	</update>
 	
@@ -406,6 +410,7 @@
 		          , REG_DT
 		          , UPD_NO
 		          , UPD_DT
+		          , USE_YN
 		      ) SELECT #{planSq}
 		             , PLAN_NM
 		             , PLAN_GB
@@ -442,6 +447,7 @@
 		             , now()
 		             , #{updNo}
 		             , now()
+		             , USE_YN
 		        FROM   TB_PLAN
 		        WHERE  PLAN_SQ = #{copyPlanSq}
 	</insert>

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

@@ -130,7 +130,19 @@
 							</select>
 						</td>
 					</tr>
-					<tr>
+						<tr>
+						<th>카테고리</th>
+						<td>
+							<label class="chkBox" th:if="${cateList}" th:each="oneData, status : ${cateList}">
+								<input type="checkbox" name="cateList" th:value="${oneData.cateNo}" th:text="${oneData.cateNm}"/>
+							</label>
+						</td>
+						<th>사용여부<em class="required" title="필수"></em></th>
+						<td>
+							<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>
+						</td>
 					</tr>
 					<tr>
 						<th>사용고객등급구분</th>
@@ -149,14 +161,6 @@
 							</label>
   						</td>
 					</tr>
-					<tr>
-						<th>카테고리</th>
-						<td>
-							<label class="chkBox" th:if="${cateList}" th:each="oneData, status : ${cateList}">
-								<input type="checkbox" name="cateList" th:value="${oneData.cateNo}" th:text="${oneData.cateNm}"/>
-							</label>
-						</td>
-					</tr>
 					<tr>
 						<th>제휴채널</th>
 						<td colspan="1">
@@ -529,14 +533,25 @@
 							</select>
 						</td>
 						<th>노출여부<em class="required" title="필수"></em></th>
-						<td colspan="3">
-							<select name="openYn" required="required" data-valid-name="오픈여부">
+						<td>
+							<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} == 'N'" th:text="|${oneData.cdNm}|"></option>
 							</select>
 						</td>
 					</tr>
 					<tr>
-						
+						<th>카테고리</th>
+						<td>
+							<label class="chkBox" th:if="${cateList}" th:each="oneData, status : ${cateList}">
+								<input type="checkbox" name="cateList" th:value="${oneData.cateNo}" th:text="${oneData.cateNm}"/>
+							</label>
+						</td>
+						<th>사용여부<em class="required" title="필수"></em></th>
+						<td>
+							<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>
+						</td>
 					</tr>
 					<tr>
 						<th>사용고객등급구분</th>
@@ -555,14 +570,6 @@
 							</label>
   						</td>
 					</tr>
-					<tr>
-						<th>카테고리</th>
-						<td>
-							<label class="chkBox" th:if="${cateList}" th:each="oneData, status : ${cateList}">
-								<input type="checkbox" name="cateList" th:value="${oneData.cateNo}" th:text="${oneData.cateNm}"/>
-							</label>
-						</td>
-					</tr>
 					<tr>
 						<th>제휴채널</th>
 						<td colspan="1">
@@ -1303,6 +1310,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()
 							,dispOrd : $('#planRegisterForm input[name=dispOrd]').val()
 							,replyYn : $('#planRegisterForm select[name=replyYn]').val()
@@ -1409,6 +1417,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()
 							,dispOrd : $('#planUpdateForm input[name=dispOrd]').val()
 							,replyYn : $('#planUpdateForm select[name=replyYn]').val()

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

@@ -50,7 +50,7 @@
 							<td colspan="3">
 								<input type="text" name="planSq" id="planSq"/>
 							</td> -->
-						<th>오픈여부</th>
+						<th>노출여부</th>
 						<td><select name="openYn">
 								<option value="">전체</option>
 								<option th:if="${useYnList}"
@@ -167,7 +167,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>'; }
 		},
@@ -361,8 +361,7 @@
 		$('#planListSearchForm').find('#pageNo').val(result.pageing.pageable.pageNo.addComma());
 		$('#planListSearchForm').find('#pgNo').html(result.pageing.pageable.pageNo.addComma());
 		$('#planListSearchForm').find('#endPgNo').html(result.pageing.pageable.totalPage.addComma());
-		//2022.01.05 replaceXSS 적용
-		var data = result.planList;
+		var data = result.planList;		//XSS 그리드 내 변환
 		let modifyList = [];
 		$.each(data, function(idx, item) {
 			let dtlTitle1 = item.dtlTitle1;

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

@@ -78,7 +78,7 @@
 									<option value="S">총알배송</option>
 							</select></td>
 							
-							<th>오픈여부</th>
+							<th>노출여부</th>
 							<td><select name="openYn">
 									<option value="">전체</option>
 									<option th:if="${useYnList}"
@@ -163,7 +163,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>'; }
 		},