Merge branch 'main' of http://47.98.207.247:3000/lsq/ship-ota-server

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/orderjzdetail/vo/OrderJzDetailRespVO.java

@@ -63,4 +63,7 @@ public class OrderJzDetailRespVO {
 
     private String signImage;
 
+    private String direction;
+    private String roomModelName;
+
 }

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/orderjzdetail/OrderJzDetailMapper.xml

@@ -10,10 +10,14 @@
 
     <select id="selectPage2"
             resultType="com.yc.ship.module.trade.dal.dataobject.orderjzdetail.OrderJzDetailDO">
-        select d.*
+        select d.* , r.direction , rm.name as room_model_name
         from trade_order_jz_detail d
-                 inner join trade_order_jz oz on d.jz_id = oz.id
-                 inner join trade_order o on o.deleted = 0 and o.id = oz.order_id
+        inner join trade_order_jz oz on d.jz_id = oz.id
+        inner join trade_order o on o.deleted = 0 and o.id = oz.order_id
+        inner join product_voyage v on o.voyage_id = v.id
+        inner join resource_route r on v.route_id = r.id
+        inner join trade_visitor u on u.credential_no = d.id_card
+        inner join resource_room_model rm on u.room_model_id = rm.id
         where d.deleted = 0 and o.voyage_id = #{vo.voyageId}
         <if test="vo.idCard != null">
             and d.id_card like concat('%', #{vo.idCard}, '%')
@@ -21,6 +25,12 @@
         <if test="vo.name != null">
             and d.name like concat('%', #{vo.name}, '%')
         </if>
+        <if test="vo.address != null">
+            and d.address = #{vo.address}
+        </if>
+        <if test="vo.arriveTime != null">
+            and d.arrive_time = #{vo.arriveTime}
+        </if>
         order by d.address asc, d.arrive_time asc, d.batch_no asc
     </select>
     <select id="selectPage3" resultType="map">
@@ -31,7 +41,9 @@
         inner join trade_visitor v on o.id = v.order_id
         where o.deleted = 0 and p.deleted = 0 and r.deleted = 0 and v.deleted = 0
         and  o.voyage_id =  #{vo.voyageId}
-        and (v.credential_no like concat('%', #{vo.queryCode}, '%') or v.mobile like concat('%', #{vo.queryCode}, '%')  or o.order_no like concat('%', #{vo.queryCode}, '%'))
+        <if test="vo.queryCode != null">
+          and (v.credential_no like concat('%', #{vo.queryCode}, '%') or v.mobile like concat('%', #{vo.queryCode}, '%')  or o.order_no like concat('%', #{vo.queryCode}, '%'))
+        </if>
     </select>
 
     <update id="cleanSign">