凯和应收付开船日期修改

ruoyi-warehouse/src/main/resources/mapper/finance/TFeeMapper.xml

@@ -2584,7 +2584,7 @@
         tw.f_mblno AS blNo,#提单号
         ta.f_name AS portOfLoading,#起运港
         td.f_name AS destination,#目的港
-        tw.f_bsdate sailingDate,#开船日期
+        ty.f_ATD sailingDate,#开船日期
         tf.f_review_date AS auditDate,#审核日期
         ROUND(IFNULL(SUM(f_amount),0),2) AS receivable, #应收金额
         ROUND(IFNULL(SUM(f_stlamount),0),2) AS handle,#实收金额
@@ -2620,10 +2620,10 @@
                 and tf.f_review_date <= #{timeExamine[1]}
             </if>
             <if test='timeInterval != null and timeInterval[0] != null and timeInterval[0]!= ""'>
-                and tw.f_bsdate &gt;= #{timeInterval[0]}
+                and ty.f_ATD &gt;= #{timeInterval[0]}
             </if>
             <if test='timeInterval != null and timeInterval[1] != null and timeInterval[1]!= ""'>
-                and tw.f_bsdate &lt;= #{timeInterval[1]}
+                and ty.f_ATD &lt;= #{timeInterval[1]}
             </if>
             GROUP BY tw.f_mblno,tf.f_corpid
             ORDER BY tw.f_bsdate DESC