仓储费增加计费截止时间区间查询

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/TWarehouseBills.java

@@ -993,6 +993,19 @@ public class TWarehouseBills extends BaseEntity {
     public List<String> gettimeInterval() {
         return timeInterval;
     }
+    
+    /**
+     * 查询计费截止日期区间
+     */
+    private List<String> timeInterval2;
+
+    public void settimeInterval2(List<String> timeInterval2) {
+        this.timeInterval2 = timeInterval2;
+    }
+
+    public List<String> gettimeInterval2() {
+        return timeInterval2;
+    }
 
     /**
      * 查询货物
@@ -1889,6 +1902,7 @@ public class TWarehouseBills extends BaseEntity {
                 ", warehousebillsfeesCr=" + warehousebillsfeesCr +
                 ", moneyStatus=" + moneyStatus +
                 ", timeInterval=" + timeInterval +
+                ", timeInterval2=" + timeInterval2 +
                 ", fGoodsid=" + fGoodsid +
                 ", delFlag='" + delFlag + '\'' +
                 ", fLocation=" + fLocation +

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsMapper.xml

@@ -508,6 +508,12 @@
             <if test="fTel != null  and fTel != ''">and bill.f_tel = #{fTel}</if>
             <if test="fCorpid != null ">and bill.f_corpid = #{fCorpid}</if>
             <if test="fBillingDeadline != null ">and bill.f_billing_deadline = #{fBillingDeadline}</if>
+            <if test='timeInterval2 != null and timeInterval2[0] != null and timeInterval2[0]!= ""'><!-- 仓储费增加计费截止日期区间查询 -->
+                and bill.f_billing_deadline &gt;= #{timeInterval2[0]}
+            </if>
+            <if test='timeInterval2 != null and timeInterval2[1] != null and timeInterval2[1]!= ""'>
+                and bill.f_billing_deadline &lt;= #{timeInterval2[1]}
+            </if>
             <if test="fTocorpid != null ">and bill.f_tocorpid = #{fTocorpid}</if>
             <if test="fMarks != null  and fMarks != ''">and bill.f_marks like concat('%', #{fMarks}, '%')</if>
             <if test="fStltypeid != null ">and bill.f_stltypeid = #{fStltypeid}</if>

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsitemsMapper.xml

@@ -478,7 +478,7 @@
             and item.f_chargedate <= #{warehouse.fBillingDeadline}
             <if test="warehouse.fGoodsid != null">and item.f_goodsid = #{warehouse.fGoodsid}</if>
             <if test="warehouse.fMblno != null">and ware.f_mblno = #{warehouse.fMblno}</if>
-            <if test="warehouse.fId != null">and item.f_id = #{warehouse.fId}</if>
+           <!--  <if test="warehouse.fId != null">and item.f_id = #{warehouse.fId}</if> -->
         </where>
     </select>
     <select id="warehousebillsitemsWarehouselocidSize" resultType="java.lang.Integer">