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

src/main/java/com/style24/admin/biz/dao/TsaCustomerDao.java

@@ -206,5 +206,15 @@ public interface TsaCustomerDao {
 	 */
 	int getCustomerFindByCellPhone(CustomerSearch customerSearch);
 
+	/**
+	 * 고객 생년월일 저장
+	 *
+	 * @param customer - 고객번호, 생년월일
+	 * @return int - 결과
+	 * @author jsshin
+	 * @since 2021. 05. 10
+	 */
+	int saveBatchBirth(Customer customer);
+
 
 }

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

@@ -122,6 +122,8 @@ public class TsaCustomerService {
 
 		// 3.고객정보 수정
 		customerDao.updateCustomerInfo(customer);
+		// 4.생년월일 수정
+		customerDao.saveBatchBirth(customer);
 
 	}
 

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

@@ -887,4 +887,28 @@
 		WHERE NUMB = 1
 	</select>
 
+	<!--배치 생년월일 -->
+	<insert id="saveBatchBirth" parameterType="Customer">
+		/*TsaCustomer.saveBatchBirth*/
+		INSERT INTO TB_BATCH_BIRTH (
+		       CUST_NO
+		     , BIRTH_YMD
+		     , REG_DT
+		     , REG_NO
+		     , UPD_DT
+		     , UPD_NO
+		) VALUES (
+		       #{custNo}
+		     , #{birthYmd}
+		     , NOW()
+		     , #{custNo}
+		     , NOW()
+		     , #{custNo}
+		)
+		ON DUPLICATE KEY UPDATE
+		       BIRTH_YMD = #{birthYmd}
+		    ,  UPD_DT = NOW()
+		    ,  UPD_NO = #{updNo}
+	</insert>
+
 </mapper>

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

@@ -162,7 +162,6 @@
 		        , M.POLL_QVAL9                                                                                                 
 		        , M.POLL_QVAL10    
 		        , M.POLL_QTYPE_NM
-		        , M.PLAN_SQ
 		 FROM
 		 (		      
 		   SELECT A.POLL_SQ
@@ -188,9 +187,7 @@
 		        , B.POLL_QVAL9
 		        , B.POLL_QVAL10
 		        , B.POLL_QTYPE
-		        , P.PLAN_SQ
 		  FROM   TB_POLL A LEFT JOIN TB_POLL_QUESTION B ON A.POLL_SQ = B.POLL_SQ 
-		                   LEFT JOIN TB_PLAN P ON A.POLL_SQ = P.POLL_SQ
 		  WHERE 1=1
 		     AND A.DEL_YN = 'N'
 		     AND B.DEL_YN = 'N'
@@ -227,7 +224,6 @@
 	              , B.POLL_QVAL8
 	              , B.POLL_QVAL9
 	              , B.POLL_QVAL10
-	              , P.PLAN_SQ
          )M
          ORDER BY M.REG_DT DESC
 	

src/main/webapp/WEB-INF/views/display/MainContentsPopupForm.html

@@ -118,7 +118,7 @@
 				html += '<button type="button" class="btn btn-danger btn-lg" onclick="fnDeleteContentsRow(this);">삭제</button></td>';
 			}
 			html += '</tr>';
-			if(contentsLoc=='SBM004' || contentsLoc=='SBM005'){
+			if(contentsLoc=='SBM004' || contentsLoc=='SBM005' || contentsLoc=='SBMM004'){
 				html += '<tr class="cateTypeTr">';
 				html += '	<th>클릭시<br>페이지창</th>';
 				html += '	<td colspan="3">';
@@ -567,7 +567,7 @@
 		}
 		html += '<button type="button" class="btn btn-danger btn-lg" onclick="fnDeleteContentsRow(this);">삭제</button></td>';
 		html += '</tr>';
-		if(contentsLoc=='SBM004' || contentsLoc=='SBM005'){
+		if(contentsLoc=='SBM004' || contentsLoc=='SBM005' || contentsLoc=='SBMM004'){
 			html += '<tr class="cateTypeTr">';
 			html += '	<th>클릭시<br>페이지창</th>';
 			html += '	<td colspan="3">';
@@ -936,7 +936,7 @@
 
 			var dispOrd = $(this).find("[name=dispOrd]").val();
 
-			if(contentsLoc=='SBM004' || contentsLoc=='SBM005'){
+			if(contentsLoc=='SBM004' || contentsLoc=='SBM005' || contentsLoc=='SBMM004'){
 				var thisIdx = $(this).find("input[name=tableIdx]").val();
 				contentsType = $(this).find("input:radio[name=pageTarget"+thisIdx+"]:checked").val();
 			}

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

@@ -1723,6 +1723,16 @@
 				$("#attendTd").css('display','none');
 			}
 			 
+			 if (planInfo.planGb =='E') {
+				 $("#pollTr").show();
+				
+			}else{
+				 $("#pollTr").hide();
+			}
+			 
+			 
+			
+			 
 			 
 			gridOptionsFGBrandList.api.setRowData(planBrandList);
 			gridOptionsFGCateList.api.setRowData(planCateList);