Эх сурвалжийг харах

会议预约,订餐预定

Administrator 11 сар өмнө
parent
commit
f88194258f
18 өөрчлөгдсөн 1720 нэмэгдсэн , 0 устгасан
  1. 98 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/conference/ConferenceRoomController.java
  2. 98 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/conference/ConferenceRoomOrderController.java
  3. 98 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/food/OrderFoodController.java
  4. 84 0
      ruoyi-system/src/main/java/com/ruoyi/system/domain/ConferenceRoom.java
  5. 186 0
      ruoyi-system/src/main/java/com/ruoyi/system/domain/ConferenceRoomOrder.java
  6. 143 0
      ruoyi-system/src/main/java/com/ruoyi/system/domain/OrderFood.java
  7. 61 0
      ruoyi-system/src/main/java/com/ruoyi/system/mapper/ConferenceRoomMapper.java
  8. 62 0
      ruoyi-system/src/main/java/com/ruoyi/system/mapper/ConferenceRoomOrderMapper.java
  9. 61 0
      ruoyi-system/src/main/java/com/ruoyi/system/mapper/OrderFoodMapper.java
  10. 63 0
      ruoyi-system/src/main/java/com/ruoyi/system/service/IConferenceRoomOrderService.java
  11. 61 0
      ruoyi-system/src/main/java/com/ruoyi/system/service/IConferenceRoomService.java
  12. 63 0
      ruoyi-system/src/main/java/com/ruoyi/system/service/IOrderFoodService.java
  13. 111 0
      ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ConferenceRoomOrderServiceImpl.java
  14. 96 0
      ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ConferenceRoomServiceImpl.java
  15. 114 0
      ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderFoodServiceImpl.java
  16. 86 0
      ruoyi-system/src/main/resources/mapper/system/ConferenceRoomMapper.xml
  17. 129 0
      ruoyi-system/src/main/resources/mapper/system/ConferenceRoomOrderMapper.xml
  18. 106 0
      ruoyi-system/src/main/resources/mapper/system/OrderFoodMapper.xml

+ 98 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/conference/ConferenceRoomController.java

@@ -0,0 +1,98 @@
+package com.ruoyi.web.controller.conference;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.ConferenceRoom;
+import com.ruoyi.system.service.IConferenceRoomService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 会议室Controller
+ *
+ * @author ruoyi
+ * @date 2024-07-23
+ */
+@RestController
+@RequestMapping("/conference")
+public class ConferenceRoomController extends BaseController {
+    @Autowired
+    private IConferenceRoomService conferenceRoomService;
+
+    /**
+     * 查询会议室列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:room:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ConferenceRoom conferenceRoom) {
+        startPage();
+        List<ConferenceRoom> list = conferenceRoomService.selectConferenceRoomList(conferenceRoom);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出会议室列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:room:export')")
+    @Log(title = "会议室", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ConferenceRoom conferenceRoom) {
+        List<ConferenceRoom> list = conferenceRoomService.selectConferenceRoomList(conferenceRoom);
+        ExcelUtil<ConferenceRoom> util = new ExcelUtil<ConferenceRoom>(ConferenceRoom.class);
+        util.exportExcel(response, list, "会议室数据");
+    }
+
+    /**
+     * 获取会议室详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:room:query')")
+    @GetMapping(value = "/{conferenceRoomId}")
+    public AjaxResult getInfo(@PathVariable("conferenceRoomId") Long conferenceRoomId) {
+        return success(conferenceRoomService.selectConferenceRoomByConferenceRoomId(conferenceRoomId));
+    }
+
+    /**
+     * 新增会议室
+     */
+    @PreAuthorize("@ss.hasPermi('system:room:add')")
+    @Log(title = "会议室", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ConferenceRoom conferenceRoom) {
+        return toAjax(conferenceRoomService.insertConferenceRoom(conferenceRoom));
+    }
+
+    /**
+     * 修改会议室
+     */
+    @PreAuthorize("@ss.hasPermi('system:room:edit')")
+    @Log(title = "会议室", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody ConferenceRoom conferenceRoom) {
+        return toAjax(conferenceRoomService.updateConferenceRoom(conferenceRoom));
+    }
+
+    /**
+     * 删除会议室
+     */
+    @PreAuthorize("@ss.hasPermi('system:room:remove')")
+    @Log(title = "会议室", businessType = BusinessType.DELETE)
+    @GetMapping("/delete/{conferenceRoomIds}")
+    public AjaxResult remove(@PathVariable Long[] conferenceRoomIds) {
+        return toAjax(conferenceRoomService.deleteConferenceRoomByConferenceRoomIds(conferenceRoomIds));
+    }
+}

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

@@ -0,0 +1,98 @@
+package com.ruoyi.web.controller.conference;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.ConferenceRoomOrder;
+import com.ruoyi.system.service.IConferenceRoomOrderService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 会议室预约Controller
+ *
+ * @author ruoyi
+ * @date 2024-07-23
+ */
+@RestController
+@RequestMapping("/conferenceOrder")
+public class ConferenceRoomOrderController extends BaseController {
+    @Autowired
+    private IConferenceRoomOrderService conferenceRoomOrderService;
+
+    /**
+     * 查询会议室预约列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:order:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ConferenceRoomOrder conferenceRoomOrder) {
+        startPage();
+        List<ConferenceRoomOrder> list = conferenceRoomOrderService.selectConferenceRoomOrderList(conferenceRoomOrder);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出会议室预约列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:order:export')")
+    @Log(title = "会议室预约", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ConferenceRoomOrder conferenceRoomOrder) {
+        List<ConferenceRoomOrder> list = conferenceRoomOrderService.selectConferenceRoomOrderList(conferenceRoomOrder);
+        ExcelUtil<ConferenceRoomOrder> util = new ExcelUtil<ConferenceRoomOrder>(ConferenceRoomOrder.class);
+        util.exportExcel(response, list, "会议室预约数据");
+    }
+
+    /**
+     * 获取会议室预约详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:order:query')")
+    @GetMapping(value = "/{conferenceRoomOrderId}")
+    public AjaxResult getInfo(@PathVariable("conferenceRoomOrderId") Long conferenceRoomOrderId) {
+        return success(conferenceRoomOrderService.selectConferenceRoomOrderByConferenceRoomOrderId(conferenceRoomOrderId));
+    }
+
+    /**
+     * 新增会议室预约
+     */
+    @PreAuthorize("@ss.hasPermi('system:order:add')")
+    @Log(title = "会议室预约", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ConferenceRoomOrder conferenceRoomOrder) {
+        return conferenceRoomOrderService.insertConferenceRoomOrder(conferenceRoomOrder);
+    }
+
+    /**
+     * 修改会议室预约
+     */
+    @PreAuthorize("@ss.hasPermi('system:order:edit')")
+    @Log(title = "会议室预约", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody ConferenceRoomOrder conferenceRoomOrder) {
+        return toAjax(conferenceRoomOrderService.updateConferenceRoomOrder(conferenceRoomOrder));
+    }
+
+    /**
+     * 删除会议室预约
+     */
+    @PreAuthorize("@ss.hasPermi('system:order:remove')")
+    @Log(title = "会议室预约", businessType = BusinessType.DELETE)
+    @GetMapping("/delete/{conferenceRoomOrderIds}")
+    public AjaxResult remove(@PathVariable Long[] conferenceRoomOrderIds) {
+        return toAjax(conferenceRoomOrderService.deleteConferenceRoomOrderByConferenceRoomOrderIds(conferenceRoomOrderIds));
+    }
+}

+ 98 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/food/OrderFoodController.java

@@ -0,0 +1,98 @@
+package com.ruoyi.web.controller.food;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.OrderFood;
+import com.ruoyi.system.service.IOrderFoodService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 订餐预约Controller
+ *
+ * @author ruoyi
+ * @date 2024-07-23
+ */
+@RestController
+@RequestMapping("/food")
+public class OrderFoodController extends BaseController {
+    @Autowired
+    private IOrderFoodService orderFoodService;
+
+    /**
+     * 查询订餐预约列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:food:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(OrderFood orderFood) {
+        startPage();
+        List<OrderFood> list = orderFoodService.selectOrderFoodList(orderFood);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出订餐预约列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:food:export')")
+    @Log(title = "订餐预约", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, OrderFood orderFood) {
+        List<OrderFood> list = orderFoodService.selectOrderFoodList(orderFood);
+        ExcelUtil<OrderFood> util = new ExcelUtil<OrderFood>(OrderFood.class);
+        util.exportExcel(response, list, "订餐预约数据");
+    }
+
+    /**
+     * 获取订餐预约详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:food:query')")
+    @GetMapping(value = "/{orderFoodId}")
+    public AjaxResult getInfo(@PathVariable("orderFoodId") Long orderFoodId) {
+        return success(orderFoodService.selectOrderFoodByOrderFoodId(orderFoodId));
+    }
+
+    /**
+     * 新增订餐预约
+     */
+    @PreAuthorize("@ss.hasPermi('system:food:add')")
+    @Log(title = "订餐预约", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody OrderFood orderFood) {
+        return orderFoodService.insertOrderFood(orderFood);
+    }
+
+    /**
+     * 修改订餐预约
+     */
+    @PreAuthorize("@ss.hasPermi('system:food:edit')")
+    @Log(title = "订餐预约", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody OrderFood orderFood) {
+        return orderFoodService.updateOrderFood(orderFood);
+    }
+
+    /**
+     * 删除订餐预约
+     */
+    @PreAuthorize("@ss.hasPermi('system:food:remove')")
+    @Log(title = "订餐预约", businessType = BusinessType.DELETE)
+    @GetMapping("/delete/{orderFoodIds}")
+    public AjaxResult remove(@PathVariable Long[] orderFoodIds) {
+        return toAjax(orderFoodService.deleteOrderFoodByOrderFoodIds(orderFoodIds));
+    }
+}

+ 84 - 0
ruoyi-system/src/main/java/com/ruoyi/system/domain/ConferenceRoom.java

@@ -0,0 +1,84 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 会议室对象 conference_room
+ * 
+ * @author ruoyi
+ * @date 2024-07-23
+ */
+public class ConferenceRoom extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 会议室ID */
+    private Long conferenceRoomId;
+
+    /** 会议室名称 */
+    @Excel(name = "会议室名称")
+    private String conferenceRoomName;
+
+    /** 会议室地址 */
+    @Excel(name = "会议室地址")
+    private String conferenceRoomAddress;
+
+    /** 创建部门 */
+    @Excel(name = "创建部门")
+    private Long createDept;
+
+    public void setConferenceRoomId(Long conferenceRoomId) 
+    {
+        this.conferenceRoomId = conferenceRoomId;
+    }
+
+    public Long getConferenceRoomId() 
+    {
+        return conferenceRoomId;
+    }
+    public void setConferenceRoomName(String conferenceRoomName) 
+    {
+        this.conferenceRoomName = conferenceRoomName;
+    }
+
+    public String getConferenceRoomName() 
+    {
+        return conferenceRoomName;
+    }
+    public void setConferenceRoomAddress(String conferenceRoomAddress) 
+    {
+        this.conferenceRoomAddress = conferenceRoomAddress;
+    }
+
+    public String getConferenceRoomAddress() 
+    {
+        return conferenceRoomAddress;
+    }
+    public void setCreateDept(Long createDept) 
+    {
+        this.createDept = createDept;
+    }
+
+    public Long getCreateDept() 
+    {
+        return createDept;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("conferenceRoomId", getConferenceRoomId())
+            .append("conferenceRoomName", getConferenceRoomName())
+            .append("conferenceRoomAddress", getConferenceRoomAddress())
+            .append("createDept", getCreateDept())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

+ 186 - 0
ruoyi-system/src/main/java/com/ruoyi/system/domain/ConferenceRoomOrder.java

@@ -0,0 +1,186 @@
+package com.ruoyi.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 会议室预约对象 conference_room_order
+ * 
+ * @author ruoyi
+ * @date 2024-07-23
+ */
+public class ConferenceRoomOrder extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 会议室预约ID */
+    private Long conferenceRoomOrderId;
+
+    /** 会议室预约人员名称 */
+    @Excel(name = "会议室预约人员名称")
+    private String orderUser;
+
+    /** 会议室预约人员id(用户id) */
+    @Excel(name = "会议室预约人员id", readConverterExp = "用=户id")
+    private Long orderUserId;
+
+    /** 会议室ID */
+    @Excel(name = "会议室ID")
+    private Long conferenceRoomId;
+
+    /** 会议室名称 */
+    @Excel(name = "会议室名称")
+    private String conferenceRoomName;
+
+    /** 会议室地址 */
+    @Excel(name = "会议室地址")
+    private String conferenceRoomAddress;
+
+    /** 会议名称 */
+    @Excel(name = "会议名称")
+    private String conferenceName;
+
+    /** 会议室人数 */
+    @Excel(name = "会议室人数")
+    private String conferenceNumber;
+
+    /** 会议开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "会议开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+
+    /** 会议结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "会议结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+
+    /** 创建部门 */
+    @Excel(name = "创建部门")
+    private Long createDept;
+
+    public void setConferenceRoomOrderId(Long conferenceRoomOrderId) 
+    {
+        this.conferenceRoomOrderId = conferenceRoomOrderId;
+    }
+
+    public Long getConferenceRoomOrderId() 
+    {
+        return conferenceRoomOrderId;
+    }
+    public void setOrderUser(String orderUser) 
+    {
+        this.orderUser = orderUser;
+    }
+
+    public String getOrderUser() 
+    {
+        return orderUser;
+    }
+    public void setOrderUserId(Long orderUserId) 
+    {
+        this.orderUserId = orderUserId;
+    }
+
+    public Long getOrderUserId() 
+    {
+        return orderUserId;
+    }
+    public void setConferenceRoomId(Long conferenceRoomId) 
+    {
+        this.conferenceRoomId = conferenceRoomId;
+    }
+
+    public Long getConferenceRoomId() 
+    {
+        return conferenceRoomId;
+    }
+    public void setConferenceRoomName(String conferenceRoomName) 
+    {
+        this.conferenceRoomName = conferenceRoomName;
+    }
+
+    public String getConferenceRoomName() 
+    {
+        return conferenceRoomName;
+    }
+    public void setConferenceRoomAddress(String conferenceRoomAddress) 
+    {
+        this.conferenceRoomAddress = conferenceRoomAddress;
+    }
+
+    public String getConferenceRoomAddress() 
+    {
+        return conferenceRoomAddress;
+    }
+    public void setConferenceName(String conferenceName) 
+    {
+        this.conferenceName = conferenceName;
+    }
+
+    public String getConferenceName() 
+    {
+        return conferenceName;
+    }
+    public void setConferenceNumber(String conferenceNumber) 
+    {
+        this.conferenceNumber = conferenceNumber;
+    }
+
+    public String getConferenceNumber() 
+    {
+        return conferenceNumber;
+    }
+    public void setStartTime(Date startTime) 
+    {
+        this.startTime = startTime;
+    }
+
+    public Date getStartTime() 
+    {
+        return startTime;
+    }
+    public void setEndTime(Date endTime) 
+    {
+        this.endTime = endTime;
+    }
+
+    public Date getEndTime() 
+    {
+        return endTime;
+    }
+    public void setCreateDept(Long createDept) 
+    {
+        this.createDept = createDept;
+    }
+
+    public Long getCreateDept() 
+    {
+        return createDept;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("conferenceRoomOrderId", getConferenceRoomOrderId())
+            .append("orderUser", getOrderUser())
+            .append("orderUserId", getOrderUserId())
+            .append("conferenceRoomId", getConferenceRoomId())
+            .append("conferenceRoomName", getConferenceRoomName())
+            .append("conferenceRoomAddress", getConferenceRoomAddress())
+            .append("conferenceName", getConferenceName())
+            .append("conferenceNumber", getConferenceNumber())
+            .append("startTime", getStartTime())
+            .append("endTime", getEndTime())
+            .append("createDept", getCreateDept())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

+ 143 - 0
ruoyi-system/src/main/java/com/ruoyi/system/domain/OrderFood.java

@@ -0,0 +1,143 @@
+package com.ruoyi.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 订餐预约对象 order_food
+ * 
+ * @author ruoyi
+ * @date 2024-07-23
+ */
+public class OrderFood extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 订餐ID */
+    private Long orderFoodId;
+
+    /** 就餐时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "就餐时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date orderFoodTime;
+
+    /** 就餐类型 1:午餐 2:晚餐 */
+    @Excel(name = "就餐类型 1:午餐 2:晚餐")
+    private String orderFoodType;
+
+    /** 就餐人员名称 */
+    @Excel(name = "就餐人员名称")
+    private String orderFoodUser;
+
+    /** 就餐人员id(用户id) */
+    @Excel(name = "就餐人员id", readConverterExp = "用=户id")
+    private Long orderFoodUserId;
+
+    /** 就餐人员部门 */
+    @Excel(name = "就餐人员部门")
+    private String orderFoodDept;
+
+    /** 就餐人员部门id */
+    @Excel(name = "就餐人员部门id")
+    private Long orderFoodDeptId;
+
+    /** 创建部门 */
+    @Excel(name = "创建部门")
+    private Long createDept;
+
+    public void setOrderFoodId(Long orderFoodId) 
+    {
+        this.orderFoodId = orderFoodId;
+    }
+
+    public Long getOrderFoodId() 
+    {
+        return orderFoodId;
+    }
+    public void setOrderFoodTime(Date orderFoodTime) 
+    {
+        this.orderFoodTime = orderFoodTime;
+    }
+
+    public Date getOrderFoodTime() 
+    {
+        return orderFoodTime;
+    }
+    public void setOrderFoodType(String orderFoodType) 
+    {
+        this.orderFoodType = orderFoodType;
+    }
+
+    public String getOrderFoodType() 
+    {
+        return orderFoodType;
+    }
+    public void setOrderFoodUser(String orderFoodUser) 
+    {
+        this.orderFoodUser = orderFoodUser;
+    }
+
+    public String getOrderFoodUser() 
+    {
+        return orderFoodUser;
+    }
+    public void setOrderFoodUserId(Long orderFoodUserId) 
+    {
+        this.orderFoodUserId = orderFoodUserId;
+    }
+
+    public Long getOrderFoodUserId() 
+    {
+        return orderFoodUserId;
+    }
+    public void setOrderFoodDept(String orderFoodDept) 
+    {
+        this.orderFoodDept = orderFoodDept;
+    }
+
+    public String getOrderFoodDept() 
+    {
+        return orderFoodDept;
+    }
+    public void setOrderFoodDeptId(Long orderFoodDeptId) 
+    {
+        this.orderFoodDeptId = orderFoodDeptId;
+    }
+
+    public Long getOrderFoodDeptId() 
+    {
+        return orderFoodDeptId;
+    }
+    public void setCreateDept(Long createDept) 
+    {
+        this.createDept = createDept;
+    }
+
+    public Long getCreateDept() 
+    {
+        return createDept;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("orderFoodId", getOrderFoodId())
+            .append("orderFoodTime", getOrderFoodTime())
+            .append("orderFoodType", getOrderFoodType())
+            .append("orderFoodUser", getOrderFoodUser())
+            .append("orderFoodUserId", getOrderFoodUserId())
+            .append("orderFoodDept", getOrderFoodDept())
+            .append("orderFoodDeptId", getOrderFoodDeptId())
+            .append("createDept", getCreateDept())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

+ 61 - 0
ruoyi-system/src/main/java/com/ruoyi/system/mapper/ConferenceRoomMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.ConferenceRoom;
+
+/**
+ * 会议室Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-07-23
+ */
+public interface ConferenceRoomMapper 
+{
+    /**
+     * 查询会议室
+     * 
+     * @param conferenceRoomId 会议室主键
+     * @return 会议室
+     */
+    public ConferenceRoom selectConferenceRoomByConferenceRoomId(Long conferenceRoomId);
+
+    /**
+     * 查询会议室列表
+     * 
+     * @param conferenceRoom 会议室
+     * @return 会议室集合
+     */
+    public List<ConferenceRoom> selectConferenceRoomList(ConferenceRoom conferenceRoom);
+
+    /**
+     * 新增会议室
+     * 
+     * @param conferenceRoom 会议室
+     * @return 结果
+     */
+    public int insertConferenceRoom(ConferenceRoom conferenceRoom);
+
+    /**
+     * 修改会议室
+     * 
+     * @param conferenceRoom 会议室
+     * @return 结果
+     */
+    public int updateConferenceRoom(ConferenceRoom conferenceRoom);
+
+    /**
+     * 删除会议室
+     * 
+     * @param conferenceRoomId 会议室主键
+     * @return 结果
+     */
+    public int deleteConferenceRoomByConferenceRoomId(Long conferenceRoomId);
+
+    /**
+     * 批量删除会议室
+     * 
+     * @param conferenceRoomIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteConferenceRoomByConferenceRoomIds(Long[] conferenceRoomIds);
+}

+ 62 - 0
ruoyi-system/src/main/java/com/ruoyi/system/mapper/ConferenceRoomOrderMapper.java

@@ -0,0 +1,62 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.ConferenceRoomOrder;
+
+/**
+ * 会议室预约Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-07-23
+ */
+public interface ConferenceRoomOrderMapper 
+{
+    /**
+     * 查询会议室预约
+     * 
+     * @param conferenceRoomOrderId 会议室预约主键
+     * @return 会议室预约
+     */
+    public ConferenceRoomOrder selectConferenceRoomOrderByConferenceRoomOrderId(Long conferenceRoomOrderId);
+
+    /**
+     * 查询会议室预约列表
+     * 
+     * @param conferenceRoomOrder 会议室预约
+     * @return 会议室预约集合
+     */
+    public List<ConferenceRoomOrder> selectConferenceRoomOrderList(ConferenceRoomOrder conferenceRoomOrder);
+    public List<ConferenceRoomOrder> selectConferenceRoomOrderByStartTime(ConferenceRoomOrder conferenceRoomOrder);
+
+    /**
+     * 新增会议室预约
+     * 
+     * @param conferenceRoomOrder 会议室预约
+     * @return 结果
+     */
+    public int insertConferenceRoomOrder(ConferenceRoomOrder conferenceRoomOrder);
+
+    /**
+     * 修改会议室预约
+     * 
+     * @param conferenceRoomOrder 会议室预约
+     * @return 结果
+     */
+    public int updateConferenceRoomOrder(ConferenceRoomOrder conferenceRoomOrder);
+
+    /**
+     * 删除会议室预约
+     * 
+     * @param conferenceRoomOrderId 会议室预约主键
+     * @return 结果
+     */
+    public int deleteConferenceRoomOrderByConferenceRoomOrderId(Long conferenceRoomOrderId);
+
+    /**
+     * 批量删除会议室预约
+     * 
+     * @param conferenceRoomOrderIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteConferenceRoomOrderByConferenceRoomOrderIds(Long[] conferenceRoomOrderIds);
+}

+ 61 - 0
ruoyi-system/src/main/java/com/ruoyi/system/mapper/OrderFoodMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.OrderFood;
+
+/**
+ * 订餐预约Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-07-23
+ */
+public interface OrderFoodMapper 
+{
+    /**
+     * 查询订餐预约
+     * 
+     * @param orderFoodId 订餐预约主键
+     * @return 订餐预约
+     */
+    public OrderFood selectOrderFoodByOrderFoodId(Long orderFoodId);
+
+    /**
+     * 查询订餐预约列表
+     * 
+     * @param orderFood 订餐预约
+     * @return 订餐预约集合
+     */
+    public List<OrderFood> selectOrderFoodList(OrderFood orderFood);
+
+    /**
+     * 新增订餐预约
+     * 
+     * @param orderFood 订餐预约
+     * @return 结果
+     */
+    public int insertOrderFood(OrderFood orderFood);
+
+    /**
+     * 修改订餐预约
+     * 
+     * @param orderFood 订餐预约
+     * @return 结果
+     */
+    public int updateOrderFood(OrderFood orderFood);
+
+    /**
+     * 删除订餐预约
+     * 
+     * @param orderFoodId 订餐预约主键
+     * @return 结果
+     */
+    public int deleteOrderFoodByOrderFoodId(Long orderFoodId);
+
+    /**
+     * 批量删除订餐预约
+     * 
+     * @param orderFoodIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteOrderFoodByOrderFoodIds(Long[] orderFoodIds);
+}

+ 63 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/IConferenceRoomOrderService.java

@@ -0,0 +1,63 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.ConferenceRoomOrder;
+
+/**
+ * 会议室预约Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-07-23
+ */
+public interface IConferenceRoomOrderService 
+{
+    /**
+     * 查询会议室预约
+     * 
+     * @param conferenceRoomOrderId 会议室预约主键
+     * @return 会议室预约
+     */
+    public ConferenceRoomOrder selectConferenceRoomOrderByConferenceRoomOrderId(Long conferenceRoomOrderId);
+
+    /**
+     * 查询会议室预约列表
+     * 
+     * @param conferenceRoomOrder 会议室预约
+     * @return 会议室预约集合
+     */
+    public List<ConferenceRoomOrder> selectConferenceRoomOrderList(ConferenceRoomOrder conferenceRoomOrder);
+
+    /**
+     * 新增会议室预约
+     * 
+     * @param conferenceRoomOrder 会议室预约
+     * @return 结果
+     */
+    public AjaxResult insertConferenceRoomOrder(ConferenceRoomOrder conferenceRoomOrder);
+
+    /**
+     * 修改会议室预约
+     * 
+     * @param conferenceRoomOrder 会议室预约
+     * @return 结果
+     */
+    public AjaxResult updateConferenceRoomOrder(ConferenceRoomOrder conferenceRoomOrder);
+
+    /**
+     * 批量删除会议室预约
+     * 
+     * @param conferenceRoomOrderIds 需要删除的会议室预约主键集合
+     * @return 结果
+     */
+    public int deleteConferenceRoomOrderByConferenceRoomOrderIds(Long[] conferenceRoomOrderIds);
+
+    /**
+     * 删除会议室预约信息
+     * 
+     * @param conferenceRoomOrderId 会议室预约主键
+     * @return 结果
+     */
+    public int deleteConferenceRoomOrderByConferenceRoomOrderId(Long conferenceRoomOrderId);
+}

+ 61 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/IConferenceRoomService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.ConferenceRoom;
+
+/**
+ * 会议室Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-07-23
+ */
+public interface IConferenceRoomService 
+{
+    /**
+     * 查询会议室
+     * 
+     * @param conferenceRoomId 会议室主键
+     * @return 会议室
+     */
+    public ConferenceRoom selectConferenceRoomByConferenceRoomId(Long conferenceRoomId);
+
+    /**
+     * 查询会议室列表
+     * 
+     * @param conferenceRoom 会议室
+     * @return 会议室集合
+     */
+    public List<ConferenceRoom> selectConferenceRoomList(ConferenceRoom conferenceRoom);
+
+    /**
+     * 新增会议室
+     * 
+     * @param conferenceRoom 会议室
+     * @return 结果
+     */
+    public int insertConferenceRoom(ConferenceRoom conferenceRoom);
+
+    /**
+     * 修改会议室
+     * 
+     * @param conferenceRoom 会议室
+     * @return 结果
+     */
+    public int updateConferenceRoom(ConferenceRoom conferenceRoom);
+
+    /**
+     * 批量删除会议室
+     * 
+     * @param conferenceRoomIds 需要删除的会议室主键集合
+     * @return 结果
+     */
+    public int deleteConferenceRoomByConferenceRoomIds(Long[] conferenceRoomIds);
+
+    /**
+     * 删除会议室信息
+     * 
+     * @param conferenceRoomId 会议室主键
+     * @return 结果
+     */
+    public int deleteConferenceRoomByConferenceRoomId(Long conferenceRoomId);
+}

+ 63 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/IOrderFoodService.java

@@ -0,0 +1,63 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.OrderFood;
+
+/**
+ * 订餐预约Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-07-23
+ */
+public interface IOrderFoodService 
+{
+    /**
+     * 查询订餐预约
+     * 
+     * @param orderFoodId 订餐预约主键
+     * @return 订餐预约
+     */
+    public OrderFood selectOrderFoodByOrderFoodId(Long orderFoodId);
+
+    /**
+     * 查询订餐预约列表
+     * 
+     * @param orderFood 订餐预约
+     * @return 订餐预约集合
+     */
+    public List<OrderFood> selectOrderFoodList(OrderFood orderFood);
+
+    /**
+     * 新增订餐预约
+     * 
+     * @param orderFood 订餐预约
+     * @return 结果
+     */
+    public AjaxResult insertOrderFood(OrderFood orderFood);
+
+    /**
+     * 修改订餐预约
+     * 
+     * @param orderFood 订餐预约
+     * @return 结果
+     */
+    public AjaxResult updateOrderFood(OrderFood orderFood);
+
+    /**
+     * 批量删除订餐预约
+     * 
+     * @param orderFoodIds 需要删除的订餐预约主键集合
+     * @return 结果
+     */
+    public int deleteOrderFoodByOrderFoodIds(Long[] orderFoodIds);
+
+    /**
+     * 删除订餐预约信息
+     * 
+     * @param orderFoodId 订餐预约主键
+     * @return 结果
+     */
+    public int deleteOrderFoodByOrderFoodId(Long orderFoodId);
+}

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

@@ -0,0 +1,111 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.ConferenceRoomOrderMapper;
+import com.ruoyi.system.domain.ConferenceRoomOrder;
+import com.ruoyi.system.service.IConferenceRoomOrderService;
+
+/**
+ * 会议室预约Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-07-23
+ */
+@Service
+public class ConferenceRoomOrderServiceImpl implements IConferenceRoomOrderService {
+    @Autowired
+    private ConferenceRoomOrderMapper conferenceRoomOrderMapper;
+
+    /**
+     * 查询会议室预约
+     *
+     * @param conferenceRoomOrderId 会议室预约主键
+     * @return 会议室预约
+     */
+    @Override
+    public ConferenceRoomOrder selectConferenceRoomOrderByConferenceRoomOrderId(Long conferenceRoomOrderId) {
+        return conferenceRoomOrderMapper.selectConferenceRoomOrderByConferenceRoomOrderId(conferenceRoomOrderId);
+    }
+
+    /**
+     * 查询会议室预约列表
+     *
+     * @param conferenceRoomOrder 会议室预约
+     * @return 会议室预约
+     */
+    @Override
+    public List<ConferenceRoomOrder> selectConferenceRoomOrderList(ConferenceRoomOrder conferenceRoomOrder) {
+        return conferenceRoomOrderMapper.selectConferenceRoomOrderList(conferenceRoomOrder);
+    }
+
+    /**
+     * 新增会议室预约
+     *
+     * @param conferenceRoomOrder 会议室预约
+     * @return 结果
+     */
+    @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);
+        if (conferenceRoomOrders != null && conferenceRoomOrders.size() > 0){
+            return AjaxResult.error("当前已经被预约");
+        }
+        conferenceRoomOrder.setCreateTime(DateUtils.getNowDate());
+        int rows = conferenceRoomOrderMapper.insertConferenceRoomOrder(conferenceRoomOrder);
+        return rows > 0 ? AjaxResult.success() : AjaxResult.error();
+    }
+
+    /**
+     * 修改会议室预约
+     *
+     * @param conferenceRoomOrder 会议室预约
+     * @return 结果
+     */
+    @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);
+        if (conferenceRoomOrders != null && conferenceRoomOrders.size() > 0){
+            return AjaxResult.error("当前已经被预约");
+        }
+        conferenceRoomOrder.setUpdateTime(DateUtils.getNowDate());
+        int rows = conferenceRoomOrderMapper.updateConferenceRoomOrder(conferenceRoomOrder);
+        return rows > 0 ? AjaxResult.success() : AjaxResult.error();
+    }
+
+    /**
+     * 批量删除会议室预约
+     *
+     * @param conferenceRoomOrderIds 需要删除的会议室预约主键
+     * @return 结果
+     */
+    @Override
+    public int deleteConferenceRoomOrderByConferenceRoomOrderIds(Long[] conferenceRoomOrderIds) {
+        return conferenceRoomOrderMapper.deleteConferenceRoomOrderByConferenceRoomOrderIds(conferenceRoomOrderIds);
+    }
+
+    /**
+     * 删除会议室预约信息
+     *
+     * @param conferenceRoomOrderId 会议室预约主键
+     * @return 结果
+     */
+    @Override
+    public int deleteConferenceRoomOrderByConferenceRoomOrderId(Long conferenceRoomOrderId) {
+        return conferenceRoomOrderMapper.deleteConferenceRoomOrderByConferenceRoomOrderId(conferenceRoomOrderId);
+    }
+}

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

@@ -0,0 +1,96 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+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;
+
+/**
+ * 会议室Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-07-23
+ */
+@Service
+public class ConferenceRoomServiceImpl implements IConferenceRoomService 
+{
+    @Autowired
+    private ConferenceRoomMapper conferenceRoomMapper;
+
+    /**
+     * 查询会议室
+     * 
+     * @param conferenceRoomId 会议室主键
+     * @return 会议室
+     */
+    @Override
+    public ConferenceRoom selectConferenceRoomByConferenceRoomId(Long conferenceRoomId)
+    {
+        return conferenceRoomMapper.selectConferenceRoomByConferenceRoomId(conferenceRoomId);
+    }
+
+    /**
+     * 查询会议室列表
+     * 
+     * @param conferenceRoom 会议室
+     * @return 会议室
+     */
+    @Override
+    public List<ConferenceRoom> selectConferenceRoomList(ConferenceRoom conferenceRoom)
+    {
+        return conferenceRoomMapper.selectConferenceRoomList(conferenceRoom);
+    }
+
+    /**
+     * 新增会议室
+     * 
+     * @param conferenceRoom 会议室
+     * @return 结果
+     */
+    @Override
+    public int insertConferenceRoom(ConferenceRoom conferenceRoom)
+    {
+        conferenceRoom.setCreateTime(DateUtils.getNowDate());
+        return conferenceRoomMapper.insertConferenceRoom(conferenceRoom);
+    }
+
+    /**
+     * 修改会议室
+     * 
+     * @param conferenceRoom 会议室
+     * @return 结果
+     */
+    @Override
+    public int updateConferenceRoom(ConferenceRoom conferenceRoom)
+    {
+        conferenceRoom.setUpdateTime(DateUtils.getNowDate());
+        return conferenceRoomMapper.updateConferenceRoom(conferenceRoom);
+    }
+
+    /**
+     * 批量删除会议室
+     * 
+     * @param conferenceRoomIds 需要删除的会议室主键
+     * @return 结果
+     */
+    @Override
+    public int deleteConferenceRoomByConferenceRoomIds(Long[] conferenceRoomIds)
+    {
+        return conferenceRoomMapper.deleteConferenceRoomByConferenceRoomIds(conferenceRoomIds);
+    }
+
+    /**
+     * 删除会议室信息
+     * 
+     * @param conferenceRoomId 会议室主键
+     * @return 结果
+     */
+    @Override
+    public int deleteConferenceRoomByConferenceRoomId(Long conferenceRoomId)
+    {
+        return conferenceRoomMapper.deleteConferenceRoomByConferenceRoomId(conferenceRoomId);
+    }
+}

+ 114 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderFoodServiceImpl.java

@@ -0,0 +1,114 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.OrderFoodMapper;
+import com.ruoyi.system.domain.OrderFood;
+import com.ruoyi.system.service.IOrderFoodService;
+
+/**
+ * 订餐预约Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-07-23
+ */
+@Service
+public class OrderFoodServiceImpl implements IOrderFoodService {
+    @Autowired
+    private OrderFoodMapper orderFoodMapper;
+
+    /**
+     * 查询订餐预约
+     *
+     * @param orderFoodId 订餐预约主键
+     * @return 订餐预约
+     */
+    @Override
+    public OrderFood selectOrderFoodByOrderFoodId(Long orderFoodId) {
+        return orderFoodMapper.selectOrderFoodByOrderFoodId(orderFoodId);
+    }
+
+    /**
+     * 查询订餐预约列表
+     *
+     * @param orderFood 订餐预约
+     * @return 订餐预约
+     */
+    @Override
+    public List<OrderFood> selectOrderFoodList(OrderFood orderFood) {
+        return orderFoodMapper.selectOrderFoodList(orderFood);
+    }
+
+    /**
+     * 新增订餐预约
+     *
+     * @param orderFood 订餐预约
+     * @return 结果
+     */
+    @Override
+    public AjaxResult insertOrderFood(OrderFood orderFood) {
+        //判断这个人这个时间是否已经预约
+        Long userId = SecurityUtils.getUserId();
+        OrderFood orderFoodNew = new OrderFood();
+        orderFoodNew.setOrderFoodUserId(userId);
+        orderFoodNew.setOrderFoodType(orderFood.getOrderFoodType());
+        orderFoodNew.setOrderFoodTime(orderFood.getOrderFoodTime());
+        List<OrderFood> orderFoods = orderFoodMapper.selectOrderFoodList(orderFoodNew);
+        if (orderFoods != null && orderFoods.size() > 0) {
+            return AjaxResult.error("请勿重复预约");
+        }
+        orderFood.setCreateTime(DateUtils.getNowDate());
+        int rows = orderFoodMapper.insertOrderFood(orderFood);
+        return rows > 0 ? AjaxResult.success() : AjaxResult.error();
+    }
+
+    /**
+     * 修改订餐预约
+     *
+     * @param orderFood 订餐预约
+     * @return 结果
+     */
+    @Override
+    public AjaxResult updateOrderFood(OrderFood orderFood) {
+        //判断这个人这个时间是否已经预约
+        Long userId = SecurityUtils.getUserId();
+        OrderFood orderFoodNew = new OrderFood();
+        orderFoodNew.setOrderFoodUserId(userId);
+        orderFoodNew.setOrderFoodType(orderFood.getOrderFoodType());
+        orderFoodNew.setOrderFoodTime(orderFood.getOrderFoodTime());
+        List<OrderFood> orderFoods = orderFoodMapper.selectOrderFoodList(orderFoodNew);
+        if (orderFoods != null && orderFoods.size() > 0) {
+            return AjaxResult.error("请勿重复预约");
+        }
+        orderFood.setUpdateTime(DateUtils.getNowDate());
+        int rows = orderFoodMapper.updateOrderFood(orderFood);
+        return rows > 0 ? AjaxResult.success() : AjaxResult.error();
+    }
+
+    /**
+     * 批量删除订餐预约
+     *
+     * @param orderFoodIds 需要删除的订餐预约主键
+     * @return 结果
+     */
+    @Override
+    public int deleteOrderFoodByOrderFoodIds(Long[] orderFoodIds) {
+        return orderFoodMapper.deleteOrderFoodByOrderFoodIds(orderFoodIds);
+    }
+
+    /**
+     * 删除订餐预约信息
+     *
+     * @param orderFoodId 订餐预约主键
+     * @return 结果
+     */
+    @Override
+    public int deleteOrderFoodByOrderFoodId(Long orderFoodId) {
+        return orderFoodMapper.deleteOrderFoodByOrderFoodId(orderFoodId);
+    }
+}

+ 86 - 0
ruoyi-system/src/main/resources/mapper/system/ConferenceRoomMapper.xml

@@ -0,0 +1,86 @@
+<?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="com.ruoyi.system.mapper.ConferenceRoomMapper">
+    
+    <resultMap type="ConferenceRoom" id="ConferenceRoomResult">
+        <result property="conferenceRoomId"    column="conference_room_id"    />
+        <result property="conferenceRoomName"    column="conference_room_name"    />
+        <result property="conferenceRoomAddress"    column="conference_room_address"    />
+        <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="selectConferenceRoomVo">
+        select conference_room_id, conference_room_name, conference_room_address, create_dept, create_by, create_time, update_by, update_time, remark from conference_room
+    </sql>
+
+    <select id="selectConferenceRoomList" parameterType="ConferenceRoom" resultMap="ConferenceRoomResult">
+        <include refid="selectConferenceRoomVo"/>
+        <where>  
+            <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="createDept != null "> and create_dept = #{createDept}</if>
+        </where>
+    </select>
+    
+    <select id="selectConferenceRoomByConferenceRoomId" parameterType="Long" resultMap="ConferenceRoomResult">
+        <include refid="selectConferenceRoomVo"/>
+        where conference_room_id = #{conferenceRoomId}
+    </select>
+        
+    <insert id="insertConferenceRoom" parameterType="ConferenceRoom" useGeneratedKeys="true" keyProperty="conferenceRoomId">
+        insert into conference_room
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="conferenceRoomName != null">conference_room_name,</if>
+            <if test="conferenceRoomAddress != null">conference_room_address,</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 prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="conferenceRoomName != null">#{conferenceRoomName},</if>
+            <if test="conferenceRoomAddress != null">#{conferenceRoomAddress},</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>
+    </insert>
+
+    <update id="updateConferenceRoom" parameterType="ConferenceRoom">
+        update conference_room
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="conferenceRoomName != null">conference_room_name = #{conferenceRoomName},</if>
+            <if test="conferenceRoomAddress != null">conference_room_address = #{conferenceRoomAddress},</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>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where conference_room_id = #{conferenceRoomId}
+    </update>
+
+    <delete id="deleteConferenceRoomByConferenceRoomId" parameterType="Long">
+        delete from conference_room where conference_room_id = #{conferenceRoomId}
+    </delete>
+
+    <delete id="deleteConferenceRoomByConferenceRoomIds" parameterType="String">
+        delete from conference_room where conference_room_id in 
+        <foreach item="conferenceRoomId" collection="array" open="(" separator="," close=")">
+            #{conferenceRoomId}
+        </foreach>
+    </delete>
+</mapper>

+ 129 - 0
ruoyi-system/src/main/resources/mapper/system/ConferenceRoomOrderMapper.xml

@@ -0,0 +1,129 @@
+<?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="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"    />
+    </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
+    </sql>
+
+    <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>
+    </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; #{endTime}</if>
+        </where>
+    </select>
+    
+    <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 into conference_room_order
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orderUser != null">order_user,</if>
+            <if test="orderUserId != null">order_user_id,</if>
+            <if test="conferenceRoomId != null">conference_room_id,</if>
+            <if test="conferenceRoomName != null">conference_room_name,</if>
+            <if test="conferenceRoomAddress != null">conference_room_address,</if>
+            <if test="conferenceName != null">conference_name,</if>
+            <if test="conferenceNumber != null">conference_number,</if>
+            <if test="startTime != null">start_time,</if>
+            <if test="endTime != null">end_time,</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 prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orderUser != null">#{orderUser},</if>
+            <if test="orderUserId != null">#{orderUserId},</if>
+            <if test="conferenceRoomId != null">#{conferenceRoomId},</if>
+            <if test="conferenceRoomName != null">#{conferenceRoomName},</if>
+            <if test="conferenceRoomAddress != null">#{conferenceRoomAddress},</if>
+            <if test="conferenceName != null">#{conferenceName},</if>
+            <if test="conferenceNumber != null">#{conferenceNumber},</if>
+            <if test="startTime != null">#{startTime},</if>
+            <if test="endTime != null">#{endTime},</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>
+    </insert>
+
+    <update id="updateConferenceRoomOrder" parameterType="ConferenceRoomOrder">
+        update conference_room_order
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="orderUser != null">order_user = #{orderUser},</if>
+            <if test="orderUserId != null">order_user_id = #{orderUserId},</if>
+            <if test="conferenceRoomId != null">conference_room_id = #{conferenceRoomId},</if>
+            <if test="conferenceRoomName != null">conference_room_name = #{conferenceRoomName},</if>
+            <if test="conferenceRoomAddress != null">conference_room_address = #{conferenceRoomAddress},</if>
+            <if test="conferenceName != null">conference_name = #{conferenceName},</if>
+            <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="createDept != null">create_dept = #{createDept},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where conference_room_order_id = #{conferenceRoomOrderId}
+    </update>
+
+    <delete id="deleteConferenceRoomOrderByConferenceRoomOrderId" parameterType="Long">
+        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 
+        <foreach item="conferenceRoomOrderId" collection="array" open="(" separator="," close=")">
+            #{conferenceRoomOrderId}
+        </foreach>
+    </delete>
+</mapper>

+ 106 - 0
ruoyi-system/src/main/resources/mapper/system/OrderFoodMapper.xml

@@ -0,0 +1,106 @@
+<?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="com.ruoyi.system.mapper.OrderFoodMapper">
+    
+    <resultMap type="OrderFood" id="OrderFoodResult">
+        <result property="orderFoodId"    column="order_food_id"    />
+        <result property="orderFoodTime"    column="order_food_time"    />
+        <result property="orderFoodType"    column="order_food_type"    />
+        <result property="orderFoodUser"    column="order_food_user"    />
+        <result property="orderFoodUserId"    column="order_food_user_id"    />
+        <result property="orderFoodDept"    column="order_food_dept"    />
+        <result property="orderFoodDeptId"    column="order_food_dept_id"    />
+        <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="selectOrderFoodVo">
+        select order_food_id, order_food_time, order_food_type, order_food_user, order_food_user_id, order_food_dept, order_food_dept_id, create_dept, create_by, create_time, update_by, update_time, remark from order_food
+    </sql>
+
+    <select id="selectOrderFoodList" parameterType="OrderFood" resultMap="OrderFoodResult">
+        <include refid="selectOrderFoodVo"/>
+        <where>  
+            <if test="orderFoodTime != null "> and order_food_time = #{orderFoodTime}</if>
+            <if test="orderFoodType != null  and orderFoodType != ''"> and order_food_type = #{orderFoodType}</if>
+            <if test="orderFoodUser != null  and orderFoodUser != ''"> and order_food_user = #{orderFoodUser}</if>
+            <if test="orderFoodUserId != null "> and order_food_user_id = #{orderFoodUserId}</if>
+            <if test="orderFoodDept != null  and orderFoodDept != ''"> and order_food_dept = #{orderFoodDept}</if>
+            <if test="orderFoodDeptId != null "> and order_food_dept_id = #{orderFoodDeptId}</if>
+            <if test="createDept != null "> and create_dept = #{createDept}</if>
+        </where>
+    </select>
+    
+    <select id="selectOrderFoodByOrderFoodId" parameterType="Long" resultMap="OrderFoodResult">
+        <include refid="selectOrderFoodVo"/>
+        where order_food_id = #{orderFoodId}
+    </select>
+        
+    <insert id="insertOrderFood" parameterType="OrderFood" useGeneratedKeys="true" keyProperty="orderFoodId">
+        insert into order_food
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orderFoodTime != null">order_food_time,</if>
+            <if test="orderFoodType != null">order_food_type,</if>
+            <if test="orderFoodUser != null">order_food_user,</if>
+            <if test="orderFoodUserId != null">order_food_user_id,</if>
+            <if test="orderFoodDept != null">order_food_dept,</if>
+            <if test="orderFoodDeptId != null">order_food_dept_id,</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 prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orderFoodTime != null">#{orderFoodTime},</if>
+            <if test="orderFoodType != null">#{orderFoodType},</if>
+            <if test="orderFoodUser != null">#{orderFoodUser},</if>
+            <if test="orderFoodUserId != null">#{orderFoodUserId},</if>
+            <if test="orderFoodDept != null">#{orderFoodDept},</if>
+            <if test="orderFoodDeptId != null">#{orderFoodDeptId},</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>
+    </insert>
+
+    <update id="updateOrderFood" parameterType="OrderFood">
+        update order_food
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="orderFoodTime != null">order_food_time = #{orderFoodTime},</if>
+            <if test="orderFoodType != null">order_food_type = #{orderFoodType},</if>
+            <if test="orderFoodUser != null">order_food_user = #{orderFoodUser},</if>
+            <if test="orderFoodUserId != null">order_food_user_id = #{orderFoodUserId},</if>
+            <if test="orderFoodDept != null">order_food_dept = #{orderFoodDept},</if>
+            <if test="orderFoodDeptId != null">order_food_dept_id = #{orderFoodDeptId},</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>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where order_food_id = #{orderFoodId}
+    </update>
+
+    <delete id="deleteOrderFoodByOrderFoodId" parameterType="Long">
+        delete from order_food where order_food_id = #{orderFoodId}
+    </delete>
+
+    <delete id="deleteOrderFoodByOrderFoodIds" parameterType="String">
+        delete from order_food where order_food_id in 
+        <foreach item="orderFoodId" collection="array" open="(" separator="," close=")">
+            #{orderFoodId}
+        </foreach>
+    </delete>
+</mapper>