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; - - - }