Merge branch 'develop' into bin2107

src/main/java/com/style24/admin/biz/service/TsaAnswerPhaseService.java

@@ -3,6 +3,7 @@ package com.style24.admin.biz.service;
 import java.util.Collection;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -44,6 +45,7 @@ public class TsaAnswerPhaseService {
 	 * @since 2020. 10. 29
 	 */
 	@Transactional("shopTxnManager")
+	@CacheEvict(value = "answerPhase", allEntries = true)
 	public void saveAnswerPhase(AnswerPhase ansPhase) {
 		ansPhase.setRegNo(TsaSession.getInfo().getUserNo());
 		ansPhase.setUpdNo(TsaSession.getInfo().getUserNo());

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

@@ -10,6 +10,9 @@
 		      , ANS_CLSF                                     /*답변종류코드*/
 		      , ANS_TITLE                                    /*답변제목*/
 		      , ANS_CONTENT                                  /*답변내용*/
+		      , KAKAO_CD                                     /*카카오템플릿코드*/
+		      , BUTTON_NM                                    /*카카오버튼명*/
+		      , BUTTON_URL                                   /*카카오버튼URL*/
 		      , USE_YN                                       /*사용여부*/
 		      , FN_GET_USER_NM(REG_NO)             AS REG_NM /*등록자*/
 		      , DATE_FORMAT(REG_DT,'%Y%m%d%H%i%S') AS REG_DT /*등록일자*/
@@ -41,6 +44,9 @@
 		     , SITE_CD
 		     , ANS_TITLE
 		     , ANS_CONTENT
+		     , KAKAO_CD
+		     , BUTTON_NM
+		     , BUTTON_URL
 		     , USE_YN
 		     , REG_NO
 		     , REG_DT
@@ -48,11 +54,14 @@
 		     , UPD_DT
 		)
 		VALUES (
-		       NULL
+		       #{ansSq}
 		     , #{ansClsf}
 		     , #{siteCd}
 		     , #{ansTitle}
 		     , #{ansContent}
+		     , #{kakaoCd}
+		     , #{buttonNm}
+		     , #{buttonUrl}
 		     , #{useYn}
 		     , #{regNo}
 		     , NOW()
@@ -64,6 +73,9 @@
 		     , ANS_CLSF = #{ansClsf}
 		     , ANS_TITLE = #{ansTitle}
 		     , ANS_CONTENT = #{ansContent}
+		     , KAKAO_CD = #{kakaoCd}
+		     , BUTTON_NM = #{buttonNm}
+		     , BUTTON_URL = #{buttonUrl}
 		     , USE_YN = #{useYn}
 		     , UPD_NO = #{updNo}
 		     , UPD_DT = NOW()

src/main/webapp/WEB-INF/views/envset/AnswerPhaseForm.html

@@ -131,12 +131,25 @@
 						<td colspan="5">
 							<input type="text" name="ansTitle" maxlength="100" required="required" data-valid-name="답변제목"/>
 						</td>
-						
 					</tr>
 					<tr>
 						<th>답변내용<em class="required" title="필수"></em></th>
 						<td colspan="5">
-							<textarea name="ansContent" class="textareaR3" required="required"  data-valid-name="답변내용"></textarea>
+							<textarea name="ansContent" class="textareaR4" required="required"  data-valid-name="답변내용"></textarea>
+						</td>
+					</tr>
+					<tr>
+						<th>카카오템플릿코드</th>
+						<td>
+							<input type="text" name="kakaoCd" maxlength="20"/>
+						</td>
+						<th>카카오버튼명</th>
+						<td>
+							<input type="text" name="buttonNm" maxlength="50"/>
+						</td>
+						<th>카카오버튼URL</th>
+						<td>
+							<input type="text" name="buttonUrl" maxlength="100"/>
 						</td>
 					</tr>
 				</table>
@@ -162,17 +175,20 @@
 	var columnDefs = [
 		{headerName: "답변번호", field: "ansSq", width: 100, cellClass: 'text-center'},
 		{
-			headerName: "사이트", field: "siteCd", width: 150, cellClass: 'text-center',
+			headerName: "사이트", field: "siteCd", width: 100, cellClass: 'text-center',
 			valueGetter: function (params) { return gagaAgGrid.lookupValue(siteList, params.data.siteCd); }
 		},
 		{
-			headerName: "답변종류", field: "ansClsf", width: 150, cellClass: 'text-center',
+			headerName: "답변종류", field: "ansClsf", width: 100, cellClass: 'text-center',
 			valueGetter: function (params) { return gagaAgGrid.lookupValue(ansClsfList, params.data.ansClsf); }
 		},
 		{
 			headerName: "답변제목", field: "ansTitle", width: 350,
 			cellRenderer: function(params) { return '<a href="javascript:void(0);">' + params.value + '</a>'; }
 		},
+		{headerName: "카카오템플릿코드", field: "kakaoCd", width: 150, cellClass: 'text-center'},
+		{headerName: "카카오버튼명", field: "buttonNm", width: 150, cellClass: 'text-center'},
+		{headerName: "카카오버튼URL", field: "buttonUrl", width: 300},
 		{headerName: "사용여부", field: "useYn", width: 80, cellClass: 'text-center'},
 		{headerName: "등록자", field: "regNm", width: 150, cellClass: 'text-center'},
 		{
@@ -207,6 +223,9 @@
 		
 		$('#detailForm input[name=ansTitle]').val(event.data.ansTitle.replaceAll('&gt;','>')); // 답변제목
 		$('#detailForm textarea[name=ansContent]').val(event.data.ansContent); // 답변내용
+		$('#detailForm input[name=kakaoCd]').val(event.data.kakaoCd); // 카카오템플릿코드
+		$('#detailForm input[name=buttonNm]').val(event.data.buttonNm); // 카카오버튼명
+		$('#detailForm input[name=buttonUrl]').val(event.data.buttonUrl); // 카카오버튼URL
 	}
 
 	// 검색