1

pom.xml

@@ -175,6 +175,7 @@
 
     <modules>
         <module>share-admin</module>
+        <module>share-front</module>
         <module>share-framework</module>
         <module>share-system</module>
         <module>share-quartz</module>

share-admin/src/main/java/share/web/controller/system/SOrderController.java

-package share.system.controller;
+package share.web.controller.system;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
@@ -25,7 +25,7 @@ import share.common.core.page.TableDataInfo;
  * 订单Controller
  * 
  * @author ruoyi
- * @date 2023-09-27
+ * @date 2023-10-09
  */
 @RestController
 @RequestMapping("/system/order")

share-system/src/main/java/share/system/domain/SOrder.java

@@ -11,7 +11,7 @@ import share.common.core.domain.BaseEntity;
  * 订单对象 s_order
  *
  * @author ruoyi
- * @date 2023-09-27
+ * @date 2023-10-09
  */
 public class SOrder extends BaseEntity
 {
@@ -82,6 +82,16 @@ public class SOrder extends BaseEntity
     @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date endDate;
 
+    /** 预约开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "预约开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date preStartDate;
+
+    /** 预约结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "预约结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date preEndDate;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -226,6 +236,24 @@ public class SOrder extends BaseEntity
     {
         return endDate;
     }
+    public void setPreStartDate(Date preStartDate)
+    {
+        this.preStartDate = preStartDate;
+    }
+
+    public Date getPreStartDate()
+    {
+        return preStartDate;
+    }
+    public void setPreEndDate(Date preEndDate)
+    {
+        this.preEndDate = preEndDate;
+    }
+
+    public Date getPreEndDate()
+    {
+        return preEndDate;
+    }
 
     @Override
     public String toString() {
@@ -251,6 +279,8 @@ public class SOrder extends BaseEntity
                 .append("updateBy", getUpdateBy())
                 .append("updateTime", getUpdateTime())
                 .append("remark", getRemark())
+                .append("preStartDate", getPreStartDate())
+                .append("preEndDate", getPreEndDate())
                 .toString();
     }
 }

share-system/src/main/resources/mapper/system/SOrderMapper.xml

 <?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="share.system.mapper.SOrderMapper">
 
     <resultMap type="SOrder" id="SOrderResult">
@@ -26,10 +26,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
+        <result property="preStartDate"    column="pre_start_date"    />
+        <result property="preEndDate"    column="pre_end_date"    />
     </resultMap>
 
     <sql id="selectSOrderVo">
-        select id, order_type, serial_number, consumer_id, consumer_name, description, original_price, pay_ways, real_price, is_use_coupon, coupon_type, coupon_name, coupon_id, status, start_date, end_date, create_by, create_time, update_by, update_time, remark from s_order
+        select id, order_type, serial_number, consumer_id, consumer_name, description, original_price, pay_ways, real_price, is_use_coupon, coupon_type, coupon_name, coupon_id, status, start_date, end_date, create_by, create_time, update_by, update_time, remark, pre_start_date, pre_end_date from s_order
     </sql>
 
     <select id="selectSOrderList" parameterType="SOrder" resultMap="SOrderResult">
@@ -50,6 +52,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null "> and status = #{status}</if>
             <if test="startDate != null "> and start_date = #{startDate}</if>
             <if test="endDate != null "> and end_date = #{endDate}</if>
+            <if test="preStartDate != null "> and pre_start_date = #{preStartDate}</if>
+            <if test="preEndDate != null "> and pre_end_date = #{preEndDate}</if>
         </where>
     </select>
 
@@ -81,6 +85,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
+            <if test="preStartDate != null">pre_start_date,</if>
+            <if test="preEndDate != null">pre_end_date,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderType != null">#{orderType},</if>
@@ -103,6 +109,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="preStartDate != null">#{preStartDate},</if>
+            <if test="preEndDate != null">#{preEndDate},</if>
         </trim>
     </insert>
 
@@ -129,6 +137,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="preStartDate != null">pre_start_date = #{preStartDate},</if>
+            <if test="preEndDate != null">pre_end_date = #{preEndDate},</if>
         </trim>
         where id = #{id}
     </update>