Commit 86b0e26c authored by zhengyi's avatar zhengyi

自编号详情返回值时间格式化

parent 3c26c256
...@@ -10,6 +10,7 @@ import cn.iocoder.yudao.module.shipment.enums.BoxApprovalTypeEnum; ...@@ -10,6 +10,7 @@ import cn.iocoder.yudao.module.shipment.enums.BoxApprovalTypeEnum;
import cn.iocoder.yudao.module.shipment.enums.BoxStatusEnum; import cn.iocoder.yudao.module.shipment.enums.BoxStatusEnum;
import cn.iocoder.yudao.module.shipment.enums.TransportTypeEnum; import cn.iocoder.yudao.module.shipment.enums.TransportTypeEnum;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -82,35 +83,42 @@ public class BoxBaseBackVO { ...@@ -82,35 +83,42 @@ public class BoxBaseBackVO {
@ExcelProperty("预装时间") @ExcelProperty("预装时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "预装时间") @ApiModelProperty(value = "预装时间")
private Date yzDate; private Date yzDate;
@ExcelProperty("装柜时间") @ExcelProperty("装柜时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "装柜时间") @ApiModelProperty(value = "装柜时间")
private Date zgDate; private Date zgDate;
@ExcelProperty("起运时间") @ExcelProperty("起运时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "起运时间") @ApiModelProperty(value = "起运时间")
private Date qyDate; private Date qyDate;
@ExcelProperty("到港时间") @ExcelProperty("到港时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "到港时间") @ApiModelProperty(value = "到港时间")
private Date dgDate; private Date dgDate;
@ExcelProperty("清关时间") @ExcelProperty("清关时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "清关时间") @ApiModelProperty(value = "清关时间")
private Date qgDate; private Date qgDate;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "到仓时间") @ApiModelProperty(value = "到仓时间")
private Date dcDate; private Date dcDate;
@ExcelProperty("提货时间") @ExcelProperty("提货时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "提货时间") @ApiModelProperty(value = "提货时间")
private Date thDate; private Date thDate;
...@@ -126,6 +134,7 @@ public class BoxBaseBackVO { ...@@ -126,6 +134,7 @@ public class BoxBaseBackVO {
private Integer tyStatus; private Integer tyStatus;
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "提交理货时间") @ApiModelProperty(value = "提交理货时间")
private Date tyTime; private Date tyTime;
...@@ -260,6 +269,7 @@ public class BoxBaseBackVO { ...@@ -260,6 +269,7 @@ public class BoxBaseBackVO {
@ExcelProperty("创建时间") @ExcelProperty("创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@ApiModelProperty(value = "创建时间", required = true) @ApiModelProperty(value = "创建时间", required = true)
private Date createTime; private Date createTime;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment