Browse Source

[CODE]: 财务模块列表检索

maxianghua 4 years ago
parent
commit
11e09f922c

+ 12 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/finance/domain/TFee.java

@@ -8,6 +8,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 
 
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.Date;
+import java.util.List;
 
 
 /**
 /**
  * 财务数据主对象 t_fee
  * 财务数据主对象 t_fee
@@ -135,6 +136,17 @@ public class TFee extends BaseEntity {
     @Excel(name = "制单部门")
     @Excel(name = "制单部门")
     private Long fDeptid;
     private Long fDeptid;
 
 
+    /**
+     * 查询时间区间
+     */
+    private List<String> timeInterval;
+    public void settimeInterval(List<String> timeInterval) {
+        this.timeInterval = timeInterval;
+    }
+    public List<String> gettimeInterval() {
+        return timeInterval;
+    }
+
     public void setfId(Long fId) {
     public void setfId(Long fId) {
         this.fId = fId;
         this.fId = fId;
     }
     }

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

@@ -52,6 +52,12 @@
             <if test="fToDate != null ">and f_to_date = #{fToDate}</if>
             <if test="fToDate != null ">and f_to_date = #{fToDate}</if>
             <if test="fRefNo != null  and fRefNo != ''">and f_ref_no = #{fRefNo}</if>
             <if test="fRefNo != null  and fRefNo != ''">and f_ref_no = #{fRefNo}</if>
             <if test="fDeptid != null ">and f_deptid = #{fDeptid}</if>
             <if test="fDeptid != null ">and f_deptid = #{fDeptid}</if>
+            <if test='timeInterval != null and timeInterval[0] != null and timeInterval[0]!= ""'>
+                and f_accbilldate &gt;= #{timeInterval[0]}
+            </if>
+            <if test='timeInterval != null and timeInterval[1] != null and timeInterval[1]!= ""'>
+                and f_accbilldate &lt;= #{timeInterval[1]}
+            </if>
         </where>
         </where>
     </select>
     </select>
 
 
@@ -85,6 +91,12 @@
             <if test="fRemarks != null  and fRemarks != ''">and f.f_remarks = #{fRemarks}</if>
             <if test="fRemarks != null  and fRemarks != ''">and f.f_remarks = #{fRemarks}</if>
             <if test="fAccbilldate != null ">and f.f_accbilldate = #{fAccbilldate}</if>
             <if test="fAccbilldate != null ">and f.f_accbilldate = #{fAccbilldate}</if>
             <if test="fDeptid != null ">and f.f_deptid = #{fDeptid}</if>
             <if test="fDeptid != null ">and f.f_deptid = #{fDeptid}</if>
+            <if test='timeInterval != null and timeInterval[0] != null and timeInterval[0]!= ""'>
+                and f.f_accbilldate &gt;= #{timeInterval[0]}
+            </if>
+            <if test='timeInterval != null and timeInterval[1] != null and timeInterval[1]!= ""'>
+                and f.f_accbilldate &lt;= #{timeInterval[1]}
+            </if>
         </where>
         </where>
     </select>
     </select>