Merge branch 'develop' of

http://112.172.147.34:4936/style24/style24.core.git into develop

Conflicts:
	src/main/java/com/style24/core/biz/dao/TscLookbookDao.java
	src/main/java/com/style24/core/biz/service/TscLookbookService.java
	src/main/java/com/style24/persistence/domain/Lookbook.java
	src/main/java/com/style24/persistence/mybatis/shop/TscLookbook.xml

src/main/java/com/style24/core/biz/dao/TscLookbookDao.java

@@ -6,7 +6,10 @@ import org.springframework.stereotype.Repository;
 
 import com.style24.core.support.annotation.ShopDs;
 import com.style24.persistence.domain.Lookbook;
-import com.style24.persistence.domain.LookbookGoods;
+import com.style24.persistence.domain.Popup;
+import org.springframework.stereotype.Repository;
+
+import java.util.Collection;
 
 /**
  * 룩북 Dao
@@ -25,6 +28,36 @@ public interface TscLookbookDao {
      */
     void saveLookbook(Lookbook lookbook);
     
+
+    /**
+     * 룩북 리스트 카운트
+     * @return
+     * @author bin2107
+     * @since 2021. 3. 5
+     */
+    int getLookbookListCount(Lookbook lookbook);
+
+    /**
+     * 룩북 리스트
+     * @return
+     * @author bin2107
+     * @since 2021. 3. 5
+     */
+    Collection<Lookbook> getLookbookList(Lookbook lookbook);
+
+    /**
+     * 룩북 삭제
+     * @return
+     * @author bin2107
+     * @since 2021. 3. 5
+     */
+    void deleteLookbook(Lookbook lookbook);
+    
+    
+    /**
+     *  front 영역
+     */
+    
     /**
 	 * 룩북 베너 목록
 	 *

src/main/java/com/style24/core/biz/service/TscLookbookService.java

@@ -2,6 +2,10 @@ package com.style24.core.biz.service;
 
 import java.io.File;
 import java.util.Collection;
+import com.style24.core.biz.dao.TscLookbookDao;
+import com.style24.persistence.domain.Lookbook;
+import com.style24.persistence.domain.Popup;
+import lombok.extern.slf4j.Slf4j;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
@@ -16,6 +20,7 @@ import lombok.extern.slf4j.Slf4j;
 
 import com.gagaframework.web.util.GagaDateUtil;
 import com.gagaframework.web.util.GagaFileUtil;
+import java.util.Collection;
 
 /**
  * 룩북 Service
@@ -62,6 +67,45 @@ public class TscLookbookService {
 
         lookbookDao.saveLookbook(lookbook);
     }
+
+
+    /**
+     * 룩북 리스트 카운트
+     * @return
+     * @author bin2107
+     * @since 2021. 3. 5
+     */
+    public int getLookbookListCount(Lookbook lookbook) {
+        return lookbookDao.getLookbookListCount(lookbook);
+    }
+
+    /**
+     * 룩북 리스트
+     * @return
+     * @author bin2107
+     * @since 2021. 3. 5
+     */
+    public Collection<Lookbook> getLookbookList(Lookbook lookbook){
+        return lookbookDao.getLookbookList(lookbook);
+    }
+
+    /**
+     * 룩북 삭제
+     * @return
+     * @author bin2107
+     * @since 2021. 3. 5
+     */
+    @Transactional("shopTxnManager")
+    public void deleteLookbook(Lookbook lookbook){
+        for(String lookbookSq : lookbook.getSelectDataArr()){
+            lookbook.setLookbookSq(Integer.parseInt(lookbookSq));
+            lookbookDao.deleteLookbook(lookbook);
+        }
+    }
+    
+    /**
+     * front 영역
+     */
     
     /**
 	 * 룩북

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

@@ -1,9 +1,10 @@
 package com.style24.persistence.domain;
 
 import java.util.Collection;
-
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.style24.persistence.TscBaseDomain;
 
+import com.style24.persistence.TscPageRequest;
 import lombok.Data;
 
 /**
@@ -24,12 +25,13 @@ public class Lookbook extends TscBaseDomain {
     private String  sysTnfileNm;    //시스템썸네일명
     private String  newSysTnfileNm;
     private String  dispStdt;       //전시시작일
+    private String  dispStTime;
     private String  dispEddt;       //전시종료일
+    private String  dispEdTime;
     private String  dispYn;         //표시여부
     private Integer dispOrd;        //표시순서
     private String  mainDispYn;     //메인노출여부
-
-
+    
     private Integer lookbookbSq;	// 룩북배너일련번호
 	private String orgFileNm;		// 원본파일명
 	private String sysFileNm;		// 시스템파일명
@@ -39,4 +41,14 @@ public class Lookbook extends TscBaseDomain {
 	private String goodsCd; 		// 상품상세검색용
 	private String frontGb; 		// 상품상세검색용
 	private String custGb; 			// 상품상세검색용
+    
+    @JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+    private String[] selectDataArr;
+
+    // Pagination
+    private TscPageRequest pageable;
+    private int pageNo = 1;
+    private int pageSize = 50;
+    private int pageUnit = 10;
+   
 }

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

@@ -38,7 +38,77 @@
 		)
 	</insert>
 	
-		<!-- 룩북 베너 목록 조회 -->
+	<!-- 룩북 리스트 카운트 -->
+	<select id="getLookbookListCount" parameterType="Lookbook" resultType="int">
+		/* TscLookbook.getLookbookListCount */
+		SELECT	COUNT(*) AS TOTCNT
+		FROM	TB_LOOKBOOK
+		WHERE	1=1
+		AND 	DISP_YN = 'Y'
+		<if test="dispEddt != null and dispEddt !=''">
+		<![CDATA[
+		AND DISP_STDT <= STR_TO_DATE(CONCAT(#{dispEddt},#{dispEdTime}),'%Y-%m-%d %H:%i:%S')
+		]]>
+		</if>
+		<if test="dispStdt != null and dispStdt !=''">
+		<![CDATA[
+		AND DISP_STDT >= STR_TO_DATE(CONCAT(#{dispStdt},#{dispStTime}),'%Y-%m-%d %H:%i:%S')
+		]]>
+		</if>
+		<if test='brandCd != null and brandCd != ""'>
+		AND	BRAND_CD = #{brandCd}
+		</if>
+	</select>
+
+	<!-- 룩북 리스트 -->
+	<select id="getLookbookList" parameterType="Lookbook" resultType="Lookbook">
+		/* TscLookbook.getLookbookList */
+		SELECT	LOOKBOOK_SQ
+				,BRAND_CD
+				,TITLE
+				,ORG_TNFILE_NM
+				,SYS_TNFILE_NM
+				,DISP_STDT
+				,DISP_EDDT
+				,DISP_YN
+				,DISP_ORD
+				,MAIN_DISP_YN
+				,REG_NO
+				, FN_GET_USER_NM(REG_NO) AS REG_NM
+				,REG_DT
+				,UPD_NO
+				, FN_GET_USER_NM(UPD_NO) AS UPD_NM
+				,UPD_DT
+		FROM	TB_LOOKBOOK
+		WHERE	1=1
+		AND 	DISP_YN = 'Y'
+		<if test="dispEddt != null and dispEddt !=''">
+			<![CDATA[
+		AND DISP_STDT <= STR_TO_DATE(CONCAT(#{dispEddt},#{dispEdTime}),'%Y-%m-%d %H:%i:%S')
+		]]>
+		</if>
+		<if test="dispStdt != null and dispStdt !=''">
+			<![CDATA[
+		AND DISP_STDT >= STR_TO_DATE(CONCAT(#{dispStdt},#{dispStTime}),'%Y-%m-%d %H:%i:%S')
+		]]>
+		</if>
+		<if test='brandCd != null and brandCd != ""'>
+			AND	BRAND_CD = #{brandCd}
+		</if>
+	</select>
+
+	<!-- 룩북 노출안함 처리 -->
+	<update id="deleteLookbook" parameterType="Lookbook">
+		/* TscLookbook.deleteLookbook */
+		UPDATE	TB_LOOKBOOK
+		SET 	DISP_YN = 'N'
+		WHERE	LOOKBOOK_SQ = #{lookbookSq}
+	</update>
+	
+	
+	<!-- front 영역-->
+	
+	<!-- 룩북 베너 목록 조회 -->
 	<select id="getLookbookBannerList" parameterType="Lookbook" resultType="Lookbook">
 		/* TsfGoods.getLookbookBannerList */
 		SELECT A.LOOKBOOK_SQ