weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

日期时区问题修改;

Browse Source
This commit is contained in:
王奎兴
2026-05-28 21:21:51 +08:00
parent 39503f9f3c
commit c7cb8614ef
170 changed files with 690 additions and 692 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/domain/interceptOrder/entity/InterceptOrder.java
+2 -2
View File
@@ -57,7 +57,7 @@ public class InterceptOrder extends BaseVOEntity {
private String interceptByName;
@ApiModelProperty("拦截时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "拦截时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date interceptTime;
@@ -70,4 +70,4 @@ public class InterceptOrder extends BaseVOEntity {
private String taskNos;
}
}
mhd_oms/src/main/java/com/mhd/oms/domain/interceptOrder/repository/po/InterceptOrderPO.java
+2 -2
View File
@@ -54,7 +54,7 @@ public class InterceptOrderPO extends BaseVOEntity {
private String interceptByName;
@ApiModelProperty("拦截时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "拦截时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date interceptTime;
@@ -92,4 +92,4 @@ public class InterceptOrderPO extends BaseVOEntity {
}
}
mhd_oms/src/main/java/com/mhd/oms/domain/interceptOrder/repository/todo/InterceptOrderDO.java
+2 -2
View File
@@ -53,7 +53,7 @@ public class InterceptOrderDO extends BaseVOEntity {
private String interceptByName;
@ApiModelProperty("拦截时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "拦截时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date interceptTime;
@@ -70,4 +70,4 @@ public class InterceptOrderDO extends BaseVOEntity {
@ApiModelProperty(name = "权限菜单ID")
private Long permissionMenuId;
}
}
mhd_oms/src/main/java/com/mhd/oms/domain/purchaseOrder/entity/PurchaseOrder.java
+5 -5
View File
@@ -46,7 +46,7 @@ public class PurchaseOrder extends BaseVOEntity {
private Long auditBy;
@ApiModelProperty("审核时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date auditTime;
@@ -91,7 +91,7 @@ public class PurchaseOrder extends BaseVOEntity {
private String org;
@ApiModelProperty("订单时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "订单时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date orderTime;
@@ -120,7 +120,7 @@ public class PurchaseOrder extends BaseVOEntity {
private String receivingWarehouse;
@ApiModelProperty("交货日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "交货日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date deliveryDate;
@@ -170,7 +170,7 @@ public class PurchaseOrder extends BaseVOEntity {
private Integer tacklState;
@ApiModelProperty("拦截时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "拦截时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date tacklTime;
@@ -199,4 +199,4 @@ public class PurchaseOrder extends BaseVOEntity {
@ApiModelProperty("下发系统")
@Excel(name = "下发系统")
private String deliverySystem;
}
}
mhd_oms/src/main/java/com/mhd/oms/domain/purchaseOrder/repository/po/PurchaseOrderPO.java
+5 -5
View File
@@ -43,7 +43,7 @@ public class PurchaseOrderPO extends BaseVOEntity {
private Long auditBy;
@ApiModelProperty("审核时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date auditTime;
@@ -88,7 +88,7 @@ public class PurchaseOrderPO extends BaseVOEntity {
private String org;
@ApiModelProperty("订单时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "订单时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date orderTime;
@@ -117,7 +117,7 @@ public class PurchaseOrderPO extends BaseVOEntity {
private String receivingWarehouse;
@ApiModelProperty("交货日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "交货日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date deliveryDate;
@@ -166,7 +166,7 @@ public class PurchaseOrderPO extends BaseVOEntity {
private Integer tacklState;
@ApiModelProperty("拦截时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "拦截时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date tacklTime;
@@ -213,4 +213,4 @@ public class PurchaseOrderPO extends BaseVOEntity {
@Excel(name = "下发系统")
private String deliverySystem;
}
}
mhd_oms/src/main/java/com/mhd/oms/domain/purchaseOrder/repository/todo/PurchaseOrderAuditDO.java
+2 -2
View File
@@ -22,7 +22,7 @@ public class PurchaseOrderAuditDO extends BaseVOEntity {
private Long auditBy;
@ApiModelProperty("审核时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date auditTime;
@@ -34,4 +34,4 @@ public class PurchaseOrderAuditDO extends BaseVOEntity {
@Excel(name = "审核结果")
private String auditResult;
}
}
mhd_oms/src/main/java/com/mhd/oms/domain/purchaseOrder/repository/todo/PurchaseOrderDO.java
+5 -5
View File
@@ -42,7 +42,7 @@ public class PurchaseOrderDO extends BaseVOEntity {
private Long auditBy;
@ApiModelProperty("审核时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date auditTime;
@@ -87,7 +87,7 @@ public class PurchaseOrderDO extends BaseVOEntity {
private String org;
@ApiModelProperty("订单时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "订单时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date orderTime;
@@ -120,7 +120,7 @@ public class PurchaseOrderDO extends BaseVOEntity {
private String receivingWarehouse;
@ApiModelProperty("交货日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "交货日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date deliveryDate;
@@ -169,7 +169,7 @@ public class PurchaseOrderDO extends BaseVOEntity {
private Integer tacklState;
@ApiModelProperty("拦截时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "拦截时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date tacklTime;
@@ -194,4 +194,4 @@ public class PurchaseOrderDO extends BaseVOEntity {
@ApiModelProperty(name = "权限菜单ID")
private Long permissionMenuId;
}
}
mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/po/ReservationInMaterialDetailPO.java
+3 -3
View File
@@ -353,17 +353,17 @@ public class ReservationInMaterialDetailPO extends ReservationStockInOrderBasePO
@ApiModelProperty("生产日期")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date productionDate;
@ApiModelProperty("过期日期")
@Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date expiryDate;
@ApiModelProperty("存货日期")
@Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date inventoryDate;
@ApiModelProperty("扩展属性1")
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/entity/ReservationStockOutOrder.java
+3 -3
View File
@@ -71,7 +71,7 @@ public class ReservationStockOutOrder extends BaseVOEntity {
private String auditByName;
@ApiModelProperty("出库单审核时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "出库单审核时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date auditTime;
@@ -198,7 +198,7 @@ public class ReservationStockOutOrder extends BaseVOEntity {
private String cancelByName;
@ApiModelProperty("取消订单时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "取消订单时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date cancelTime;
@@ -219,7 +219,7 @@ public class ReservationStockOutOrder extends BaseVOEntity {
private String closeByName;
@ApiModelProperty("关闭订单时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "关闭订单时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date closeTime;
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java
+3 -3
View File
@@ -75,7 +75,7 @@ public class ReservationStockOutOrderPO extends BaseVOEntity {
private String auditByName;
@ApiModelProperty("出库单审核时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "出库单审核时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date auditTime;
@@ -202,7 +202,7 @@ public class ReservationStockOutOrderPO extends BaseVOEntity {
private String cancelByName;
@ApiModelProperty("取消订单时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "取消订单时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date cancelTime;
@@ -223,7 +223,7 @@ public class ReservationStockOutOrderPO extends BaseVOEntity {
private String closeByName;
@ApiModelProperty("关闭订单时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "关闭订单时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date closeTime;
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java
+3 -3
View File
@@ -71,7 +71,7 @@ public class ReservationStockOutOrderDO extends BaseVOEntity {
private String auditByName;
@ApiModelProperty("出库单审核时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "出库单审核时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date auditTime;
@@ -198,7 +198,7 @@ public class ReservationStockOutOrderDO extends BaseVOEntity {
private String cancelByName;
@ApiModelProperty("取消订单时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "取消订单时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date cancelTime;
@@ -219,7 +219,7 @@ public class ReservationStockOutOrderDO extends BaseVOEntity {
private String closeByName;
@ApiModelProperty("关闭订单时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "关闭订单时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date closeTime;
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java
+3 -3
View File
@@ -69,7 +69,7 @@ public class ReservationStockOutOrderDTO extends ReservationStockOutOrderBaseDTO
private String auditByName;
@ApiModelProperty("出库单审核时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "出库单审核时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date auditTime;
@@ -196,7 +196,7 @@ public class ReservationStockOutOrderDTO extends ReservationStockOutOrderBaseDTO
private String cancelByName;
@ApiModelProperty("取消订单时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "取消订单时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date cancelTime;
@@ -217,7 +217,7 @@ public class ReservationStockOutOrderDTO extends ReservationStockOutOrderBaseDTO
private String closeByName;
@ApiModelProperty("关闭订单时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "关闭订单时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date closeTime;
mhd_oms/src/main/java/com/mhd/oms/domain/reserveInMaterialDetail/repository/po/ReserveInMaterialDetailPO.java
+3 -3
View File
@@ -354,17 +354,17 @@ public class ReserveInMaterialDetailPO extends ReserveStockInOrderBasePO {
@ApiModelProperty("生产日期")
@Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date productionDate;
@ApiModelProperty("过期日期")
@Excel(name = "过期日期", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date expiryDate;
@ApiModelProperty("存货日期")
@Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date inventoryDate;
@ApiModelProperty("扩展属性1")
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/entity/ReserveStockOutOrder.java
+3 -3
View File
@@ -71,7 +71,7 @@ public class ReserveStockOutOrder extends BaseVOEntity {
private String auditByName;
@ApiModelProperty("出库单审核时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "出库单审核时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date auditTime;
@@ -198,7 +198,7 @@ public class ReserveStockOutOrder extends BaseVOEntity {
private String cancelByName;
@ApiModelProperty("取消订单时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "取消订单时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date cancelTime;
@@ -219,7 +219,7 @@ public class ReserveStockOutOrder extends BaseVOEntity {
private String closeByName;
@ApiModelProperty("关闭订单时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "关闭订单时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date closeTime;
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/po/ReserveStockOutOrderPO.java
+3 -3
View File
@@ -71,7 +71,7 @@ public class ReserveStockOutOrderPO extends BaseVOEntity {
private String auditByName;
@ApiModelProperty("出库单审核时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "出库单审核时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date auditTime;
@@ -198,7 +198,7 @@ public class ReserveStockOutOrderPO extends BaseVOEntity {
private String cancelByName;
@ApiModelProperty("取消订单时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "取消订单时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date cancelTime;
@@ -219,7 +219,7 @@ public class ReserveStockOutOrderPO extends BaseVOEntity {
private String closeByName;
@ApiModelProperty("关闭订单时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "关闭订单时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date closeTime;
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/todo/ReserveStockOutOrderDO.java
+3 -3
View File
@@ -70,7 +70,7 @@ public class ReserveStockOutOrderDO extends BaseVOEntity {
private String auditByName;
@ApiModelProperty("出库单审核时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "出库单审核时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date auditTime;
@@ -197,7 +197,7 @@ public class ReserveStockOutOrderDO extends BaseVOEntity {
private String cancelByName;
@ApiModelProperty("取消订单时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "取消订单时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date cancelTime;
@@ -218,7 +218,7 @@ public class ReserveStockOutOrderDO extends BaseVOEntity {
private String closeByName;
@ApiModelProperty("关闭订单时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "关闭订单时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date closeTime;
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/todo/ReserveStockOutOrderDTO.java
+3 -3
View File
@@ -68,7 +68,7 @@ public class ReserveStockOutOrderDTO extends ReserveStockOutOrderBaseDTO {
private String auditByName;
@ApiModelProperty("出库单审核时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "出库单审核时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date auditTime;
@@ -195,7 +195,7 @@ public class ReserveStockOutOrderDTO extends ReserveStockOutOrderBaseDTO {
private String cancelByName;
@ApiModelProperty("取消订单时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "取消订单时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date cancelTime;
@@ -216,7 +216,7 @@ public class ReserveStockOutOrderDTO extends ReserveStockOutOrderBaseDTO {
private String closeByName;
@ApiModelProperty("关闭订单时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "关闭订单时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date closeTime;
mhd_oms/src/main/java/com/mhd/oms/domain/salesOrder/entity/SalesOrder.java
+5 -5
View File
@@ -34,7 +34,7 @@ public class SalesOrder extends BaseVOEntity {
private Long auditBy;
@ApiModelProperty("审核时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date auditTime;
@@ -135,7 +135,7 @@ public class SalesOrder extends BaseVOEntity {
private Integer tacklState;
@ApiModelProperty("拦截时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "拦截时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date tacklTime;
@@ -152,7 +152,7 @@ public class SalesOrder extends BaseVOEntity {
private String org;
@ApiModelProperty("订单时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "订单时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date orderTime;
@@ -165,7 +165,7 @@ public class SalesOrder extends BaseVOEntity {
private String deliveryWarehouse;
@ApiModelProperty("发货日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "发货日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date deliveryDate;
@@ -202,4 +202,4 @@ public class SalesOrder extends BaseVOEntity {
private String remark;
}
}
mhd_oms/src/main/java/com/mhd/oms/domain/salesOrder/repository/po/SalesOrderPO.java
+5 -5
View File
@@ -31,7 +31,7 @@ public class SalesOrderPO extends BaseVOEntity {
private String auditBy;
@ApiModelProperty("审核时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date auditTime;
@@ -120,7 +120,7 @@ public class SalesOrderPO extends BaseVOEntity {
private Integer tacklState;
@ApiModelProperty("拦截时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "拦截时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date tacklTime;
@@ -137,7 +137,7 @@ public class SalesOrderPO extends BaseVOEntity {
private String org;
@ApiModelProperty("订单时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "订单时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date orderTime;
@@ -150,7 +150,7 @@ public class SalesOrderPO extends BaseVOEntity {
private String deliveryWarehouse;
@ApiModelProperty("发货日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "发货日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date deliveryDate;
@@ -194,4 +194,4 @@ public class SalesOrderPO extends BaseVOEntity {
@Excel(name = "作业任务类型")
private String jobTaskType;
}
}
mhd_oms/src/main/java/com/mhd/oms/domain/salesOrder/repository/todo/SalesOrderAuditDO.java
+2 -2
View File
@@ -29,7 +29,7 @@ public class SalesOrderAuditDO extends BaseVOEntity {
private Long auditBy;
@ApiModelProperty("审核时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date auditTime;
@@ -40,4 +40,4 @@ public class SalesOrderAuditDO extends BaseVOEntity {
@ApiModelProperty("审核结果")
@Excel(name = "审核结果")
private String auditResult;
}
}
mhd_oms/src/main/java/com/mhd/oms/domain/salesOrder/repository/todo/SalesOrderDO.java
+5 -5
View File
@@ -30,7 +30,7 @@ public class SalesOrderDO extends BaseVOEntity {
private String auditBy;
@ApiModelProperty("审核时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date auditTime;
@@ -131,7 +131,7 @@ public class SalesOrderDO extends BaseVOEntity {
private Integer tacklState;
@ApiModelProperty("拦截时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "拦截时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date tacklTime;
@@ -148,7 +148,7 @@ public class SalesOrderDO extends BaseVOEntity {
private String org;
@ApiModelProperty("订单时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "订单时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date orderTime;
@@ -161,7 +161,7 @@ public class SalesOrderDO extends BaseVOEntity {
private String deliveryWarehouse;
@ApiModelProperty("发货日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "发货日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date deliveryDate;
@@ -202,4 +202,4 @@ public class SalesOrderDO extends BaseVOEntity {
@ApiModelProperty(name = "权限菜单ID")
private Long permissionMenuId;
}
}
mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/interceptOrder/InterceptOrderDTO.java
+2 -2
View File
@@ -52,7 +52,7 @@ public class InterceptOrderDTO extends BaseVOEntity {
private String interceptByName;
@ApiModelProperty("拦截时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "拦截时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date interceptTime;
@@ -70,4 +70,4 @@ public class InterceptOrderDTO extends BaseVOEntity {
@ApiModelProperty(name = "权限菜单ID")
private Long permissionMenuId;
}
}
mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/purchaseOrder/PurchaseOrderAuditDTO.java
+2 -2
View File
@@ -24,7 +24,7 @@ public class PurchaseOrderAuditDTO extends BaseVOEntity {
private Long auditBy;
@ApiModelProperty("审核时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date auditTime;
@@ -37,4 +37,4 @@ public class PurchaseOrderAuditDTO extends BaseVOEntity {
private String auditResult;
}
}
mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/purchaseOrder/PurchaseOrderDTO.java
+5 -5
View File
@@ -41,7 +41,7 @@ public class PurchaseOrderDTO extends BaseVOEntity {
private Long auditBy;
@ApiModelProperty("审核时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date auditTime;
@@ -86,7 +86,7 @@ public class PurchaseOrderDTO extends BaseVOEntity {
private String org;
@ApiModelProperty("订单时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "订单时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date orderTime;
@@ -115,7 +115,7 @@ public class PurchaseOrderDTO extends BaseVOEntity {
private String receivingWarehouse;
@ApiModelProperty("交货日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "交货日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date deliveryDate;
@@ -164,7 +164,7 @@ public class PurchaseOrderDTO extends BaseVOEntity {
private Integer tacklState;
@ApiModelProperty("拦截时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "拦截时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date tacklTime;
@@ -182,4 +182,4 @@ public class PurchaseOrderDTO extends BaseVOEntity {
@ApiModelProperty(name = "权限菜单ID")
private Long permissionMenuId;
}
}
mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/purchaseOrder/PurchaseOrderExcelDTO.java
+2 -2
View File
@@ -46,7 +46,7 @@ public class PurchaseOrderExcelDTO extends BaseVOEntity {
@ExcelProperty(index = 4)
@ApiModelProperty("订单日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date orderTime;
@ExcelProperty(index = 5)
@@ -59,7 +59,7 @@ public class PurchaseOrderExcelDTO extends BaseVOEntity {
@ExcelProperty(index = 7)
@ApiModelProperty("交货日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date deliveryDate;
@ExcelProperty(index = 8)
mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/salesOrder/SalesOrderAuditDTO.java
+2 -2
View File
@@ -28,7 +28,7 @@ public class SalesOrderAuditDTO extends BaseVOEntity {
private Long auditBy;
@ApiModelProperty("审核时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date auditTime;
@@ -39,4 +39,4 @@ public class SalesOrderAuditDTO extends BaseVOEntity {
@ApiModelProperty("审核结果")
@Excel(name = "审核结果")
private String auditResult;
}
}
mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/salesOrder/SalesOrderDTO.java
+5 -5
View File
@@ -29,7 +29,7 @@ public class SalesOrderDTO extends BaseVOEntity {
private String auditBy;
@ApiModelProperty("审核时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date auditTime;
@@ -118,7 +118,7 @@ public class SalesOrderDTO extends BaseVOEntity {
private Integer tacklState;
@ApiModelProperty("拦截时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "拦截时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date tacklTime;
@@ -135,7 +135,7 @@ public class SalesOrderDTO extends BaseVOEntity {
private String org;
@ApiModelProperty("订单时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "订单时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date orderTime;
@@ -148,7 +148,7 @@ public class SalesOrderDTO extends BaseVOEntity {
private String deliveryWarehouse;
@ApiModelProperty("发货日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "发货日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date deliveryDate;
@@ -190,4 +190,4 @@ public class SalesOrderDTO extends BaseVOEntity {
@ApiModelProperty(name = "权限菜单ID")
private Long permissionMenuId;
}
}
mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/salesOrder/SalesOrderExcelDTO.java
+2 -2
View File
@@ -54,7 +54,7 @@ public class SalesOrderExcelDTO extends BaseVOEntity {
@ExcelProperty(index = 4)
@ApiModelProperty("订单日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date orderTime;
@ExcelProperty(index = 5)
@@ -75,7 +75,7 @@ public class SalesOrderExcelDTO extends BaseVOEntity {
@ExcelProperty(index = 7)
@ApiModelProperty("发货日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date deliveryDate;
@ExcelProperty(index = 8)