샵링커 주문수집_단건조회추가

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

@@ -928,6 +928,23 @@
 	              </when>
 	            </choose>
 	        </if>
+	        
+	        <if test='conditionOne != null'>
+	            <choose>
+	              <when test='searchOne != null and searchOne == "mallOrderId"'>
+	                AND UPPER(IFNULL(A.MALL_ORDER_ID, B.EXTMALL_ORDER_ID)) like CONCAT('%',UPPER(#{conditionOne}),'%')
+	                
+	              </when>
+
+	              <when test='searchOne != null and searchOne == "orderName"'>
+	              	AND UPPER(IFNULL(A.ORDER_NAME, B.ORD_NM)) like CONCAT('%',UPPER(#{conditionOne}),'%')
+	              </when>
+
+	              <when test='searchOne != null and searchOne == "orderCel"'>
+	              	AND replace(IFNULL(A.ORDER_CEL, B.ORD_TELNO), '-', '') like CONCAT('%',replace(#{conditionOne}, '-', ''),'%')
+	              </when>
+	            </choose>
+	        </if>
 	</sql>
 
 	<!-- 송장전송-전송 목록 건수 cnt -->

src/main/webapp/WEB-INF/views/shoplinker/ShoplinkerOrderForm.html

@@ -111,7 +111,7 @@
 					</tr>
 					<tr>
 						<th>벤더/제휴몰</th>
-						<td colspan="4">
+						<td>
 							<select name="vendorId" required="required" data-valid-name="벤더">
 								<option th:if="${vendorList}" th:each="oneData, status : ${vendorList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
 							</select>/
@@ -120,6 +120,15 @@
 								<option th:if="${extmallList}" th:each="oneData, status : ${extmallList}" th:value="${oneData.extmallId}" th:text="${'[' + oneData.extmallId + '] ' + oneData.extmallNm}"></option>
 							</select>
 						</td>
+						<th>단건 키워드</th>
+						<td>
+							<select name="searchOne" id="searchOne">
+								<option value="mallOrderId">쇼핑몰주문번호</option>
+								<option value="orderName">주문자명</option>
+								<option value="orderCel">주문자연락처</option>
+							</select>
+							<input type="text" class="w40p" name="conditionOne" id="conditionOne">
+						</td>
 					</tr>
 					<tr>
 						<th>제휴몰 주문등록 상태</th>
@@ -269,6 +278,8 @@
 		},
 		{headerName: "쇼핑몰 주문번호", field: "mallOrderId", width: 130, cellClass: 'text-center'},
 		{headerName: "쇼핑몰 명", field: "mallName", width: 130, cellClass: 'text-center'},
+		{headerName: "주문자명", field: "orderName", width: 130, cellClass: 'text-center'},
+		{headerName: "주문자연락처", field: "orderCel", width: 130, cellClass: 'text-center'},
 		{headerName: "배송상태[발주확인]", field: "baesongStatus", width: 130, cellClass: 'text-center'},
 		{headerName: "주문 상품번호", field: "orderProductId", width: 130, cellClass: 'text-center'},
 		{headerName: "샵링커 상품번호", field: "shoplinkerProductId", width: 130, cellClass: 'text-center'},