新增 食谱，每日食谱记录

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

@@ -1,11 +1,12 @@
 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;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
 
 /**
  * 会议室预约对象 conference_room_order
@@ -51,6 +52,10 @@ public class ConferenceRoomOrder extends BaseEntity
      * 是否需要席卡
      */
     private String useXk;
+    /**
+     * 席卡详情
+     */
+    private String xkDetail;
 
     /** 会议开始时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -66,6 +71,14 @@ public class ConferenceRoomOrder extends BaseEntity
     @Excel(name = "创建部门")
     private Long createDept;
 
+    public String getXkDetail() {
+        return xkDetail;
+    }
+
+    public void setXkDetail(String xkDetail) {
+        this.xkDetail = xkDetail;
+    }
+
     public String getUseXk() {
         return useXk;
     }

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

@@ -7,7 +7,6 @@ import com.ruoyi.system.domain.MenuFood;
 import com.ruoyi.system.domain.MenuFoodRecord;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDate;
@@ -32,7 +31,7 @@ public class Task {
      * @throws Exception
      */
     @Async
-    @Scheduled(cron = "0 0 23 * * ? ")
+    //@Scheduled(cron = "0 0 23 * * ? ")
     public void popover() throws Exception {
         // 获取当前日期
         LocalDate currentDate = LocalDate.now();

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

@@ -16,6 +16,7 @@
         <result property="startTime" column="start_time"/>
         <result property="endTime" column="end_time"/>
         <result property="useXk" column="use_xk"/>
+        <result property="xkDetail" column="xk_detail"/>
         <result property="createDept" column="create_dept"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
@@ -36,6 +37,7 @@
                start_time,
                end_time,
                use_xk,
+               xk_detail,
                create_dept,
                create_by,
                create_time,
@@ -67,6 +69,7 @@
             <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="xkDetail != null and xkDetail != ''">and xk_detail = #{xkDetail}</if>
             <if test="createDept != null ">and create_dept = #{createDept}</if>
         </where>
         order by end_time DESC
@@ -141,6 +144,7 @@
             <if test="startTime != null">start_time,</if>
             <if test="endTime != null">end_time,</if>
             <if test="useXk != null">use_xk,</if>
+            <if test="xkDetail != null">xk_detail,</if>
             <if test="createDept != null">create_dept,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -159,6 +163,7 @@
             <if test="startTime != null">#{startTime},</if>
             <if test="endTime != null">#{endTime},</if>
             <if test="useXk != null">#{useXk},</if>
+            <if test="xkDetail != null">#{xkDetail},</if>
             <if test="createDept != null">#{createDept},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -181,6 +186,7 @@
             <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="xkDetail != null">xk_detail = #{xkDetail},</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>