|
@@ -30,12 +30,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
</resultMap>
|
|
|
|
|
|
<sql id="selectDeliverOrderBaseVo">
|
|
|
- select dob.id, dob.order_number, dob.order_creation_time, dob.delivery_number,
|
|
|
+ select dob.id, dob.order_number, dob.order_creation_time, dob.delivery_number,
|
|
|
dob.shipment_number, dob.belong_to, dob.confirm_time, dob.confirm_by, dob.evaluation_status,
|
|
|
dob.evaluation_service_attitude, dob.evaluation_damage_condition, dob.evaluation_arrive_time,
|
|
|
- dob.evaluation_handling_conditions, dob.evaluation, cu.chains_name
|
|
|
+ dob.evaluation_handling_conditions, dob.evaluation,
|
|
|
+ (select cu.chains_name from customers cu where cu.chains_code = dob.belong_to limit 1) as chains_name
|
|
|
from deliver_order_base dob
|
|
|
- LEFT JOIN (select * from customers) as cu on dob.belong_to = cu.chains_code
|
|
|
</sql>
|
|
|
|
|
|
<select id="selectEvaluateDtoList" parameterType="com.dgtly.order.domain.EvaluateDto" resultMap="DeliverOrderBaseResult">
|
|
@@ -47,7 +47,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="deliveryNumber != null and deliveryNumber != ''"> and dob.delivery_number like concat('%', #{deliveryNumber}, '%')</if>
|
|
|
<if test="shipmentNumber != null and shipmentNumber != ''"> and dob.shipment_number like concat('%', #{shipmentNumber}, '%')</if>
|
|
|
<if test="belongTo != null and belongTo != ''"> and dob.belong_to like concat('%', #{belongTo}, '%')</if>
|
|
|
- <if test="customersName != null and customersName != ''"> and cu.chains_name like concat('%', #{customersName}, '%')</if>
|
|
|
</where>
|
|
|
GROUP BY dob.shipment_number ORDER BY dob.id desc
|
|
|
|