엑셀조회- 조회조건데이터 전체 노출처리

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

@@ -389,12 +389,12 @@ public class TsaGoodsService {
 		if ("Y".equals(goodsSearch.getImageViewYn())) {
 			// 헤더 title 설정
 			String[] listTitles = {"이미지", "상품코드", "업체명", "브랜드명", "상품명", "품목", "전시재고", "상품상태", "스타일년도", "시즌",
-				"정상가", "판매가", "할인율", "가격변경일", "ERP재고연동여부", "정상이월구분", "반품가능 여부", "승인일시"};
+				"정상가", "판매가", "자사즉시할인가", "가격변경일", "ERP재고연동여부", "정상이월구분", "반품가능 여부"};
 
 			// DB 처리 시 사용되는 파라미터명(셀명) 설정
 			String[] cellNames = {"SYS_IMG_NM", "GOODS_CD", "SUPPLY_COMP_CD", "BRAND_GRP_NM", "GOODS_NM", "ITEMKIND_NM",
 				"STOCK_QTY_SUM", "GOODS_STAT", "STYLE_YEAR", "SEASON_CD", "LIST_PRICE", "CURR_PRICE",
-				"DC_RATE", "PRICE_UPD_DT", "ERP_STOCK_LINK_YN", "FORMAL_GB", "RETURNABLE_YN", "FRST_CFRM_DT"};
+				"BENEFIT_PRICE", "PRICE_UPD_DT", "ERP_STOCK_LINK_YN", "FORMAL_GB", "RETURNABLE_YN"};
 
 			String[] cellTypes = {GagaExcelConstants.CellType.IMAGE.name(),
 				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
@@ -405,7 +405,7 @@ public class TsaGoodsService {
 				GagaExcelConstants.CellType.CHAR_RIGHT.name(), GagaExcelConstants.CellType.CHAR_RIGHT.name(),
 				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
 				GagaExcelConstants.CellType.CHAR_CENTER.name(),
-				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name()};
+				GagaExcelConstants.CellType.CHAR_CENTER.name()};
 
 			String targetPath = env.getProperty("upload.goods.view");
 			Collection<GagaMap> dataList = goodsDao.getGoodsInfoExcelList(goodsSearch); // map형식으로 조회
@@ -425,12 +425,12 @@ public class TsaGoodsService {
 
 		} else {
 			// 헤더 title 설정
-			String[] listTitles = {"상품코드", "업체명", "브랜드명", "상품명", "품목", "전시재고", "상품상태", "스타일년도",
-				"시즌", "정상가", "판매가", "할인율", "가격변경일", "ERP재고연동여부", "정상이월구분", "반품가능 여부", "승인일시"};
+			String[] listTitles = {"상품코드", "업체명", "브랜드명", "상품명", "품목", "전시재고", "상품상태", "스타일년도", "시즌", 
+				"정상가", "판매가", "자사즉시할인가", "가격변경일", "ERP재고연동여부", "정상이월구분", "반품가능 여부"};
 
 			// DB 처리 시 사용되는 파라미터명(셀명) 설정
 			String[] cellNames = {"GOODS_CD", "SUPPLY_COMP_CD", "BRAND_GRP_NM", "GOODS_NM", "ITEMKIND_NM", "STOCK_QTY_SUM", "GOODS_STAT", "STYLE_YEAR",
-				"SEASON_CD", "LIST_PRICE", "CURR_PRICE", "DC_RATE", "PRICE_UPD_DT", "ERP_STOCK_LINK_YN", "FORMAL_GB", "RETURNABLE_YN", "FRST_CFRM_DT"};
+				"SEASON_CD", "LIST_PRICE", "CURR_PRICE", "BENEFIT_PRICE", "PRICE_UPD_DT", "ERP_STOCK_LINK_YN", "FORMAL_GB", "RETURNABLE_YN"};
 
 			String[] cellTypes = {
 				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
@@ -440,8 +440,7 @@ public class TsaGoodsService {
 				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_RIGHT.name(),
 				GagaExcelConstants.CellType.CHAR_RIGHT.name(), GagaExcelConstants.CellType.CHAR_RIGHT.name(),
 				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
-				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
-				GagaExcelConstants.CellType.CHAR_CENTER.name()};
+				GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name()};
 
 			Collection<GagaMap> dataList = goodsDao.getGoodsInfoExcelList(goodsSearch);
 

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

@@ -361,20 +361,6 @@
 		        INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
 		        INNER JOIN TB_SUPPLY_COMPANY S ON G.SUPPLY_COMP_CD = S.SUPPLY_COMP_CD
 		        INNER JOIN TB_GOODS_SUMMARY GS ON G.GOODS_CD = GS.GOODS_CD
-		        <if test="searchGb != null and searchGb =='EXTEND'">
-		        INNER JOIN TB_GOODS_EXTEND GE ON G.GOODS_CD =  GE.EXTEND_GOODS_CD
-		                                      AND GE.GOODS_CD IN
-		            <foreach collection="conditionList" item="item" index="index"  open="(" close=")" separator=",">
-		                                          UPPER(#{item})
-		            </foreach>
-		        </if>
-		        <if test="searchGb != null and searchGb =='MASTER'">
-		        INNER JOIN TB_GOODS_EXTEND GE ON G.GOODS_CD =  GE.GOODS_CD
-		                                      AND GE.EXTEND_GOODS_CD IN
-		            <foreach collection="conditionList" item="item" index="index"  open="(" close=")" separator=",">
-		                                          UPPER(#{item})
-		            </foreach>
-		        </if>
 		        <if test="searchGb != null and searchGb =='EXCEL'">
 		        INNER JOIN (
 		                     SELECT SEARCH_CD
@@ -481,20 +467,6 @@
 		        INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
 		        INNER JOIN TB_SUPPLY_COMPANY S ON G.SUPPLY_COMP_CD = S.SUPPLY_COMP_CD
 		        INNER JOIN TB_GOODS_SUMMARY GS ON G.GOODS_CD = GS.GOODS_CD
-		        <if test="searchGb != null and searchGb =='EXTEND'">
-		        INNER JOIN TB_GOODS_EXTEND GE ON G.GOODS_CD =  GE.EXTEND_GOODS_CD
-		                                      AND GE.GOODS_CD IN
-		            <foreach collection="conditionList" item="item" index="index"  open="(" close=")" separator=",">
-		                                          UPPER(#{item})
-		            </foreach>
-		        </if>
-		        <if test="searchGb != null and searchGb =='MASTER'">
-		        INNER JOIN TB_GOODS_EXTEND GE ON G.GOODS_CD =  GE.GOODS_CD
-		                                      AND GE.EXTEND_GOODS_CD IN
-		            <foreach collection="conditionList" item="item" index="index"  open="(" close=")" separator=",">
-		                                          UPPER(#{item})
-		            </foreach>
-		        </if>
 		        <if test="searchGb != null and searchGb =='EXCEL'">
 		        INNER JOIN (
 		                     SELECT SEARCH_CD
@@ -826,89 +798,87 @@
 	<!-- 상품 목록 기본정보 엑셀  -->
 	<select id="getGoodsInfoExcelList" parameterType="GoodsSearch" resultType="paramMap">
 		/* TsaGoods.getGoodsInfoExcelList */
-		SELECT G.GOODS_CD
-		     , B.BRAND_ENM
-		     , B.BRAND_GRP_NM
-		     , G.BRAND_CD
-		     , G.ITEMKIND_CD
-		     , (SELECT SUPPLY_COMP_NM FROM TB_SUPPLY_COMPANY WHERE SUPPLY_COMP_CD = G.SUPPLY_COMP_CD) AS SUPPLY_COMP_CD
-		     , G.SUPPLY_GOODS_CD
-		     , G.GOODS_NUM
-		     , G.GOODS_NM
-		     , G.GOODS_TYPE
-		     , FN_GET_CODE_NM('G008', G.GOODS_STAT) AS GOODS_STAT
-		     , G.LIST_PRICE
-		     , G.CURR_PRICE
-		     , G.DC_RATE
-		     , G.SELF_GOODS_YN
-		     , FN_GET_CODE_NM('G009', G.FORMAL_GB) AS FORMAL_GB
-		     , G.STYLE_YEAR
-		     , FN_GET_CODE_NM('G006', G.SEASON_CD) AS SEASON_CD
-		     , G.ERP_STOCK_LINK_YN
-		     , G.CHANGEABLE_YN
-		     , G.RETURNABLE_YN
-		     , G.SELL_FEE_RATE
-		     , DATE_FORMAT(G.PRICE_UPD_DT, '%Y-%m-%d %H:%i:%S') AS PRICE_UPD_DT
-		     , DATE_FORMAT(G.FRST_CFRM_DT, '%Y-%m-%d %H:%i:%S') AS FRST_CFRM_DT
-		     , CASE IFNULL((SELECT COUNT(SYS_IMG_NM) FROM TB_GOODS_IMG  WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = G.MAIN_COLOR_CD AND DEFAULT_IMG_YN = 'Y' ),0) 
-		            WHEN 0 THEN 'N'
-		            ELSE 'Y' END AS GOODS_IMAGE_YN
-		     , IFNULL((SELECT STOCK_QTY FROM TB_GOODS_STOCK WHERE GOODS_CD = G.GOODS_CD),0) AS STOCK_QTY_SUM
-		     , (SELECT ITEMKIND_NM FROM TB_ITEMKIND WHERE ITEMKIND_CD = G.ITEMKIND_CD) AS ITEMKIND_NM
-		     , (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG  WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = G.MAIN_COLOR_CD AND DEFAULT_IMG_YN = 'Y' ) AS SYS_IMG_NM
-		     , G.REG_NO
-		     , DATE_FORMAT(G.REG_DT, '%Y-%m-%d %H:%i:%S') AS REG_DT
-		     , G.UPD_NO
-		     , DATE_FORMAT(G.UPD_DT, '%Y-%m-%d %H:%i:%S') AS UPD_DT
-		FROM TB_GOODS G
-		INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
-		INNER JOIN TB_SUPPLY_COMPANY S ON G.SUPPLY_COMP_CD = S.SUPPLY_COMP_CD
-		INNER JOIN TB_GOODS_SUMMARY GS ON G.GOODS_CD = GS.GOODS_CD
-		<if test="searchGb != null and searchGb =='EXTEND'">
-		INNER JOIN TB_GOODS_EXTEND GE ON G.GOODS_CD =  GE.EXTEND_GOODS_CD
-		                              AND GE.GOODS_CD IN
-		    <foreach collection="conditionList" item="item" index="index"  open="(" close=")" separator=",">
-		                              UPPER(#{item})
-		    </foreach>
-		</if>
-		<if test="searchGb != null and searchGb =='MASTER'">
-		INNER JOIN TB_GOODS_EXTEND GE ON G.GOODS_CD =  GE.GOODS_CD
-		                              AND GE.EXTEND_GOODS_CD IN
-		    <foreach collection="conditionList" item="item" index="index"  open="(" close=")" separator=",">
-		                          UPPER(#{item})
-		    </foreach>
-		</if>
-		<if test="searchGb != null and searchGb =='EXCEL'">
-		INNER JOIN (
-		             SELECT SEARCH_CD
-		                  , TMP_DISP_ORD
-		             FROM (
+		SELECT Q.*
+		     , IFNULL(GB.PC_CURR_PRICE, Q.CURR_PRICE)  AS BENEFIT_PRICE
+		FROM (
+		      SELECT G.GOODS_CD
+		           , B.BRAND_ENM
+		           , B.BRAND_GRP_NM
+		           , G.BRAND_CD
+		           , G.ITEMKIND_CD
+		           , (SELECT SUPPLY_COMP_NM FROM TB_SUPPLY_COMPANY WHERE SUPPLY_COMP_CD = G.SUPPLY_COMP_CD) AS SUPPLY_COMP_CD
+		           , G.SUPPLY_GOODS_CD
+		           , G.GOODS_NUM
+		           , G.GOODS_NM
+		           , G.GOODS_TYPE
+		           , FN_GET_CODE_NM('G008', G.GOODS_STAT) AS GOODS_STAT
+		           , G.LIST_PRICE
+		           , G.CURR_PRICE
+		          -- , G.DC_RATE
+		           , G.SELF_GOODS_YN
+		           , FN_GET_CODE_NM('G009', G.FORMAL_GB) AS FORMAL_GB
+		           , G.STYLE_YEAR
+		           , FN_GET_CODE_NM('G006', G.SEASON_CD) AS SEASON_CD
+		           , G.ERP_STOCK_LINK_YN
+		           , G.CHANGEABLE_YN
+		           , G.RETURNABLE_YN
+		           , G.SELL_FEE_RATE
+		           , DATE_FORMAT(G.PRICE_UPD_DT, '%Y-%m-%d %H:%i:%S') AS PRICE_UPD_DT
+		           , DATE_FORMAT(G.FRST_CFRM_DT, '%Y-%m-%d %H:%i:%S') AS FRST_CFRM_DT
+		           , CASE IFNULL((SELECT COUNT(SYS_IMG_NM) FROM TB_GOODS_IMG  WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = G.MAIN_COLOR_CD AND DEFAULT_IMG_YN = 'Y' ),0) 
+		                  WHEN 0 THEN 'N'
+		                  ELSE 'Y' END AS GOODS_IMAGE_YN
+		           , IFNULL((SELECT STOCK_QTY FROM TB_GOODS_STOCK WHERE GOODS_CD = G.GOODS_CD),0) AS STOCK_QTY_SUM
+		           , (SELECT ITEMKIND_NM FROM TB_ITEMKIND WHERE ITEMKIND_CD = G.ITEMKIND_CD) AS ITEMKIND_NM
+		           , (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG  WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = G.MAIN_COLOR_CD AND DEFAULT_IMG_YN = 'Y' ) AS SYS_IMG_NM
+		           , G.REG_NO
+		           , DATE_FORMAT(G.REG_DT, '%Y-%m-%d %H:%i:%S') AS REG_DT
+		           , G.UPD_NO
+		           , DATE_FORMAT(G.UPD_DT, '%Y-%m-%d %H:%i:%S') AS UPD_DT
+		           <choose>
+		           <when test="searchGb != null and searchGb =='EXCEL'">
+		           , SD.TMP_DISP_ORD
+		           </when>
+		           <otherwise>
+		           , 0 AS TMP_DISP_ORD
+		           </otherwise>
+		           </choose>
+		      FROM TB_GOODS G
+		      INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
+		      INNER JOIN TB_SUPPLY_COMPANY S ON G.SUPPLY_COMP_CD = S.SUPPLY_COMP_CD
+		      INNER JOIN TB_GOODS_SUMMARY GS ON G.GOODS_CD = GS.GOODS_CD
+		      <if test="searchGb != null and searchGb =='EXCEL'">
+		      INNER JOIN (
 		                   SELECT SEARCH_CD
-		                        , MIN(DISP_ORD) AS TMP_DISP_ORD
-		                   FROM TB_SEARCH_DATA
-		                   WHERE REG_NO = #{regNo}
-		                   GROUP BY SEARCH_CD) T
-		          ) SD
-		           ON ( (G.GOODS_CD LIKE CONCAT(SD.SEARCH_CD,'%')
-		                 OR G.SUPPLY_GOODS_CD LIKE CONCAT(SD.SEARCH_CD,'%')) 
-		                <if test="mdNo != null and mdNo != ''">
-		                AND G.BRAND_CD IN (
-		                                   SELECT DISTINCT BRAND_CD
-		                                   FROM TB_BRAND_MD
-		                                   WHERE MD_NO = CAST(#{mdNo} AS UNSIGNED)
-		                                  )
-		               </if>
-		              )
-		</if>
-		WHERE 1=1
-		<if test="searchGb == null or searchGb =='BASIC' or searchGb =='EXTEND' or searchGb =='MASTER'" >
-		<include refid="getGoodsListCondition_sql"/>
-		ORDER BY G.REG_DT DESC, G.GOODS_CD 
-		</if>
-		<if test="searchGb == null or searchGb =='EXCEL'">
-		ORDER BY SD.TMP_DISP_ORD, G.GOODS_CD
-		</if>
-		LIMIT #{pageable.limitStartRow} ,  #{pageable.pageSize}
+		                        , TMP_DISP_ORD
+		                   FROM (
+		                         SELECT SEARCH_CD
+		                              , MIN(DISP_ORD) AS TMP_DISP_ORD
+		                         FROM TB_SEARCH_DATA
+		                         WHERE REG_NO = #{regNo}
+		                         GROUP BY SEARCH_CD) T
+		                ) SD
+		                 ON ( (G.GOODS_CD LIKE CONCAT(SD.SEARCH_CD,'%')
+		                       OR G.SUPPLY_GOODS_CD LIKE CONCAT(SD.SEARCH_CD,'%')) 
+		                      <if test="mdNo != null and mdNo != ''">
+		                      AND G.BRAND_CD IN (
+		                                         SELECT DISTINCT BRAND_CD
+		                                         FROM TB_BRAND_MD
+		                                         WHERE MD_NO = CAST(#{mdNo} AS UNSIGNED)
+		                                        )
+		                     </if>
+		                    )
+		      </if>
+		      WHERE 1=1
+		      <if test="searchGb == null or searchGb =='BASIC' or searchGb =='EXTEND' or searchGb =='MASTER'" >
+		      <include refid="getGoodsListCondition_sql"/>
+		      ORDER BY G.REG_DT DESC, G.GOODS_CD 
+		      </if>
+		      <if test="searchGb != null and searchGb =='EXCEL'">
+		      ORDER BY SD.TMP_DISP_ORD, G.GOODS_CD
+		      </if>
+		      ) Q
+		LEFT OUTER JOIN TB_GOODS_BENEFIT_PRICE GB ON Q.GOODS_CD = GB.GOODS_CD AND GB.CUST_GB = 'G100_00'
 	</select>
 	
 	<!-- 상품 정보 -->

src/main/webapp/WEB-INF/views/goods/GoodsListForm.html

@@ -471,7 +471,7 @@
 			}
 		},
 		{headerName: "품목", field: "itemkindNm", width: 150, cellClass: 'text-center'},
-		{headerName: "판매가능재고", field: "stockQtySum", width: 120, cellClass: 'text-right',
+		{headerName: "전시재고", field: "stockQtySum", width: 120, cellClass: 'text-right',
 			valueFormatter: function(params) {	return params.value.addComma();},
 			cellStyle : function(params){
 				if ("00" == params.data.goodsStat  || "10" == params.data.goodsStat || "20" == params.data.goodsStat || "30" == params.data.goodsStat) {