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

into develop

Conflicts:
	style24.admin/src/main/java/com/style24/admin/biz/web/TsaOrderController.java
	style24.admin/src/main/java/com/style24/persistence/mybatis/shop/TsaOrder.xml

style24.admin/src/main/java/com/style24/admin/biz/web/TsaOrderController.java

@@ -99,7 +99,7 @@ public class TsaOrderController extends TsaBaseController {
 		GagaMap result = new GagaMap();
 		
 		order.setRegNo(TsaSession.getInfo().getUserNo()); // 엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
-		order.setPageable(new TsaPageRequest(order.getPageNo() - 1, order.getPageSize()));
+		order.setPageable(new TsaPageRequest(order.getPageNo() - 1, order.getPageSize()));
 		
 		// 주문전체건수 조회
 		int totalCount = orderService.getOrderListCount(order);
@@ -108,8 +108,8 @@ public class TsaOrderController extends TsaBaseController {
 		// 주문목록 페이지 조회
 		Collection<Order> orderList = orderService.getOrderList(order);
 		
-		result.set("pageing"	, order);
-		result.set("orderList"	, orderList);
+		result.set("pageing", order);
+		result.set("orderList", orderList);
 		
 		return result;
 	}

style24.admin/src/main/java/com/style24/persistence/mybatis/shop/TsaOrder.xml

@@ -35,7 +35,11 @@
 		AND    OD.SUPPLY_COMP_CD = #{supplyCompCd}
 		</if>
 		<if test="multiBrand != null and multiBrand != ''">
+<<<<<<< HEAD
         AND    G1.BRAND_CD IN
+=======
+        AND    G2.BRAND_CD IN
+>>>>>>> branch 'develop' of http://112.172.147.34:4936/style24/STYLE24.git
 			<foreach collection="multiBrand" item="item" index="index"  open="(" close=")" separator=",">
         		#{item}
             </foreach>
@@ -69,13 +73,21 @@
 		AND    O.ORD_PHNNO = #{orderPhnno}
 		</if>
 		<if test='goodsCd != null and goodsCd != ""'>
+<<<<<<< HEAD
 		AND    G1.GOODS_CD = #{goodsCd}
+=======
+		AND    G2.GOODS_CD = #{goodsCd}
+>>>>>>> branch 'develop' of http://112.172.147.34:4936/style24/STYLE24.git
 		</if>
 		<if test='sizeCd != null and sizeCd != ""'>
 		AND    ODI.OPT_CD2 = #{sizeCd}
 		</if>
 		<if test='goodsNm != null and goodsNm != ""'>
+<<<<<<< HEAD
 		AND    G1.GOODS_NM = #{goodsNm}
+=======
+		AND    G2.GOODS_NM = #{goodsNm}
+>>>>>>> branch 'develop' of http://112.172.147.34:4936/style24/STYLE24.git
 		</if>
 		<if test='recipNm != null and recipNm != ""'>
 		AND    DA.RECIP_NM = #{recipNm}
@@ -185,6 +197,7 @@
 				AND    OD.SUPPLY_COMP_CD = #{supplyCompCd}
 				</if>
 				<if test="multiBrand != null and multiBrand != ''">
+<<<<<<< HEAD
 		        AND    G1.BRAND_CD IN
 					<foreach collection="multiBrand" item="item" index="index"  open="(" close=")" separator=",">
 		        		#{item}
@@ -226,6 +239,49 @@
 				</if>
 				<if test='goodsNm != null and goodsNm != ""'>
 				AND    G1.GOODS_NM = #{goodsNm}
+=======
+		        AND    G2.BRAND_CD IN
+					<foreach collection="multiBrand" item="item" index="index"  open="(" close=")" separator=",">
+		        		#{item}
+		            </foreach>
+		        </if>
+		        <if test="multiOrdDtlStat != null and multiOrdDtlStat != ''">
+		        AND    OD.ORD_DTL_STAT IN
+					<foreach collection="multiOrdDtlStat" item="item" index="index"  open="(" close=")" separator=",">
+		        		#{item}
+		            </foreach>
+		        </if>
+		        <if test='search != null and search == "searchOrdNo"'>
+		        	<if test="condition != null and condition != ''">
+				AND    O.ORD_NO = #{condition}
+					</if>
+				</if>
+				<if test='search != null and search == "searchExtmallOrderId"'>
+		        	<if test="condition != null and condition != ''">
+				AND    O.ORD_NO = #{condition}
+					</if>
+				</if>
+				<if test='payMeans != null and payMeans != ""'>
+				AND    P.PAY_MEANS = #{payMeans}
+				</if>
+				<if test='orderNm != null and orderNm != ""'>
+				AND    O.ORD_NM = #{orderNm}
+				</if>
+				<if test='custId != null and custId != ""'>
+				AND    O.CUST_NO = #{custId}
+				</if>
+				<if test='orderPhnno != null and orderPhnno != ""'>
+				AND    O.ORD_PHNNO = #{orderPhnno}
+				</if>
+				<if test='goodsCd != null and goodsCd != ""'>
+				AND    G2.GOODS_CD = #{goodsCd}
+				</if>
+				<if test='sizeCd != null and sizeCd != ""'>
+				AND    ODI.OPT_CD2 = #{sizeCd}
+				</if>
+				<if test='goodsNm != null and goodsNm != ""'>
+				AND    G2.GOODS_NM = #{goodsNm}
+>>>>>>> branch 'develop' of http://112.172.147.34:4936/style24/STYLE24.git
 				</if>
 				<if test='recipNm != null and recipNm != ""'>
 				AND    DA.RECIP_NM = #{recipNm}