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-05 19:42:34 +08:00
parent f78f8c1a64
commit 2b3d6e02a4
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,6 +36,10 @@ public class OrderDetails extends BaseEntity
@Excel(name = "是否需要机手")
private String isMachinist;
/** 详细地址 */
@Excel(name = "设备进场省市县")
private Integer addressId;
/** 详细地址 */
@Excel(name = "详细地址")
private String address;

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

@ -29,7 +29,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</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, renter_name, tenant_name, entry_attachment from ma_order_details
select id, order_id, need_company, plan_start_time, is_machinist, address_id, 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">
@ -39,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="needCompany != null and needCompany != ''"> and need_company = #{needCompany}</if>
<if test="planStartTime != null and planStartTime != ''"> and plan_start_time = #{planStartTime}</if>
<if test="isMachinist != null and isMachinist != ''"> and is_machinist = #{isMachinist}</if>
<if test="addressId != null and addressId != ''"> and address_id = #{addressId}</if>
<if test="address != null and address != ''"> and address = #{address}</if>
<if test="duration != null and duration != ''"> and duration = #{duration}</if>
<if test="invoiceType != null and invoiceType != ''"> and invoice_type = #{invoiceType}</if>
@ -73,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="needCompany != null">need_company,</if>
<if test="planStartTime != null">plan_start_time,</if>
<if test="isMachinist != null">is_machinist,</if>
<if test="addressId != null">address_id,</if>
<if test="address != null">address,</if>
<if test="duration != null">duration,</if>
<if test="invoiceType != null">invoice_type,</if>
@ -96,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="needCompany != null">#{needCompany},</if>
<if test="planStartTime != null">#{planStartTime},</if>
<if test="isMachinist != null">#{isMachinist},</if>
<if test="addressId != null">#{addressId},</if>
<if test="address != null">#{address},</if>
<if test="duration != null">#{duration},</if>
<if test="invoiceType != null">#{invoiceType},</if>
@ -122,6 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="needCompany != null">need_company = #{needCompany},</if>
<if test="planStartTime != null">plan_start_time = #{planStartTime},</if>
<if test="isMachinist != null">is_machinist = #{isMachinist},</if>
<if test="addressId != null">address_id = #{addressId},</if>
<if test="address != null">address = #{address},</if>
<if test="duration != null">duration = #{duration},</if>
<if test="invoiceType != null">invoice_type = #{invoiceType},</if>