From 58c22a4ca570aff686f0a0d433be2f5bf021a311 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 2 Apr 2024 14:57:58 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Debom=E6=AD=A3=E5=BC=8F?= =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2=E5=AF=BC=E5=87=BA=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E7=9A=84excel=E6=96=87=E4=BB=B6=E2=80=9C?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=97=B6=E9=97=B4=E2=80=9D=E5=88=97=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=A0=BC=E5=BC=8F=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/bomnew/pojo/vo/EbomExcelVO.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) 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;