From 9e511829f784793eca87a3f282a7c5c728692684 Mon Sep 17 00:00:00 2001
From: sxu <1539530615@qq.com>
Date: Thu, 7 Dec 2023 11:05:51 +0800
Subject: [PATCH] fix

---
 .../com/bonus/zlpt/common/core/domain/order/OrderInfo.java  | 5 +++++
 .../src/main/resources/mapper/OrderInfoMapper.xml           | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/OrderInfo.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/OrderInfo.java
index f7618dd..40ba093 100644
--- a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/OrderInfo.java
+++ b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/OrderInfo.java
@@ -40,6 +40,11 @@ public class OrderInfo extends BaseEntity
     @ApiModelProperty(value = "订单日期")
     private String time;
 
+    /** 订单结束日期 */
+    @Excel(name = "订单结束日期")
+    @ApiModelProperty(value = "订单结束日期")
+    private String endTime;
+
     /** 订金 */
     @Excel(name = "订金")
     @ApiModelProperty(value = "订金")
diff --git a/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml b/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml
index 22103ce..5b74dad 100644
--- a/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml
+++ b/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml
@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="pId"    column="p_id"    />
         <result property="code"    column="code"    />
         <result property="time"    column="time"    />
+        <result property="endTime"    column="end_time"    />
         <result property="deposit"    column="deposit"    />
         <result property="cost"    column="cost"    />
         <result property="payType"    column="pay_type"    />
@@ -19,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectOrderInfoVo">
-        select order_id, p_id, code, time, deposit, cost, pay_type, supplier, order_status, order_user, order_company from ma_order_info
+        select order_id, p_id, code, time, end_time, deposit, cost, pay_type, supplier, order_status, order_user, order_company from ma_order_info
     </sql>
 
     <select id="selectOrderInfoList" parameterType="com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo" resultType="com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo">
@@ -56,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="pId != null">p_id,</if>
             <if test="code != null">code,</if>
             <if test="time != null">time,</if>
+            <if test="endTime != null">end_time,</if>
             <if test="deposit != null">deposit,</if>
             <if test="cost != null">cost,</if>
             <if test="payType != null">pay_type,</if>
@@ -69,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="pId != null">#{pId},</if>
             <if test="code != null">#{code},</if>
             <if test="time != null">#{time},</if>
+            <if test="endTime != null">#{endTime},</if>
             <if test="deposit != null">#{deposit},</if>
             <if test="cost != null">#{cost},</if>
             <if test="payType != null">#{payType},</if>
@@ -135,6 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="pId != null">p_id = #{pId},</if>
             <if test="code != null">code = #{code},</if>
             <if test="time != null">time = #{time},</if>
+            <if test="endTime != null">time = #{endTime},</if>
             <if test="deposit != null">deposit = #{deposit},</if>
             <if test="cost != null">cost = #{cost},</if>
             <if test="payType != null">pay_type = #{payType},</if>