From 1059321660cc88fddae7cfc827b9da2bcf3f05be 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:49:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Debom=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AF=BC=E5=87=BABom=E8=A1=A8=E4=B8=AD?= =?UTF-8?q?=E7=9A=84excel=E6=96=87=E4=BB=B6=E2=80=9C=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E8=BF=87=E6=9C=9F=E6=97=B6=E9=97=B4=E2=80=9D=E5=88=97=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B9=B1=E7=A0=81=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/constant/ReportConstant.java | 2 ++ .../bomnew/pojo/vo/EbomExcelEditVO.java | 24 +++++++++++-------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/ReportConstant.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/ReportConstant.java index 316b990a..3842ac4d 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/ReportConstant.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/ReportConstant.java @@ -5,6 +5,8 @@ import lombok.Getter; public class ReportConstant { + public static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss"; + @AllArgsConstructor @Getter public enum BomTypeEnum implements ValueEnum { diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/EbomExcelEditVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/EbomExcelEditVO.java index b792e5ae..cbc4bf90 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/EbomExcelEditVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/EbomExcelEditVO.java @@ -1,9 +1,11 @@ package com.nflg.product.bomnew.pojo.vo; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.nflg.product.bomnew.constant.EBomExceptionStatusEnum; import com.nflg.product.bomnew.constant.EBomStatusEnum; import com.nflg.product.bomnew.constant.MateiralStateEnum; +import com.nflg.product.bomnew.constant.ReportConstant; import com.nflg.product.bomnew.util.EnumUtils; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -83,17 +85,25 @@ public class EbomExcelEditVO { @ExcelColumn(value ="类别",colIndex = 13) private String categoryName; - @ExcelColumn(value ="创建日期",format = "yyyy-MM-dd hh:mm:ss",colIndex = 14) + @ExcelColumn(value ="创建日期",format = ReportConstant.DATE_FORMAT,colIndex = 14) private LocalDateTime createdTime; - @ExcelColumn(value ="修改日期",format = "yyyy-MM-dd hh:mm:ss",colIndex = 15) + @ExcelColumn(value ="修改日期",format = ReportConstant.DATE_FORMAT,colIndex = 15) private LocalDateTime modifTime; - @ExcelColumn(value ="有效起始日",format = "yyyy-MM-dd hh:mm:ss",colIndex = 16) + @ExcelColumn(value ="有效起始日",format = ReportConstant.DATE_FORMAT,colIndex = 16) private String startTime; public LocalDateTime getStartTime(){ return createdTime; } - @ExcelColumn(value ="版本过期时间",format = "yyyy-MM-dd hh:mm:ss",colIndex = 17) + private LocalDateTime expireEndTime; + @ExcelColumn(value ="版本过期时间",colIndex = 17) + private String expireEndTimeStr; + public String getExpireEndTimeStr(){ + if (Objects.isNull(expireEndTime)){ + return ""; + } + return DateUtil.format(expireEndTime, ReportConstant.DATE_FORMAT); + } @ExcelColumn(value ="物料状态",colIndex = 18) private String materialStateStr; @@ -104,12 +114,9 @@ public class EbomExcelEditVO { return EnumUtils.getValueEnum(MateiralStateEnum.class, this.materialState).getDescription(); } - - @ApiModelProperty(value = "1=待复核、2=已复核、3=已退回、4=定版（已发布PBOM）") private Integer status; - @ExcelColumn(value ="BOM状态",colIndex = 19) private String statusName; @@ -132,7 +139,4 @@ public class EbomExcelEditVO { @ExcelColumn("备注") private String remark; - - - }