会议预约，订餐预定

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ConferenceRoomOrderServiceImpl.java

@@ -62,11 +62,7 @@ public class ConferenceRoomOrderServiceImpl implements IConferenceRoomOrderServi
     @Override
     public AjaxResult insertConferenceRoomOrder(ConferenceRoomOrder conferenceRoomOrder) {
         //判断当前时间段是否有预约记录
-        ConferenceRoomOrder conferenceRoomOrderNew  = new  ConferenceRoomOrder();
-        //会议室id
-        conferenceRoomOrderNew.setConferenceRoomId(conferenceRoomOrder.getConferenceRoomId());
-        conferenceRoomOrderNew.setStartTime(conferenceRoomOrder.getStartTime());
-        List<ConferenceRoomOrder> conferenceRoomOrders = conferenceRoomOrderMapper.selectConferenceRoomOrderByStartTime(conferenceRoomOrderNew);
+        List<ConferenceRoomOrder> conferenceRoomOrders = conferenceRoomOrderMapper.selectConferenceRoomOrderByStartTime(conferenceRoomOrder);
         if (conferenceRoomOrders != null && conferenceRoomOrders.size() > 0){
             return AjaxResult.error("当前已经被预约");
         }
@@ -83,12 +79,7 @@ public class ConferenceRoomOrderServiceImpl implements IConferenceRoomOrderServi
      */
     @Override
     public AjaxResult updateConferenceRoomOrder(ConferenceRoomOrder conferenceRoomOrder) {
-        //判断当前时间段是否有预约记录
-        ConferenceRoomOrder conferenceRoomOrderNew  = new  ConferenceRoomOrder();
-        //会议室id
-        conferenceRoomOrderNew.setConferenceRoomId(conferenceRoomOrder.getConferenceRoomId());
-        conferenceRoomOrderNew.setStartTime(conferenceRoomOrder.getStartTime());
-        List<ConferenceRoomOrder> conferenceRoomOrders = conferenceRoomOrderMapper.selectConferenceRoomOrderByStartTime(conferenceRoomOrderNew);
+        List<ConferenceRoomOrder> conferenceRoomOrders = conferenceRoomOrderMapper.selectConferenceRoomOrderByStartTime(conferenceRoomOrder);
         if (conferenceRoomOrders != null && conferenceRoomOrders.size() > 1){
             //大于1说明有两个预约，肯定不能预约
             return AjaxResult.error("当前已经被预约");

ruoyi-system/src/main/resources/mapper/system/ConferenceRoomOrderMapper.xml

@@ -111,7 +111,13 @@
         <include refid="selectConferenceRoomOrderVo"/>
         <where>
             <if test="conferenceRoomId != null ">and conference_room_id = #{conferenceRoomId}</if>
-            <if test="startTime != null ">and #{startTime} &lt; end_time</if>
+            <if test="startTime != null ">
+                AND (
+                (#{startTime} BETWEEN start_time AND end_time )
+                OR ( #{endTime} BETWEEN start_time AND end_time )
+                OR ( start_time BETWEEN #{startTime} AND #{endTime} )
+                )
+            </if>
         </where>
     </select>