From 9d6bed3d9cb391f5b4e92adf8fd032bc3143dddb Mon Sep 17 00:00:00 2001
From: sxu <1539530615@qq.com>
Date: Mon, 4 Dec 2023 14:23:23 +0800
Subject: [PATCH] fix

---
 .../zlpt/common/core/domain/order/OrderDetails.java  |  2 +-
 .../src/main/resources/mapper/OrderDetailsMapper.xml | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/OrderDetails.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/OrderDetails.java
index 0340b7a..3e31264 100644
--- a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/OrderDetails.java
+++ b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/OrderDetails.java
@@ -90,7 +90,7 @@ public class OrderDetails extends BaseEntity
 
     /** 租方进场确认人 */
     @Excel(name = "租方进场确认人")
-    private String rentalName;
+    private String renterName;
 
     /** 出租方进场确认人 */
     @Excel(name = "出租方进场确认人")
diff --git a/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderDetailsMapper.xml b/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderDetailsMapper.xml
index e075666..b712492 100644
--- a/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderDetailsMapper.xml
+++ b/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderDetailsMapper.xml
@@ -23,13 +23,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="phone"    column="phone"    />
         <result property="logisticsPhone"    column="logistics_phone"    />
         <result property="realStartTime"    column="real_start_time"    />
-        <result property="rentalName"    column="rental_name"    />
+        <result property="renterName"    column="renter_name"    />
         <result property="tenantName"    column="tenant_name"    />
         <result property="entryAttachment"    column="entry_attachment"    />
     </resultMap>
 
     <sql id="selectOrderDetailsVo">
-        select id, order_id, need_company, plan_start_time, is_machinist, address, duration, invoice_type, description, ma_id, lease_type, lease_price, machinist_price, order_contract, machinist_name, phone, logistics_phone, real_start_time, rental_name, tenant_name, entry_attachment from ma_order_details
+        select id, order_id, need_company, plan_start_time, is_machinist, address, duration, invoice_type, description, ma_id, lease_type, lease_price, machinist_price, order_contract, machinist_name, phone, logistics_phone, real_start_time, renter_name, tenant_name, entry_attachment from ma_order_details
     </sql>
 
     <select id="selectOrderDetailsList" parameterType="com.bonus.zlpt.common.core.domain.order.OrderDetails" resultMap="OrderDetailsResult">
@@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
             <if test="logisticsPhone != null  and logisticsPhone != ''"> and logistics_phone = #{logisticsPhone}</if>
             <if test="realStartTime != null  and realStartTime != ''"> and real_start_time = #{realStartTime}</if>
-            <if test="rentalName != null  and rentalName != ''"> and rental_name like concat('%', #{rentalName}, '%')</if>
+            <if test="renterName != null  and renterName != ''"> and renter_name like concat('%', #{renterName}, '%')</if>
             <if test="tenantName != null  and tenantName != ''"> and tenant_name like concat('%', #{tenantName}, '%')</if>
             <if test="entryAttachment != null  and entryAttachment != ''"> and entry_attachment = #{entryAttachment}</if>
         </where>
@@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="phone != null">phone,</if>
             <if test="logisticsPhone != null">logistics_phone,</if>
             <if test="realStartTime != null">real_start_time,</if>
-            <if test="rentalName != null">rental_name,</if>
+            <if test="renterName != null">renter_name,</if>
             <if test="tenantName != null">tenant_name,</if>
             <if test="entryAttachment != null">entry_attachment,</if>
          </trim>
@@ -107,7 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="phone != null">#{phone},</if>
             <if test="logisticsPhone != null">#{logisticsPhone},</if>
             <if test="realStartTime != null">#{realStartTime},</if>
-            <if test="rentalName != null">#{rentalName},</if>
+            <if test="renterName != null">#{renterName},</if>
             <if test="tenantName != null">#{tenantName},</if>
             <if test="entryAttachment != null">#{entryAttachment},</if>
          </trim>
@@ -133,7 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="phone != null">phone = #{phone},</if>
             <if test="logisticsPhone != null">logistics_phone = #{logisticsPhone},</if>
             <if test="realStartTime != null">real_start_time = #{realStartTime},</if>
-            <if test="rentalName != null">rental_name = #{rentalName},</if>
+            <if test="renterName != null">renter_name = #{renterName},</if>
             <if test="tenantName != null">tenant_name = #{tenantName},</if>
             <if test="entryAttachment != null">entry_attachment = #{entryAttachment},</if>
         </trim>