diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/EbomExcelVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/EbomExcelVO.java index fd089dcf..b16b7707 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/EbomExcelVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/EbomExcelVO.java @@ -1,17 +1,17 @@ package com.nflg.product.bomnew.pojo.vo; - - +import cn.hutool.core.date.DateUtil; import com.nflg.product.bomnew.constant.EBomExceptionStatusEnum; import com.nflg.product.bomnew.constant.EBomStatusEnum; +import com.nflg.product.bomnew.constant.ReportConstant; import com.nflg.product.bomnew.util.EnumUtils; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.ttzero.excel.annotation.ExcelColumn; import java.math.BigDecimal; -import java.util.Map; +import java.time.LocalDateTime; import java.util.Objects; /** @@ -75,8 +75,16 @@ public class EbomExcelVO { @ExcelColumn("升版说明") private String upgradeRemark; + private LocalDateTime createdTime; @ExcelColumn("任务时间") - private String createdTime; + private String createdTimeStr; + public String getCreatedTimeStr(){ + if (Objects.isNull(createdTime)){ + return ""; + } + return DateUtil.format(createdTime, ReportConstant.DATE_FORMAT); + } + @ExcelColumn("备注") private String remark;