|
|
@@ -266,6 +266,7 @@
|
|
|
<!--凯和查询财务信息-->
|
|
|
<select id="selectFinancialTFeeList" parameterType="TFee" resultType="com.ruoyi.finance.shipping.FinancialTFee">
|
|
|
SELECT
|
|
|
+ DISTINCT
|
|
|
f.f_id AS fId,
|
|
|
f.f_billno AS fBillno,
|
|
|
f.f_ctrlcorpid AS fCtrlcorpid,
|
|
|
@@ -318,12 +319,14 @@
|
|
|
LEFT JOIN t_voyage ty ON f.f_voyid = ty.f_id
|
|
|
LEFT JOIN t_address tre ON tre.f_id = f.f_loadportid
|
|
|
LEFT JOIN t_address ts ON ts.f_id = f.f_destportid
|
|
|
+ LEFT JOIN t_fee_do tf ON tf.f_pid = f.f_id
|
|
|
+ LEFT JOIN t_warehousebillsfees tb ON tb.f_id = tf.f_srcid
|
|
|
<where>
|
|
|
<if test="fId != null ">and f.f_id = #{fId}</if>
|
|
|
<if test="fBillno != null and fBillno != ''">and f.f_billno like concat('%', #{fBillno}, '%')</if>
|
|
|
<if test="fCtrlcorpid != null and fCtrlcorpid != ''">and f.f_ctrlcorpid = #{fCtrlcorpid}</if>
|
|
|
<if test="fCorpid != null ">and f.f_corpid = #{fCorpid}</if>
|
|
|
- <if test="tMblno != null and tMblno != ''">and f.t_mblno like concat('%', #{tMblno}, '%')</if>
|
|
|
+ <if test="tMblno != null and tMblno != ''">and tb.f_mblno like concat('%', #{tMblno}, '%')</if>
|
|
|
<if test="fAmtdr != null ">and f.f_amtdr = #{fAmtdr}</if>
|
|
|
<if test="fAmtcr != null ">and f.f_amtcr = #{fAmtcr}</if>
|
|
|
<if test="fBilltype != null and fBilltype != ''">and f.f_billtype = #{fBilltype}</if>
|
lazhaoqian