fixbug

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusRoomBookingOrdersController.java

@@ -115,7 +115,7 @@ public class BusRoomBookingOrdersController extends JeecgController<BusRoomBooki
 	 //@RequiresPermissions("business:bus_room_booking_orders:getBookingOrderInfo")
 	 @GetMapping(value = "/getBookingOrderInfo")
 	private Result<BookingOrderEditVo> getBookingOrderInfo(String bookingOrderId,String bookingNo) {
-	 	return Result.ok(service.getBookingInfoById(bookingOrderId, bookingNo));
+	 	return Result.ok(busRoomBookingOrdersService.getBookingInfoById(bookingOrderId, bookingNo));
 	}
 	
 	/**

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/mapper/CesRoomsMapper.java

@@ -17,42 +17,5 @@ import java.util.List;
  */
 public interface CesRoomsMapper extends BaseMapper<CesRooms> {
 
-    @Select("SELECT\n" +
-            "\t* \n" +
-            "FROM\n" +
-            "\tces_rooms \n" +
-            "WHERE\n" +
-            "\thotel_id = #{hotelId}\n" +
-            "\tand\n" +
-            "\tinvalid = 0\n" +
-            "\tand \n" +
-            "\tid NOT IN (\n" +
-            "\tSELECT DISTINCT\n" +
-            "\t\tbr.room_id \n" +
-            "\tFROM\n" +
-            "\t\tbus_booking_rooms br\n" +
-            "\t\tINNER JOIN bus_room_booking_orders o ON br.booking_orders_id = o.id \n" +
-            "\tWHERE\n" +
-            "\t\tbr.booking_type = 1 \n" +
-            "\t\tAND br.room_id is not null \n" +
-
-            "\t\tAND o.booking_status = 1 \n" +
-            "\t\tAND ( ( o.arrival_time <= #{startOf} AND o.due_out_time >= #{startOf} ) -- 预抵时间在别的客人预定时间范围内\n" +
-            "\t\t\tOR ( o.arrival_time <= #{endOf} AND o.due_out_time >= #{endOf} ) -- 或者预离时间在别的客户预定范围内\n" +
-            "\t\t) UNION ALL\n" +
-            "\tSELECT\n" +
-            "\t\tbr.room_id \n" +
-            "\tFROM\n" +
-            "\t\tbus_booking_rooms br\n" +
-            "\t\tINNER JOIN bus_room_booking_orders o ON br.booking_orders_id = o.id\n" +
-            "\t\tINNER JOIN bus_booking_batch_info bi ON br.booking_batch_id = bi.id \n" +
-            "\t\tAND ( ( bi.arrival_time <= #{startOf} AND bi.due_out_time >= #{startOf} ) -- 预抵时间在别的客人预定时间范围内\n" +
-            "\t\t\tOR ( bi.arrival_time <= #{endOf} AND bi.due_out_time >= #{endOf} ) -- 或者预离时间在别的客户预定范围内\n" +
-            "\t\t) \n" +
-            "\tWHERE\n" +
-            "\t\tbr.booking_type = 2 \n" +
-            "\t\tAND br.room_id is not null \n" +
-            "\t\tAND o.booking_status = 1 \n" +
-            "\t)\n")
     List<CesRooms> canUseRooms(String hotelId, Date startOf, Date endOf);
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/mapper/xml/CesRoomsMapper.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.rooms.mapper.CesRoomsMapper">
+    <select id="canUseRooms" resultType="org.jeecg.modules.rooms.entity.CesRooms">
+        SELECT
+            *
+        FROM
+            ces_rooms
+        WHERE
+            hotel_id = #{hotelId}
+          AND invalid = 0
+          AND state = 1
+          AND id NOT IN (
+            SELECT DISTINCT
+                br.room_id
+            FROM
+                bus_booking_rooms br
+                    INNER JOIN bus_room_booking_orders o ON br.booking_orders_id = o.id
+            WHERE
+                br.booking_type = 1
+              AND br.room_id IS NOT NULL
+              AND o.booking_status = 1
+              AND (
+                ( o.arrival_time &lt;= #{startOf} AND o.due_out_time &gt;= #{startOf} ) -- 预抵时间在别的客人预定时间范围内
+		OR ( o.arrival_time &lt;= #{endOf} AND o.due_out_time &gt;= #{endOf} ) -- 或者预离时间在别的客户预定范围内
+
+	) UNION ALL
+        SELECT
+            br.room_id
+        FROM
+            bus_booking_rooms br
+                INNER JOIN bus_room_booking_orders o ON br.booking_orders_id = o.id
+                INNER JOIN bus_booking_batch_info bi ON br.booking_batch_id = bi.id
+                AND (
+            ( bi.arrival_time &lt;= #{startOf} AND bi.due_out_time &gt;= #{startOf} ) -- 预抵时间在别的客人预定时间范围内
+		OR ( bi.arrival_time &lt;= #{endOf} AND bi.due_out_time &gt;= #{endOf} ) -- 或者预离时间在别的客户预定范围内
+
+	)
+	WHERE
+		br.booking_type = 2
+		AND br.room_id IS NOT NULL
+	AND o.booking_status = 1
+	)
+    </select>
+</mapper>