rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修复ebom编辑页面导出Bom表中的excel文件“版本过期时间”列数据乱码的问题

This commit is contained in:
曹鹏飞 2024-04-02 14:49:11 +08:00
parent 46a0186ab3
commit 1059321660
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/constant/ReportConstant.java
View File

@ -5,6 +5,8 @@ import lombok.Getter;
public class ReportConstant { public class ReportConstant {
public static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
@AllArgsConstructor @AllArgsConstructor
@Getter @Getter
public enum BomTypeEnum implements ValueEnum<Integer> { public enum BomTypeEnum implements ValueEnum<Integer> {

24
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/EbomExcelEditVO.java
View File

@ -1,9 +1,11 @@
package com.nflg.product.bomnew.pojo.vo; package com.nflg.product.bomnew.pojo.vo;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.nflg.product.bomnew.constant.EBomExceptionStatusEnum; import com.nflg.product.bomnew.constant.EBomExceptionStatusEnum;
import com.nflg.product.bomnew.constant.EBomStatusEnum; import com.nflg.product.bomnew.constant.EBomStatusEnum;
import com.nflg.product.bomnew.constant.MateiralStateEnum; import com.nflg.product.bomnew.constant.MateiralStateEnum;
import com.nflg.product.bomnew.constant.ReportConstant;
import com.nflg.product.bomnew.util.EnumUtils; import com.nflg.product.bomnew.util.EnumUtils;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -83,17 +85,25 @@ public class EbomExcelEditVO {
@ExcelColumn(value ="类别",colIndex = 13) @ExcelColumn(value ="类别",colIndex = 13)
private String categoryName; 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; 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; 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; private String startTime;
public LocalDateTime getStartTime(){ public LocalDateTime getStartTime(){
return createdTime; return createdTime;
} }
@ExcelColumn(value ="版本过期时间",format = "yyyy-MM-dd hh:mm:ss",colIndex = 17)
private LocalDateTime expireEndTime; 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) @ExcelColumn(value ="物料状态",colIndex = 18)
private String materialStateStr; private String materialStateStr;
@ -104,12 +114,9 @@ public class EbomExcelEditVO {
return EnumUtils.getValueEnum(MateiralStateEnum.class, this.materialState).getDescription(); return EnumUtils.getValueEnum(MateiralStateEnum.class, this.materialState).getDescription();
} }
@ApiModelProperty(value = "1=待复核、2=已复核、3=已退回、4=定版（已发布PBOM）") @ApiModelProperty(value = "1=待复核、2=已复核、3=已退回、4=定版（已发布PBOM）")
private Integer status; private Integer status;
@ExcelColumn(value ="BOM状态",colIndex = 19) @ExcelColumn(value ="BOM状态",colIndex = 19)
private String statusName; private String statusName;
@ -132,7 +139,4 @@ public class EbomExcelEditVO {
@ExcelColumn("备注") @ExcelColumn("备注")
private String remark; private String remark;
} }