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

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

@@ -29,21 +29,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
@@ -142,20 +127,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
@@ -498,20 +469,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
@@ -539,10 +496,9 @@
 		<include refid="getGoodsListCondition_sql"/>
 		ORDER BY G.REG_DT DESC, G.GOODS_CD 
 		</if>
-		<if test="searchGb == null or searchGb =='EXCEL'">
+		<if test="searchGb != null and searchGb =='EXCEL'">
 		ORDER BY SD.TMP_DISP_ORD, G.GOODS_CD 
 		</if>
-		LIMIT #{pageable.limitStartRow} ,  #{pageable.pageSize}
 	</select>
 	
 	<!-- 상품 정보 -->

src/main/java/com/style24/scm/biz/service/TssGoodsService.java

@@ -146,24 +146,24 @@ public class TssGoodsService {
 
 		if ("Y".equals(goodsSearch.getImageViewYn())) {
 			// 헤더 title 설정
-			String[] listTitles = {"이미지", "상품코드", "업체명", "브랜드명", "상품명", "품목", "전시재고", "상품상태", "스타일년도", "시즌",
-				"정상가", "판매가", "할인율", "가격변경일", "ERP재고연동여부", "정상이월구분", "반품가능 여부", "승인일시"};
+			String[] listTitles = {"이미지", "상품코드", "업체명", "브랜드명", "상품명", "품목", 
+				"전시재고", "상품상태", "스타일년도", "시즌","정상가", "판매가", 
+				"할인율", "가격변경일", "정상이월구분", "반품가능 여부"};
 
 			// 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"};
+				"DC_RATE", "PRICE_UPD_DT","FORMAL_GB", "RETURNABLE_YN"};
 
 			String[] cellTypes = {GagaExcelConstants.CellType.IMAGE.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_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_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()};
 
 			String targetPath = env.getProperty("upload.goods.view");
 			Collection<GagaMap> dataList = goodsDao.getGoodsInfoExcelList(goodsSearch); // map형식으로 조회
@@ -186,24 +186,25 @@ public class TssGoodsService {
 
 		} else {
 			// 헤더 title 설정
-			String[] listTitles = {"상품코드", "업체명", "브랜드명", "상품명", "품목", "전시재고", "상품상태", "스타일년도",
-				"시즌", "정상가", "판매가", "할인율", "가격변경일", "ERP재고연동여부", "정상이월구분", "반품가능 여부", "승인일시"};
+			String[] listTitles = {"상품코드", "업체명", "브랜드명", "상품명", "품목", 
+				"전시재고", "상품상태", "스타일년도", "시즌","정상가", "판매가", 
+				"할인율", "가격변경일", "정상이월구분", "반품가능 여부"};
 
 			// 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"};
+			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","FORMAL_GB", "RETURNABLE_YN"};
 
 			String[] cellTypes = {
 				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_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_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()};
-
+			
 			Collection<GagaMap> dataList = goodsDao.getGoodsInfoExcelList(goodsSearch);
 
 			try {

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

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