|
|
@ -41,6 +41,8 @@ |
|
|
<result column="payment_for_goods" jdbcType="VARCHAR" property="paymentForGoods" /> |
|
|
<result column="payment_for_goods" jdbcType="VARCHAR" property="paymentForGoods" /> |
|
|
<result column="transfer_addition" jdbcType="VARCHAR" property="transferAddition" /> |
|
|
<result column="transfer_addition" jdbcType="VARCHAR" property="transferAddition" /> |
|
|
<result column="order_status" jdbcType="VARCHAR" property="orderStatus" /> |
|
|
<result column="order_status" jdbcType="VARCHAR" property="orderStatus" /> |
|
|
|
|
|
<result column="shipper_id" jdbcType="VARCHAR" property="shipperId" /> |
|
|
|
|
|
<result column="receiver_id" jdbcType="VARCHAR" property="receiverId" /> |
|
|
</resultMap> |
|
|
</resultMap> |
|
|
|
|
|
|
|
|
<sql id="Base_Column_List"> |
|
|
<sql id="Base_Column_List"> |
|
|
@ -48,7 +50,8 @@ |
|
|
shipper_name, shipper_mobile, shipper_address, receiver_name, receiver_mobile, receiver_address, |
|
|
shipper_name, shipper_mobile, shipper_address, receiver_name, receiver_mobile, receiver_address, |
|
|
go_station_id, go_station_name, arrival_station_id, arrival_station_name, weight, count, freight, premium, |
|
|
go_station_id, go_station_name, arrival_station_id, arrival_station_name, weight, count, freight, premium, |
|
|
transit_fee, tips, method_of_settlement, cost, all_cost, order_number, object_name, remark, receiving_user_id, |
|
|
transit_fee, tips, method_of_settlement, cost, all_cost, order_number, object_name, remark, receiving_user_id, |
|
|
receiving_user_name,image_path, payment_for_goods, transfer_addition,order_status |
|
|
receiving_user_name,image_path, payment_for_goods, transfer_addition,order_status, |
|
|
|
|
|
shipper_id,receiver_id |
|
|
</sql> |
|
|
</sql> |
|
|
|
|
|
|
|
|
<select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap"> |
|
|
<select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap"> |
|
|
@ -69,7 +72,7 @@ |
|
|
shipper_name, shipper_mobile, shipper_address, receiver_name, receiver_mobile, receiver_address, |
|
|
shipper_name, shipper_mobile, shipper_address, receiver_name, receiver_mobile, receiver_address, |
|
|
go_station_id, go_station_name, arrival_station_id, arrival_station_name, weight, count, freight, premium, |
|
|
go_station_id, go_station_name, arrival_station_id, arrival_station_name, weight, count, freight, premium, |
|
|
transit_fee, tips, method_of_settlement, cost, all_cost, order_number, object_name, remark, receiving_user_id, receiving_user_name, |
|
|
transit_fee, tips, method_of_settlement, cost, all_cost, order_number, object_name, remark, receiving_user_id, receiving_user_name, |
|
|
image_path, payment_for_goods, transfer_addition,order_status) |
|
|
image_path, payment_for_goods, transfer_addition,order_status,shipper_id,receiver_id) |
|
|
values (#{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createByName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, |
|
|
values (#{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createByName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, |
|
|
#{delFlag,jdbcType=INTEGER}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, |
|
|
#{delFlag,jdbcType=INTEGER}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, |
|
|
#{companyId,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, #{circuitId,jdbcType=VARCHAR}, #{circuitName,jdbcType=VARCHAR}, |
|
|
#{companyId,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, #{circuitId,jdbcType=VARCHAR}, #{circuitName,jdbcType=VARCHAR}, |
|
|
@ -80,7 +83,7 @@ |
|
|
#{transitFee,jdbcType=DECIMAL}, #{tips,jdbcType=DECIMAL}, #{methodOfSettlement,jdbcType=VARCHAR}, #{cost,jdbcType=DECIMAL}, |
|
|
#{transitFee,jdbcType=DECIMAL}, #{tips,jdbcType=DECIMAL}, #{methodOfSettlement,jdbcType=VARCHAR}, #{cost,jdbcType=DECIMAL}, |
|
|
#{allCost,jdbcType=DECIMAL}, #{orderNumber,jdbcType=VARCHAR}, #{objectName,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, |
|
|
#{allCost,jdbcType=DECIMAL}, #{orderNumber,jdbcType=VARCHAR}, #{objectName,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, |
|
|
#{receivingUserId,jdbcType=VARCHAR}, #{receivingUserName,jdbcType=VARCHAR},#{imagePath,jdbcType=VARCHAR}, #{paymentForGoods,jdbcType=VARCHAR}, |
|
|
#{receivingUserId,jdbcType=VARCHAR}, #{receivingUserName,jdbcType=VARCHAR},#{imagePath,jdbcType=VARCHAR}, #{paymentForGoods,jdbcType=VARCHAR}, |
|
|
#{transferAddition,jdbcType=VARCHAR},#{orderStatus,jdbcType=VARCHAR}) |
|
|
#{transferAddition,jdbcType=VARCHAR},#{orderStatus,jdbcType=VARCHAR},#{shipperId,jdbcType=VARCHAR},#{receiverId,jdbcType=VARCHAR}) |
|
|
</insert> |
|
|
</insert> |
|
|
|
|
|
|
|
|
<!--管理商品分页列表--> |
|
|
<!--管理商品分页列表--> |
|
|
@ -102,7 +105,7 @@ |
|
|
t.shipper_name, t.shipper_mobile, t.shipper_address, t.receiver_name, t.receiver_mobile, t.receiver_address, |
|
|
t.shipper_name, t.shipper_mobile, t.shipper_address, t.receiver_name, t.receiver_mobile, t.receiver_address, |
|
|
t.go_station_id, t.go_station_name, t.arrival_station_id, t.arrival_station_name, t.weight, t.count, t.freight, t.premium, |
|
|
t.go_station_id, t.go_station_name, t.arrival_station_id, t.arrival_station_name, t.weight, t.count, t.freight, t.premium, |
|
|
t.transit_fee, t.tips, t.method_of_settlement, t.cost, t.all_cost, t.order_number, t.object_name, t.remark, t.receiving_user_id, |
|
|
t.transit_fee, t.tips, t.method_of_settlement, t.cost, t.all_cost, t.order_number, t.object_name, t.remark, t.receiving_user_id, |
|
|
t.receiving_user_name,t.image_path, t.payment_for_goods, t.transfer_addition,t.order_status, |
|
|
t.receiving_user_name,t.image_path, t.payment_for_goods, t.transfer_addition,t.order_status,t.shipper_id,t.receiver_id, |
|
|
COALESCE(occ.change_count, 0) AS change_count |
|
|
COALESCE(occ.change_count, 0) AS change_count |
|
|
from t_logistics_order t |
|
|
from t_logistics_order t |
|
|
LEFT JOIN |
|
|
LEFT JOIN |
|
|
@ -160,6 +163,9 @@ |
|
|
<if test='queryParams.orderNumber!=null and queryParams.orderNumber.trim() neq ""'> |
|
|
<if test='queryParams.orderNumber!=null and queryParams.orderNumber.trim() neq ""'> |
|
|
AND t.order_number like concat('%',#{queryParams.orderNumber},'%') |
|
|
AND t.order_number like concat('%',#{queryParams.orderNumber},'%') |
|
|
</if> |
|
|
</if> |
|
|
|
|
|
<if test='queryParams.orderStatus!=null and queryParams.orderStatus.trim() neq ""'> |
|
|
|
|
|
AND t.order_status like concat('%',#{queryParams.orderStatus},'%') |
|
|
|
|
|
</if> |
|
|
<!--开始时间、结束时间--> |
|
|
<!--开始时间、结束时间--> |
|
|
<if test="queryParams.startDate!=null and queryParams.endDate!=null"> |
|
|
<if test="queryParams.startDate!=null and queryParams.endDate!=null"> |
|
|
AND t.create_time BETWEEN #{queryParams.startDate} AND #{queryParams.endDate} |
|
|
AND t.create_time BETWEEN #{queryParams.startDate} AND #{queryParams.endDate} |
|
|
@ -175,7 +181,6 @@ |
|
|
or t.receiver_id like concat('%',#{queryParams.searchStr},'%') |
|
|
or t.receiver_id like concat('%',#{queryParams.searchStr},'%') |
|
|
or t.receiver_name like concat('%',#{queryParams.searchStr},'%') |
|
|
or t.receiver_name like concat('%',#{queryParams.searchStr},'%') |
|
|
or t.receiver_mobile like concat('%',#{queryParams.searchStr},'%') |
|
|
or t.receiver_mobile like concat('%',#{queryParams.searchStr},'%') |
|
|
or t.order_status like concat('%',#{queryParams.searchStr},'%') |
|
|
|
|
|
) |
|
|
) |
|
|
</if> |
|
|
</if> |
|
|
<!--是否有修改记录的筛选--> |
|
|
<!--是否有修改记录的筛选--> |
|
|
@ -233,7 +238,7 @@ |
|
|
|
|
|
|
|
|
<!--获取客户数--> |
|
|
<!--获取客户数--> |
|
|
<select id="getCustomerCount" resultType="java.lang.Integer"> |
|
|
<select id="getCustomerCount" resultType="java.lang.Integer"> |
|
|
SELECT count(distinct receiver_mobile) FROM t_logistics_order |
|
|
SELECT count(distinct receiver_id) FROM t_logistics_order |
|
|
WHERE del_flag = 0 |
|
|
WHERE del_flag = 0 |
|
|
<!--可按照线路、物流公司、到达站搜索--> |
|
|
<!--可按照线路、物流公司、到达站搜索--> |
|
|
<if test='logisticsOrderQueryVo.companyId!=null and logisticsOrderQueryVo.companyId.trim() neq ""'> |
|
|
<if test='logisticsOrderQueryVo.companyId!=null and logisticsOrderQueryVo.companyId.trim() neq ""'> |
|
|
@ -245,6 +250,10 @@ |
|
|
<if test='logisticsOrderQueryVo.arrivalStationId!=null and logisticsOrderQueryVo.arrivalStationId.trim() neq ""'> |
|
|
<if test='logisticsOrderQueryVo.arrivalStationId!=null and logisticsOrderQueryVo.arrivalStationId.trim() neq ""'> |
|
|
AND arrival_station_id = #{logisticsOrderQueryVo.arrivalStationId} |
|
|
AND arrival_station_id = #{logisticsOrderQueryVo.arrivalStationId} |
|
|
</if> |
|
|
</if> |
|
|
|
|
|
<!--开始时间、结束时间--> |
|
|
|
|
|
<if test="logisticsOrderQueryVo.startDate!=null and logisticsOrderQueryVo.endDate!=null"> |
|
|
|
|
|
AND create_time BETWEEN #{logisticsOrderQueryVo.startDate} AND #{logisticsOrderQueryVo.endDate} |
|
|
|
|
|
</if> |
|
|
</select> |
|
|
</select> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
wangfukang
1 year ago