bonus
/
Zlpt-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

This commit is contained in:
sxu 2023-12-04 14:23:23 +08:00
parent 0c392a056c
commit 9d6bed3d9c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/OrderDetails.java
View File

@ -90,7 +90,7 @@ public class OrderDetails extends BaseEntity
/** 租方进场确认人 */ /** 租方进场确认人 */
@Excel(name = "租方进场确认人") @Excel(name = "租方进场确认人")
private String rentalName; private String renterName;
/** 出租方进场确认人 */ /** 出租方进场确认人 */
@Excel(name = "出租方进场确认人") @Excel(name = "出租方进场确认人")

12
zlpt-modules/zlpt-order/src/main/resources/mapper/OrderDetailsMapper.xml
View File

@ -23,13 +23,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="phone" column="phone" /> <result property="phone" column="phone" />
<result property="logisticsPhone" column="logistics_phone" /> <result property="logisticsPhone" column="logistics_phone" />
<result property="realStartTime" column="real_start_time" /> <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="tenantName" column="tenant_name" />
<result property="entryAttachment" column="entry_attachment" /> <result property="entryAttachment" column="entry_attachment" />
</resultMap> </resultMap>
<sql id="selectOrderDetailsVo"> <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> </sql>
<select id="selectOrderDetailsList" parameterType="com.bonus.zlpt.common.core.domain.order.OrderDetails" resultMap="OrderDetailsResult"> <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="phone != null and phone != ''"> and phone = #{phone}</if>
<if test="logisticsPhone != null and logisticsPhone != ''"> and logistics_phone = #{logisticsPhone}</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="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="tenantName != null and tenantName != ''"> and tenant_name like concat('%', #{tenantName}, '%')</if>
<if test="entryAttachment != null and entryAttachment != ''"> and entry_attachment = #{entryAttachment}</if> <if test="entryAttachment != null and entryAttachment != ''"> and entry_attachment = #{entryAttachment}</if>
</where> </where>
@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="phone != null">phone,</if> <if test="phone != null">phone,</if>
<if test="logisticsPhone != null">logistics_phone,</if> <if test="logisticsPhone != null">logistics_phone,</if>
<if test="realStartTime != null">real_start_time,</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="tenantName != null">tenant_name,</if>
<if test="entryAttachment != null">entry_attachment,</if> <if test="entryAttachment != null">entry_attachment,</if>
</trim> </trim>
@ -107,7 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="phone != null">#{phone},</if> <if test="phone != null">#{phone},</if>
<if test="logisticsPhone != null">#{logisticsPhone},</if> <if test="logisticsPhone != null">#{logisticsPhone},</if>
<if test="realStartTime != null">#{realStartTime},</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="tenantName != null">#{tenantName},</if>
<if test="entryAttachment != null">#{entryAttachment},</if> <if test="entryAttachment != null">#{entryAttachment},</if>
</trim> </trim>
@ -133,7 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="phone != null">phone = #{phone},</if> <if test="phone != null">phone = #{phone},</if>
<if test="logisticsPhone != null">logistics_phone = #{logisticsPhone},</if> <if test="logisticsPhone != null">logistics_phone = #{logisticsPhone},</if>
<if test="realStartTime != null">real_start_time = #{realStartTime},</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="tenantName != null">tenant_name = #{tenantName},</if>
<if test="entryAttachment != null">entry_attachment = #{entryAttachment},</if> <if test="entryAttachment != null">entry_attachment = #{entryAttachment},</if>
</trim> </trim>