会议预约，订餐预定

ruoyi-admin/src/main/java/com/ruoyi/web/controller/conference/ConferenceRoomOrderController.java

@@ -45,6 +45,16 @@ public class ConferenceRoomOrderController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询会议室预约列表不分页且只查询当前时间之后的预约
+     */
+    @PreAuthorize("@ss.hasPermi('system:order:listNoPage')")
+    @GetMapping("/listNoPage")
+    public TableDataInfo listNoPage(ConferenceRoomOrder conferenceRoomOrder) {
+        List<ConferenceRoomOrder> list = conferenceRoomOrderService.selectConferenceRoomOrderListNoPage(conferenceRoomOrder);
+        return getDataTable(list);
+    }
+
     /**
      * 导出会议室预约列表
      */

ruoyi-system/src/main/java/com/ruoyi/system/domain/ConferenceRoom.java

@@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.util.List;
+
 /**
  * 会议室对象 conference_room
  * 
@@ -25,12 +27,37 @@ public class ConferenceRoom extends BaseEntity
     /** 会议室地址 */
     @Excel(name = "会议室地址")
     private String conferenceRoomAddress;
+    /**
+     * 当前状态 空闲/正在使用
+     */
+    private String type;
 
     /** 创建部门 */
     @Excel(name = "创建部门")
     private Long createDept;
 
-    public void setConferenceRoomId(Long conferenceRoomId) 
+    /**
+     * 会议室预约集合
+     */
+    private List<ConferenceRoomOrder> conferenceRoomOrderList;
+
+    public List<ConferenceRoomOrder> getConferenceRoomOrderList() {
+        return conferenceRoomOrderList;
+    }
+
+    public void setConferenceRoomOrderList(List<ConferenceRoomOrder> conferenceRoomOrderList) {
+        this.conferenceRoomOrderList = conferenceRoomOrderList;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public void setConferenceRoomId(Long conferenceRoomId)
     {
         this.conferenceRoomId = conferenceRoomId;
     }

ruoyi-system/src/main/java/com/ruoyi/system/domain/ConferenceRoomOrder.java

@@ -47,6 +47,10 @@ public class ConferenceRoomOrder extends BaseEntity
     /** 会议室人数 */
     @Excel(name = "会议室人数")
     private String conferenceNumber;
+    /**
+     * 是否需要席卡
+     */
+    private String useXk;
 
     /** 会议开始时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -62,7 +66,15 @@ public class ConferenceRoomOrder extends BaseEntity
     @Excel(name = "创建部门")
     private Long createDept;
 
-    public void setConferenceRoomOrderId(Long conferenceRoomOrderId) 
+    public String getUseXk() {
+        return useXk;
+    }
+
+    public void setUseXk(String useXk) {
+        this.useXk = useXk;
+    }
+
+    public void setConferenceRoomOrderId(Long conferenceRoomOrderId)
     {
         this.conferenceRoomOrderId = conferenceRoomOrderId;
     }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/ConferenceRoomOrderMapper.java

@@ -26,7 +26,9 @@ public interface ConferenceRoomOrderMapper
      * @return 会议室预约集合
      */
     public List<ConferenceRoomOrder> selectConferenceRoomOrderList(ConferenceRoomOrder conferenceRoomOrder);
+    public List<ConferenceRoomOrder> selectConferenceRoomOrderListNoPage(ConferenceRoomOrder conferenceRoomOrder);
     public List<ConferenceRoomOrder> selectConferenceRoomOrderByStartTime(ConferenceRoomOrder conferenceRoomOrder);
+    public List<ConferenceRoomOrder> selectConferenceRoomOrderListType(ConferenceRoomOrder conferenceRoomOrder);
 
     /**
      * 新增会议室预约

ruoyi-system/src/main/java/com/ruoyi/system/service/IConferenceRoomOrderService.java

@@ -28,6 +28,10 @@ public interface IConferenceRoomOrderService
      * @return 会议室预约集合
      */
     public List<ConferenceRoomOrder> selectConferenceRoomOrderList(ConferenceRoomOrder conferenceRoomOrder);
+    /**
+     * 查询会议室预约列表不分页且只查询当前时间之后的预约
+     */
+    public List<ConferenceRoomOrder> selectConferenceRoomOrderListNoPage(ConferenceRoomOrder conferenceRoomOrder);
 
     /**
      * 新增会议室预约

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

@@ -43,6 +43,16 @@ public class ConferenceRoomOrderServiceImpl implements IConferenceRoomOrderServi
         return conferenceRoomOrderMapper.selectConferenceRoomOrderList(conferenceRoomOrder);
     }
 
+    /**
+     * 查询会议室预约列表不分页且只查询当前时间之后的预约
+     */
+    @Override
+    public List<ConferenceRoomOrder> selectConferenceRoomOrderListNoPage(ConferenceRoomOrder conferenceRoomOrder) {
+        //当前时间用开始时间接收
+        conferenceRoomOrder.setStartTime(DateUtils.getNowDate());
+        return conferenceRoomOrderMapper.selectConferenceRoomOrderListNoPage(conferenceRoomOrder);
+    }
+
     /**
      * 新增会议室预约
      *
@@ -79,9 +89,16 @@ public class ConferenceRoomOrderServiceImpl implements IConferenceRoomOrderServi
         conferenceRoomOrderNew.setConferenceRoomId(conferenceRoomOrder.getConferenceRoomId());
         conferenceRoomOrderNew.setStartTime(conferenceRoomOrder.getStartTime());
         List<ConferenceRoomOrder> conferenceRoomOrders = conferenceRoomOrderMapper.selectConferenceRoomOrderByStartTime(conferenceRoomOrderNew);
-        if (conferenceRoomOrders != null && conferenceRoomOrders.size() > 0){
+        if (conferenceRoomOrders != null && conferenceRoomOrders.size() > 1){
+            //大于1说明有两个预约，肯定不能预约
             return AjaxResult.error("当前已经被预约");
         }
+        if (conferenceRoomOrders != null && conferenceRoomOrders.size() == 1){
+            if (!conferenceRoomOrders.get(0).getConferenceRoomOrderId().equals(conferenceRoomOrder.getConferenceRoomOrderId())){
+                //等于1且不是自己不能预约
+                return AjaxResult.error("当前已经被预约");
+            }
+        }
         conferenceRoomOrder.setUpdateTime(DateUtils.getNowDate());
         int rows = conferenceRoomOrderMapper.updateConferenceRoomOrder(conferenceRoomOrder);
         return rows > 0 ? AjaxResult.success() : AjaxResult.error();

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

@@ -1,96 +1,119 @@
 package com.ruoyi.system.service.impl;
 
+import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
+
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.ConferenceRoomOrder;
+import com.ruoyi.system.mapper.ConferenceRoomOrderMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.ConferenceRoomMapper;
 import com.ruoyi.system.domain.ConferenceRoom;
 import com.ruoyi.system.service.IConferenceRoomService;
 
+import javax.annotation.Resource;
+
 /**
  * 会议室Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2024-07-23
  */
 @Service
-public class ConferenceRoomServiceImpl implements IConferenceRoomService 
-{
+public class ConferenceRoomServiceImpl implements IConferenceRoomService {
     @Autowired
     private ConferenceRoomMapper conferenceRoomMapper;
+    @Resource
+    private ConferenceRoomOrderMapper conferenceRoomOrderMapper;
 
     /**
      * 查询会议室
-     * 
+     *
      * @param conferenceRoomId 会议室主键
      * @return 会议室
      */
     @Override
-    public ConferenceRoom selectConferenceRoomByConferenceRoomId(Long conferenceRoomId)
-    {
+    public ConferenceRoom selectConferenceRoomByConferenceRoomId(Long conferenceRoomId) {
         return conferenceRoomMapper.selectConferenceRoomByConferenceRoomId(conferenceRoomId);
     }
 
     /**
      * 查询会议室列表
-     * 
+     *
      * @param conferenceRoom 会议室
      * @return 会议室
      */
     @Override
-    public List<ConferenceRoom> selectConferenceRoomList(ConferenceRoom conferenceRoom)
-    {
-        return conferenceRoomMapper.selectConferenceRoomList(conferenceRoom);
+    public List<ConferenceRoom> selectConferenceRoomList(ConferenceRoom conferenceRoom) {
+        List<ConferenceRoom> conferenceRooms = conferenceRoomMapper.selectConferenceRoomList(conferenceRoom);
+        if (conferenceRooms != null && conferenceRooms.size() > 0) {
+            for (ConferenceRoom room : conferenceRooms) {
+                room.setType("N");
+                //去查询每个会议室当前状态是否在使用中
+                ConferenceRoomOrder conferenceRoomOrder = new ConferenceRoomOrder();
+                conferenceRoomOrder.setConferenceRoomId(room.getConferenceRoomId());
+                conferenceRoomOrder.setStartTime(DateUtils.getNowDate());
+                //查询当前是否有正在使用的
+                List<ConferenceRoomOrder> conferenceRoomOrders = conferenceRoomOrderMapper.selectConferenceRoomOrderListType(conferenceRoomOrder);
+                if (conferenceRoomOrders != null && conferenceRoomOrders.size() > 0) {
+                    room.setType("Y");
+                }
+                //查询当前时间之后的预约数据
+                List<ConferenceRoomOrder> conferenceRoomOrdersAfter = conferenceRoomOrderMapper.selectConferenceRoomOrderListNoPage(conferenceRoomOrder);
+                if (conferenceRoomOrdersAfter != null && conferenceRoomOrdersAfter.size() > 0){
+                    room.setConferenceRoomOrderList(conferenceRoomOrdersAfter);
+                }
+            }
+            conferenceRooms = conferenceRooms.stream().sorted(Comparator.comparing(ConferenceRoom::getType)).collect(Collectors.toList());
+        }
+        return conferenceRooms;
     }
 
     /**
      * 新增会议室
-     * 
+     *
      * @param conferenceRoom 会议室
      * @return 结果
      */
     @Override
-    public int insertConferenceRoom(ConferenceRoom conferenceRoom)
-    {
+    public int insertConferenceRoom(ConferenceRoom conferenceRoom) {
         conferenceRoom.setCreateTime(DateUtils.getNowDate());
         return conferenceRoomMapper.insertConferenceRoom(conferenceRoom);
     }
 
     /**
      * 修改会议室
-     * 
+     *
      * @param conferenceRoom 会议室
      * @return 结果
      */
     @Override
-    public int updateConferenceRoom(ConferenceRoom conferenceRoom)
-    {
+    public int updateConferenceRoom(ConferenceRoom conferenceRoom) {
         conferenceRoom.setUpdateTime(DateUtils.getNowDate());
         return conferenceRoomMapper.updateConferenceRoom(conferenceRoom);
     }
 
     /**
      * 批量删除会议室
-     * 
+     *
      * @param conferenceRoomIds 需要删除的会议室主键
      * @return 结果
      */
     @Override
-    public int deleteConferenceRoomByConferenceRoomIds(Long[] conferenceRoomIds)
-    {
+    public int deleteConferenceRoomByConferenceRoomIds(Long[] conferenceRoomIds) {
         return conferenceRoomMapper.deleteConferenceRoomByConferenceRoomIds(conferenceRoomIds);
     }
 
     /**
      * 删除会议室信息
-     * 
+     *
      * @param conferenceRoomId 会议室主键
      * @return 结果
      */
     @Override
-    public int deleteConferenceRoomByConferenceRoomId(Long conferenceRoomId)
-    {
+    public int deleteConferenceRoomByConferenceRoomId(Long conferenceRoomId) {
         return conferenceRoomMapper.deleteConferenceRoomByConferenceRoomId(conferenceRoomId);
     }
 }

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

@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="conferenceRoomId"    column="conference_room_id"    />
         <result property="conferenceRoomName"    column="conference_room_name"    />
         <result property="conferenceRoomAddress"    column="conference_room_address"    />
+        <result property="type"    column="type"    />
         <result property="createDept"    column="create_dept"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -29,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by create_time desc
     </select>
-    
+
     <select id="selectConferenceRoomByConferenceRoomId" parameterType="Long" resultMap="ConferenceRoomResult">
         <include refid="selectConferenceRoomVo"/>
         where conference_room_id = #{conferenceRoomId}

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

@@ -1,63 +1,128 @@
 <?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">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.ConferenceRoomOrderMapper">
-    
+
     <resultMap type="ConferenceRoomOrder" id="ConferenceRoomOrderResult">
-        <result property="conferenceRoomOrderId"    column="conference_room_order_id"    />
-        <result property="orderUser"    column="order_user"    />
-        <result property="orderUserId"    column="order_user_id"    />
-        <result property="conferenceRoomId"    column="conference_room_id"    />
-        <result property="conferenceRoomName"    column="conference_room_name"    />
-        <result property="conferenceRoomAddress"    column="conference_room_address"    />
-        <result property="conferenceName"    column="conference_name"    />
-        <result property="conferenceNumber"    column="conference_number"    />
-        <result property="startTime"    column="start_time"    />
-        <result property="endTime"    column="end_time"    />
-        <result property="createDept"    column="create_dept"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
+        <result property="conferenceRoomOrderId" column="conference_room_order_id"/>
+        <result property="orderUser" column="order_user"/>
+        <result property="orderUserId" column="order_user_id"/>
+        <result property="conferenceRoomId" column="conference_room_id"/>
+        <result property="conferenceRoomName" column="conference_room_name"/>
+        <result property="conferenceRoomAddress" column="conference_room_address"/>
+        <result property="conferenceName" column="conference_name"/>
+        <result property="conferenceNumber" column="conference_number"/>
+        <result property="startTime" column="start_time"/>
+        <result property="endTime" column="end_time"/>
+        <result property="useXk" column="use_xk"/>
+        <result property="createDept" column="create_dept"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="selectConferenceRoomOrderVo">
-        select conference_room_order_id, order_user, order_user_id, conference_room_id, conference_room_name, conference_room_address, conference_name, conference_number, start_time, end_time, create_dept, create_by, create_time, update_by, update_time, remark from conference_room_order
+        select conference_room_order_id,
+               order_user,
+               order_user_id,
+               conference_room_id,
+               conference_room_name,
+               conference_room_address,
+               conference_name,
+               conference_number,
+               start_time,
+               end_time,
+               use_xk,
+               create_dept,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark
+        from conference_room_order
     </sql>
 
-    <select id="selectConferenceRoomOrderList" parameterType="ConferenceRoomOrder" resultMap="ConferenceRoomOrderResult">
+    <select id="selectConferenceRoomOrderList" parameterType="ConferenceRoomOrder"
+            resultMap="ConferenceRoomOrderResult">
         <include refid="selectConferenceRoomOrderVo"/>
-        <where>  
-            <if test="orderUser != null  and orderUser != ''"> and order_user = #{orderUser}</if>
-            <if test="orderUserId != null "> and order_user_id = #{orderUserId}</if>
-            <if test="conferenceRoomId != null "> and conference_room_id = #{conferenceRoomId}</if>
-            <if test="conferenceRoomName != null  and conferenceRoomName != ''"> and conference_room_name like concat('%', #{conferenceRoomName}, '%')</if>
-            <if test="conferenceRoomAddress != null  and conferenceRoomAddress != ''"> and conference_room_address = #{conferenceRoomAddress}</if>
-            <if test="conferenceName != null  and conferenceName != ''"> and conference_name like concat('%', #{conferenceName}, '%')</if>
-            <if test="conferenceNumber != null  and conferenceNumber != ''"> and conference_number = #{conferenceNumber}</if>
-            <if test="startTime != null "> and start_time = #{startTime}</if>
-            <if test="endTime != null "> and end_time = #{endTime}</if>
-            <if test="createDept != null "> and create_dept = #{createDept}</if>
+        <where>
+            <if test="orderUser != null  and orderUser != ''">and order_user = #{orderUser}</if>
+            <if test="orderUserId != null ">and order_user_id = #{orderUserId}</if>
+            <if test="conferenceRoomId != null ">and conference_room_id = #{conferenceRoomId}</if>
+            <if test="conferenceRoomName != null  and conferenceRoomName != ''">and conference_room_name like
+                concat('%', #{conferenceRoomName}, '%')
+            </if>
+            <if test="conferenceRoomAddress != null  and conferenceRoomAddress != ''">and conference_room_address =
+                #{conferenceRoomAddress}
+            </if>
+            <if test="conferenceName != null  and conferenceName != ''">and conference_name like concat('%',
+                #{conferenceName}, '%')
+            </if>
+            <if test="conferenceNumber != null  and conferenceNumber != ''">and conference_number =
+                #{conferenceNumber}
+            </if>
+            <if test="startTime != null ">and start_time = #{startTime}</if>
+            <if test="endTime != null ">and end_time = #{endTime}</if>
+            <if test="useXk != null and useXk != ''">and use_xk = #{useXk}</if>
+            <if test="createDept != null ">and create_dept = #{createDept}</if>
         </where>
-        order by  end_time DESC
+        order by end_time DESC
     </select>
 
-    <select id="selectConferenceRoomOrderByStartTime" parameterType="ConferenceRoomOrder" resultMap="ConferenceRoomOrderResult">
+
+    <select id="selectConferenceRoomOrderListNoPage" parameterType="ConferenceRoomOrder"
+            resultMap="ConferenceRoomOrderResult">
+        <include refid="selectConferenceRoomOrderVo"/>
+        <where>
+            <if test="orderUser != null  and orderUser != ''">and order_user = #{orderUser}</if>
+            <if test="orderUserId != null ">and order_user_id = #{orderUserId}</if>
+            <if test="conferenceRoomId != null ">and conference_room_id = #{conferenceRoomId}</if>
+            <if test="conferenceRoomName != null  and conferenceRoomName != ''">and conference_room_name like
+                concat('%', #{conferenceRoomName}, '%')
+            </if>
+            <if test="conferenceRoomAddress != null  and conferenceRoomAddress != ''">and conference_room_address =
+                #{conferenceRoomAddress}
+            </if>
+            <if test="conferenceName != null  and conferenceName != ''">and conference_name like concat('%',
+                #{conferenceName}, '%')
+            </if>
+            <if test="conferenceNumber != null  and conferenceNumber != ''">and conference_number =
+                #{conferenceNumber}
+            </if>
+            <if test="startTime != null ">and #{startTime} &lt; end_time</if>
+            <if test="useXk != null and useXk != ''">and use_xk = #{useXk}</if>
+            <if test="createDept != null ">and create_dept = #{createDept}</if>
+        </where>
+        order by end_time DESC
+    </select>
+    <select id="selectConferenceRoomOrderListType" parameterType="ConferenceRoomOrder"
+            resultMap="ConferenceRoomOrderResult">
+        <include refid="selectConferenceRoomOrderVo"/>
+        <where>
+            <if test="conferenceRoomId != null ">and conference_room_id = #{conferenceRoomId}</if>
+            <if test="startTime != null ">and #{startTime} BETWEEN start_time and end_time</if>
+        </where>
+    </select>
+    <select id="selectConferenceRoomOrderByStartTime" parameterType="ConferenceRoomOrder"
+            resultMap="ConferenceRoomOrderResult">
         <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="conferenceRoomId != null ">and conference_room_id = #{conferenceRoomId}</if>
+            <if test="startTime != null ">and #{startTime} &lt; end_time</if>
         </where>
     </select>
-    
-    <select id="selectConferenceRoomOrderByConferenceRoomOrderId" parameterType="Long" resultMap="ConferenceRoomOrderResult">
+
+    <select id="selectConferenceRoomOrderByConferenceRoomOrderId" parameterType="Long"
+            resultMap="ConferenceRoomOrderResult">
         <include refid="selectConferenceRoomOrderVo"/>
         where conference_room_order_id = #{conferenceRoomOrderId}
     </select>
-        
-    <insert id="insertConferenceRoomOrder" parameterType="ConferenceRoomOrder" useGeneratedKeys="true" keyProperty="conferenceRoomOrderId">
+
+    <insert id="insertConferenceRoomOrder" parameterType="ConferenceRoomOrder" useGeneratedKeys="true"
+            keyProperty="conferenceRoomOrderId">
         insert into conference_room_order
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="orderUser != null">order_user,</if>
@@ -69,13 +134,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="conferenceNumber != null">conference_number,</if>
             <if test="startTime != null">start_time,</if>
             <if test="endTime != null">end_time,</if>
+            <if test="useXk != null">use_xk,</if>
             <if test="createDept != null">create_dept,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderUser != null">#{orderUser},</if>
             <if test="orderUserId != null">#{orderUserId},</if>
@@ -86,13 +152,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="conferenceNumber != null">#{conferenceNumber},</if>
             <if test="startTime != null">#{startTime},</if>
             <if test="endTime != null">#{endTime},</if>
+            <if test="useXk != null">#{useXk},</if>
             <if test="createDept != null">#{createDept},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateConferenceRoomOrder" parameterType="ConferenceRoomOrder">
@@ -107,6 +174,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="conferenceNumber != null">conference_number = #{conferenceNumber},</if>
             <if test="startTime != null">start_time = #{startTime},</if>
             <if test="endTime != null">end_time = #{endTime},</if>
+            <if test="useXk != null">use_xk = #{useXk},</if>
             <if test="createDept != null">create_dept = #{createDept},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
@@ -118,11 +186,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteConferenceRoomOrderByConferenceRoomOrderId" parameterType="Long">
-        delete from conference_room_order where conference_room_order_id = #{conferenceRoomOrderId}
+        delete
+        from conference_room_order
+        where conference_room_order_id = #{conferenceRoomOrderId}
     </delete>
 
     <delete id="deleteConferenceRoomOrderByConferenceRoomOrderIds" parameterType="String">
-        delete from conference_room_order where conference_room_order_id in 
+        delete from conference_room_order where conference_room_order_id in
         <foreach item="conferenceRoomOrderId" collection="array" open="(" separator="," close=")">
             #{conferenceRoomOrderId}
         </foreach>