1.小小改动对账相关税率显示逻辑

ruoyi-warehouse/src/main/java/com/ruoyi/finance/service/impl/TFeeServiceImpl.java

@@ -242,6 +242,7 @@ public class TFeeServiceImpl implements ITFeeService {
                 map1.put("fUnitprice", tWarehousebillsfees.getfUnitprice());
                 map1.put("fBillno",fees.getfSrcBillno());// 业务编号（单据编号）
                 map1.put("invoiceNo",fees.getfInvoiceNo());// 发票号
+                map1.put("fTaxrate",tWarehousebillsfees.getfTaxrateStr());// 税率--传递字符串数据
                 if (StringUtils.isNotEmpty(tWarehousebillsfees.getfBilltype()) && tWarehousebillsfees.getfBilltype().equals("KHDD")) {
                     map1.put("fBusinessType", "船运订单");
                 } else if (CollectionUtils.isNotEmpty(sysDictDataListIn)) {

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

@@ -110,6 +110,11 @@ public class TWarehousebillsfees extends BaseEntity {
     private BigDecimal fTaxrate;
 
     /**
+     * 税率 --- 字符串显示
+     */
+    private String fTaxrateStr;
+
+    /**
      * 收、付,D:收 C 付
      */
     @Excel(name = "收、付,D:收 C 付")
@@ -437,6 +442,14 @@ public class TWarehousebillsfees extends BaseEntity {
      */
     private String dateRange;
 
+    public String getfTaxrateStr() {
+        return fTaxrateStr;
+    }
+
+    public void setfTaxrateStr(String fTaxrateStr) {
+        this.fTaxrateStr = fTaxrateStr;
+    }
+
     public String getDateRange() {
         return dateRange;
     }

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

@@ -1266,6 +1266,10 @@
         f.f_name AS fFeeName,
         w.f_dc AS fSrcdc,
         CASE
+        WHEN w.f_taxrate = 0 THEN '0.00%'
+        WHEN w.f_taxrate != 0 THEN CONCAT(w.f_taxrate,'%')
+        END AS fTaxrate,
+        CASE
         WHEN w.f_dc = 'D' THEN
         '收'
         WHEN w.f_dc = 'C' THEN

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

@@ -19,6 +19,7 @@
         <result property="fCurrency" column="f_currency"/>
         <result property="fExrate" column="f_exrate"/>
         <result property="fTaxrate" column="f_taxrate"/>
+        <result property="fTaxrateStr" column="f_taxratestr"/>
         <result property="fDc" column="f_dc"/>
         <result property="fBillstatus" column="f_billstatus"/>
         <result property="fReviewDate" column="f_review_date"/>
@@ -73,6 +74,10 @@
                f_currency,
                f_exrate,
                f_taxrate,
+               CASE
+                   WHEN f_taxrate = 0 THEN '0.00%'
+                   WHEN f_taxrate != 0 THEN CONCAT(f_taxrate,'%')
+                   END as f_taxratestr,
                f_dc,
                f_billstatus,
                f_review_date,