[CODE]:报表分析查询条件及展示字段变更

ruoyi-warehouse/src/main/java/com/ruoyi/finance/domain/TWareHouseFees.java

@@ -68,7 +68,7 @@ public class TWareHouseFees {
      *   费用状态
      */
     @Excel(name = "费用状态")
-    private Long fBillstatus;
+    private String fBillstatus;
 
     /**
      * 唛头
@@ -127,11 +127,11 @@ public class TWareHouseFees {
         this.fMarks = fMarks;
     }
 
-    public Long getfBillstatus() {
+    public String getfBillstatus() {
         return fBillstatus;
     }
 
-    public void setfBillstatus(Long fBillstatus) {
+    public void setfBillstatus(String fBillstatus) {
         this.fBillstatus = fBillstatus;
     }
 

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

@@ -172,8 +172,8 @@
         w.fId AS fId,
         w.fName AS fFeesName,
         t.f_bscorpno AS fBscorpno,
-        t.f_mblno AS fMblno,
-        t.f_product_name AS fProductName,
+        w.f_mblno AS fMblno,
+        w.f_product_name AS fProductName,
         t.f_bsdate AS fBsdate,
         t.f_billtype AS fBilltype,
         t.f_review_date AS fReviewDate,
@@ -212,6 +212,9 @@
         f.f_askamount,
         f.f_status,
         f.remark,
+        f.f_mblno,
+        f.f_product_name,
+        f.f_marks,
         c.f_id AS fId,
         c.f_name AS fName
         FROM
@@ -222,7 +225,7 @@
         <where>
             <if test="map.tWareHouseFees.fCorpid != null  and map.tWareHouseFees.fCorpid != ''">and t.f_corpid = #{map.tWareHouseFees.fCorpid} </if>
             <if test="map.tWareHouseFees.fToCorpid != null  and map.tWareHouseFees.fToCorpid != ''">and w.f_corpid = #{map.tWareHouseFees.fToCorpid} </if>
-            <if test="map.tWareHouseFees.fMblno != null  and map.tWareHouseFees.fMblno != ''">and t.f_mblno  like concat('%', #{map.tWareHouseFees.fMblno}, '%') </if>
+            <if test="map.tWareHouseFees.fMblno != null  and map.tWareHouseFees.fMblno != ''">and w.f_mblno  like concat('%', #{map.tWareHouseFees.fMblno}, '%') </if>
             <if test="map.tWareHouseFees.fStatementNo != null and map.tWareHouseFees.fStatementNo != ''">and w.f_statement_no  like concat('%', #{map.tWareHouseFees.fStatementNo}, '%') </if>
 
             <if test='map.tWareHouseFees.fReconciliation != null and map.tWareHouseFees.fReconciliation != "" and map.tWareHouseFees.fReconciliation == "1" '>
@@ -276,8 +279,8 @@
         w.fId AS fId,
         w.fName AS fFeesName,
         t.f_bscorpno AS fBscorpno,
-        t.f_mblno AS fMblno,
-        t.f_product_name AS fProductName,
+        w.f_mblno AS fMblno,
+        w.f_product_name AS fProductName,
         t.f_bsdate AS fBsdate,
         t.f_billtype AS fBilltype,
         t.f_review_date AS fReviewDate,
@@ -316,6 +319,9 @@
         f.f_askamount,
         f.f_status,
         f.remark,
+        f.f_mblno,
+        f.f_product_name,
+        f.f_marks,
         c.f_id AS fId,
         c.f_name AS fName
         FROM
@@ -326,7 +332,7 @@
         <where>
             <if test="map.tWareHouseFees.fCorpid != null  and map.tWareHouseFees.fCorpid != ''">and t.f_corpid = #{map.tWareHouseFees.fCorpid} </if>
             <if test="map.tWareHouseFees.fToCorpid != null  and map.tWareHouseFees.fToCorpid != ''">and w.f_corpid = #{map.tWareHouseFees.fToCorpid} </if>
-            <if test="map.tWareHouseFees.fMblno != null  and map.tWareHouseFees.fMblno != ''">and t.f_mblno  like concat('%', #{map.tWareHouseFees.fMblno}, '%') </if>
+            <if test="map.tWareHouseFees.fMblno != null  and map.tWareHouseFees.fMblno != ''">and w.f_mblno  like concat('%', #{map.tWareHouseFees.fMblno}, '%') </if>
             <if test="map.tWareHouseFees.fStatementNo != null and map.tWareHouseFees.fStatementNo != ''">and w.f_statement_no  like concat('%', #{map.tWareHouseFees.fStatementNo}, '%') </if>
 
             <if test='map.tWareHouseFees.fReconciliation != null and map.tWareHouseFees.fReconciliation != "" and map.tWareHouseFees.fReconciliation == "1" '>
@@ -379,9 +385,9 @@
             c.f_name AS fName,
             w.fId AS fId,
             w.fName AS fFeesName,
-            t.f_mblno AS fMblno,
-            t.f_product_name AS fProductName,
-            t.f_marks AS fMarks,
+            w.f_mblno AS fMblno,
+            w.f_product_name AS fProductName,
+            w.f_marks AS fMarks,
             t.f_billtype AS fBilltype,
             t.f_review_date AS fReviewDate,
             w.f_dc AS fSrcdc,
@@ -417,6 +423,9 @@
                     f.f_askamount,
                     f.f_status,
                     f.remark,
+                    f.f_mblno,
+                    f.f_product_name,
+                    f.f_marks,
                     c.f_id AS fId,
                     c.f_name AS fName
                 FROM
@@ -427,14 +436,14 @@
         <where>
             <if test="fCorpid != null  and fCorpid != ''">and t.f_corpid = #{fCorpid} </if>
             <if test="fToCorpid != null  and fToCorpid != ''">and w.f_corpid = #{fToCorpid} </if>
-            <if test="fMblno != null  and fMblno != ''">and t.f_mblno  like concat('%', #{fMblno}, '%') </if>
-            <if test="fMarks != null and fMarks != ''">and t.f_marks  like concat('%', #{fMarks}, '%') </if>
-            <if test="fProductName != null and fProductName != ''">and t.f_product_name  like concat('%', #{fProductName}, '%') </if>
-            <if test='fBillstatus != null and fBillstatus != "" and fBillstatus == "1" '>
-                and w.f_billstatus != 1
+            <if test="fMblno != null  and fMblno != ''">and w.f_mblno  like concat('%', #{fMblno}, '%') </if>
+            <if test="fMarks != null and fMarks != ''">and w.f_marks  like concat('%', #{fMarks}, '%') </if>
+            <if test="fProductName != null and fProductName != ''">and w.f_product_name  like concat('%', #{fProductName}, '%') </if>
+            <if test='fBillstatus != null and fBillstatus != "" and fBillstatus == "0" '>
+                and w.f_billstatus != 6
             </if>
-            <if test='fBillstatus!= null and fBillstatus != "" and fBillstatus == "0" '>
-                and w.f_billstatus = 1
+            <if test='fBillstatus != null and fBillstatus != "" and fBillstatus == "1" '>
+                and w.f_billstatus = 6
             </if>
             <if test='fDc != null and fDc != "" and fDc == "D" '>
                 and w.f_dc = #{fDc}