Browse Source

凯和导出航次修改日期格式

lazhaoqian 3 years ago
parent
commit
0a39ff9731

+ 6 - 6
ruoyi-shipping/src/main/java/com/ruoyi/shipping/domain/TVoyage.java

@@ -57,22 +57,22 @@ public class TVoyage extends BaseEntity
 
     /** 预计开船日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "预计开船日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "预计开船日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date fEtd;
 
     /** 开船日期 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "开船日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "开船日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date fAtd;
 
     /** 预计到达日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "预计到达日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "预计到达日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date fEta;
 
     /** 到港日 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "到港日", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "到港日", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date fAta;
 
     /** 航期 */
@@ -81,12 +81,12 @@ public class TVoyage extends BaseEntity
 
     /** 截单日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "截单日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "截单日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date fDucomentrayoffdate;
 
     /** 截港日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "截港日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "截港日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date fCutoffdate;
 
     /** $column.columnComment */