1.调整账单明细导出时相关字段

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/excel/QueryMenu.java

@@ -45,19 +45,22 @@ public class QueryMenu {
      * 计费起始日期
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "费用起始日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date fChargedate;
 
     /**
      * 计费截止日期
      */
-    @Excel(name = "费用截止日期")
-    private String fBillingDeadline;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "费用截止日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fBillingDeadline;
 
     /**
      * 原始入库日期
      */
-    @Excel(name = "原始入库日期")
-    private String fOriginalbilldate;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "原始入库日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fOriginalbilldate;
 
     /**
      * 费用名称
@@ -181,21 +184,22 @@ public class QueryMenu {
     private String fShipper;
 
     /** 出口单号 */
+    @Excel(name = "出口单号")
     private String fEmblno;
 
-    public String getfBillingDeadline() {
+    public Date getfBillingDeadline() {
         return fBillingDeadline;
     }
 
-    public void setfBillingDeadline(String fBillingDeadline) {
+    public void setfBillingDeadline(Date fBillingDeadline) {
         this.fBillingDeadline = fBillingDeadline;
     }
 
-    public String getfOriginalbilldate() {
+    public Date getfOriginalbilldate() {
         return fOriginalbilldate;
     }
 
-    public void setfOriginalbilldate(String fOriginalbilldate) {
+    public void setfOriginalbilldate(Date fOriginalbilldate) {
         this.fOriginalbilldate = fOriginalbilldate;
     }
 

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

@@ -955,8 +955,8 @@
         tf.remark AS remark,
         tf.src_bill_no AS fSrcBillno,
         tf.f_chargedate AS fChargedate,
-        DATE_FORMAT(tf.f_billing_deadline,'%Y-%m-%d') AS fBillingDeadline,
-        DATE_FORMAT(tf.f_originalbilldate,'%Y-%m-%d') AS fOriginalbilldate,
+        tf.f_billing_deadline AS fBillingDeadline,
+        tf.f_originalbilldate AS fOriginalbilldate,
         CASE
         WHEN tf.f_billstatus = '1' THEN '录入'
         WHEN tf.f_billstatus = '2' THEN '暂存'