添加打球人检索

src/main/java/com/ctrip/fun/golf/dao/order/OrderDao.java

@@ -1683,8 +1683,8 @@ public class OrderDao extends GenericHibernateDao<Order, Integer> {
     public PagedResponseBean<CourseOrderListBean> queryCourseOrderList(OpOrderQuery orderQuery) {
     public PagedResponseBean<CourseOrderListBean> queryCourseOrderList(OpOrderQuery orderQuery) {
         StringBuilder sb = new StringBuilder(300);
         StringBuilder sb = new StringBuilder(300);
 
 
-        sb.append(" select SQL_CALC_FOUND_ROWS od.uid,od.orderType,od.confirmType,od.processStatus,od.orderId,od.orderNo,od.ContactName as userName,od.orderName,course.districtId,orderitem.playDate,orderitem.teeTime,od.payMode,od.actualAmount,od.PrePayAmount,od.orderDate,od.payDate,od.orderSource,od.orderStatus,od.notifyFlag, invo.invoiceId, od.onlineOrderFlag ");
-        sb.append(" from ord_order od " + "join ord_orderitem orderitem on (od.OrderID=orderitem.OrderID)" + "join prd_course course on (course.id=orderitem.courseId)"
+        sb.append(" select SQL_CALC_FOUND_ROWS od.uid,od.orderType,od.confirmType,od.processStatus,od.orderId,od.orderNo,od.ContactName as userName,od.orderName,course.districtId,orderitem.playDate,orderitem.teeTime,od.payMode,od.actualAmount,od.PrePayAmount,od.orderDate,od.payDate,od.orderSource,od.orderStatus,od.notifyFlag, invo.invoiceId, od.onlineOrderFlag,GROUP_CONCAT(oc.cName) cName ");
+        sb.append(" from ord_order od " + "join ord_orderitem orderitem on (od.OrderID=orderitem.OrderID)" + "join ord_customerinfo oc on (od.OrderID=oc.OrderID)" + "join prd_course course on (course.id=orderitem.courseId)"
                 + "left join ord_invoiceinfo invo on (od.OrderId=invo.OrderId)" + "left join ord_orderassignment orderassignment on orderassignment.OrderID=od.OrderID " + "where 1=1 and od.isConfirm = 2");
                 + "left join ord_invoiceinfo invo on (od.OrderId=invo.OrderId)" + "left join ord_orderassignment orderassignment on orderassignment.OrderID=od.OrderID " + "where 1=1 and od.isConfirm = 2");
         Map<String, Object> parameters = new HashMap<String, Object>();
         Map<String, Object> parameters = new HashMap<String, Object>();
         if (orderQuery.getPaymentVersion() != null) {
         if (orderQuery.getPaymentVersion() != null) {
@@ -1768,6 +1768,11 @@ public class OrderDao extends GenericHibernateDao<Order, Integer> {
         if(orderQuery.getDelayOrder() != null && orderQuery.getDelayOrder()){
         if(orderQuery.getDelayOrder() != null && orderQuery.getDelayOrder()){
         	sb.append(" and od.channel1 = 'Off_D' and od.channel2='01'");
         	sb.append(" and od.channel1 = 'Off_D' and od.channel2='01'");
         }
         }
+        //添加打球人检索条件
+        if(!"".equals(orderQuery.getcName()) && orderQuery.getcName() != null ){
+        	sb.append(" and oc.cName like :cName");
+        	parameters.put("cName", "%" + orderQuery.getcName() + "%");
+        }
         if (orderQuery.getOrderStatuses() != null && orderQuery.getOrderStatuses().size() > 0) {
         if (orderQuery.getOrderStatuses() != null && orderQuery.getOrderStatuses().size() > 0) {
             sb.append(" and (");
             sb.append(" and (");
             int index = 0;
             int index = 0;