单票分析导出添加新字段

ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

@@ -608,7 +608,7 @@ public class ExcelUtil<T>
             Cell cell;// 单元格
             String colString;//长度转成ABC后的列
             String sumString;//求和公式
-            Integer[] line = {3, 4, 6, 7, 8, 9};
+            Integer[] line = {3, 4, 6, 7, 8, 9, 12, 13};
             cell = row.createCell(0);// 创建单元格
             cell.setCellValue("合计：");
             int totalRows = sheet.getPhysicalNumberOfRows();

ruoyi-warehouse/src/main/java/com/ruoyi/reportManagement/domain/SingleAnalysisExcel.java

@@ -1,10 +1,8 @@
 package com.ruoyi.reportManagement.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 
 import java.math.BigDecimal;
-import java.util.Date;
 import java.util.List;
 
 public class SingleAnalysisExcel {
@@ -66,6 +64,18 @@ public class SingleAnalysisExcel {
     @Excel(name = "业务类型")
     private String fBilltype;
 
+    /** 车号 */
+    @Excel(name = "车号")
+    private String fTruckno;
+
+    /** 堆存天数 */
+    @Excel(name = "堆存天数")
+    private Integer fBillingDays;
+
+    /** 出库堆存费 */
+    @Excel(name = "出库堆存费")
+    private BigDecimal fAmt;
+
     /** 备注 */
     @Excel(name = "备注")
     private String remark;
@@ -201,6 +211,30 @@ public class SingleAnalysisExcel {
         this.fBilltype = fBilltype;
     }
 
+    public String getfTruckno() {
+        return fTruckno;
+    }
+
+    public void setfTruckno(String fTruckno) {
+        this.fTruckno = fTruckno;
+    }
+
+    public Integer getfBillingDays() {
+        return fBillingDays;
+    }
+
+    public void setfBillingDays(Integer fBillingDays) {
+        this.fBillingDays = fBillingDays;
+    }
+
+    public BigDecimal getfAmt() {
+        return fAmt;
+    }
+
+    public void setfAmt(BigDecimal fAmt) {
+        this.fAmt = fAmt;
+    }
+
     public String getRemark() {
         return remark;
     }

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

@@ -2710,10 +2710,14 @@
             END AS fBilltype,
             0 fQtyblc,
             0 fGrossweightblc,
+            item.f_truckno fTruckno,
+            tf.f_billing_days fBillingDays,
+            tf.f_amt fAmt,
             item.remark
         FROM
             t_warehousebills w
             LEFT JOIN t_warehousebillsitems item ON item.f_pid = w.f_id
+            LEFT JOIN t_warehousebillsfees tf ON item.f_id = tf.src_id
             LEFT JOIN t_corps c ON c.f_id = w.f_corpid
             LEFT JOIN t_warehouse ware ON IF(item.f_billtype = 'CKDB', ware.f_id = item.f_transfer_warehouselocid, ware.f_id = item.f_warehouselocid)
             LEFT JOIN sys_dict_data d ON d.dict_value = w.f_business_type