添加财务金额区间

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/finance/domain/FTmsaccbills.java

@@ -4,9 +4,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
-import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -220,6 +217,16 @@ public class FTmsaccbills extends BaseEntity {
      */
     private List<String> timeInterval;
 
+    /**
+     *  开始金额
+     */
+    private BigDecimal firstMoney;
+
+    /**
+     *  截止金额
+     */
+    private BigDecimal lastMoney;
+
     public Long getId() {
         return id;
     }
@@ -444,6 +451,22 @@ public class FTmsaccbills extends BaseEntity {
         this.timeInterval = timeInterval;
     }
 
+    public BigDecimal getFirstMoney() {
+        return firstMoney;
+    }
+
+    public void setFirstMoney(BigDecimal firstMoney) {
+        this.firstMoney = firstMoney;
+    }
+
+    public BigDecimal getLastMoney() {
+        return lastMoney;
+    }
+
+    public void setLastMoney(BigDecimal lastMoney) {
+        this.lastMoney = lastMoney;
+    }
+
     @Override
     public String toString() {
         return "FTmsaccbills{" +

ruoyi-fleet/src/main/resources/mapper/finance/FTmsaccbillsMapper.xml

@@ -394,7 +394,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="actId != null "> and f.act_id = #{actId}</if>
             <if test="fBilltype != null  and fBilltype != ''"> and f.f_billtype = #{fBilltype}</if>
-            <if test="fBillno != null  and fBillno != ''"> and f.f_billno = #{fBillno}</if>
             <if test="fCorpid != null "> and f.f_corpid = #{fCorpid}</if>
             <if test="fFromDate != null "> and f.f_from_date = #{fFromDate}</if>
             <if test="fToDate != null "> and f.f_to_date = #{fToDate}</if>
@@ -403,6 +402,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="postDate != null "> and f.post_date = #{postDate}</if>
             <if test="fBillstatus != null "> and f.f_billstatus = #{fBillstatus}</if>
             <if test="fRemarks != null  and fRemarks != ''"> and f.f_remarks = #{fRemarks}</if>
+            <if test="firstMoney != null and firstMoney != 0"> and f.f_amtcr &gt;= #{firstMoney}</if>
+            <if test="lastMoney != null and lastMoney != 0"> and f.f_amtcr &lt;= #{lastMoney}</if>
+            <if test="fBillno != null  and fBillno != ''">and f.f_billno  like concat('%', #{ fBillno}, '%') </if>
             <if test=' timeInterval != null and  timeInterval[0] != null and  timeInterval[0]!= ""'>
                 and f.f_accbilldate &gt;= #{ timeInterval[0]}
             </if>