Procházet zdrojové kódy

fix: 修改后台航次日历表报错

luofeiyun před 1 týdnem
rodič
revize
ee11e4fd33

+ 6 - 3
ship-module-product/ship-module-product-biz/src/main/resources/mapper/voyage/VoyageMapper.xml

@@ -13,10 +13,13 @@
          where w.deleted = 0 and r.deleted = 0 and w.ship_id = #{shipId} and w.start_time > now() and w.shelf_status = 1 and w.channel like '%1%' order by w.create_time asc;
     </select>
     <select id="selectListCalendar2" resultType="com.yc.ship.module.product.dal.dataobject.voyage.VoyageDO">
-        select w.*,r.basic_price basicPrice from product_voyage w inner join product_price_voyage r on w.route_id = r.id
+        select w.*,r.price basicPrice from product_voyage w inner join resource_route r on w.route_id = r.id
         where w.deleted = 0 and r.deleted = 0
-        <if test="vo.shipId != null and vo.shipId != ''">
-            and w.ship_id = #{shipId}
+        <if test="vo.shipIds != null and vo.shipIds.size() > 0">
+            and w.ship_id in
+            <foreach item="item" collection="vo.shipIds" separator="," open="(" close=")" index="">
+                #{item}
+            </foreach>
         </if>
         <if test="vo.startDate != null and vo.startDate != ''">
             and w.start_time >= #{vo.startDate}