From b9945d51d829ebaeed3e6312dda9eda9f5df48bf Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 21 Aug 2023 19:02:50 +0800 Subject: [PATCH] =?UTF-8?q?excel=E5=AF=BC=E5=87=BA-=E4=B8=AD=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/OtaManageApplyEOServiceImpl.java | 110 ++++++++++++------ ...CarExportVO.java => AllCarExportCnVO.java} | 4 +- .../jero/modules/ota/vo/AllCarExportEnVO.java | 51 ++++++++ ...CarExportVO.java => OneCarExportCnVO.java} | 4 +- .../jero/modules/ota/vo/OneCarExportEnVO.java | 90 ++++++++++++++ .../{OtaExportVO.java => OtaExportCnVO.java} | 2 +- .../jero/modules/ota/vo/OtaExportEnVO.java | 31 +++++ 7 files changed, 249 insertions(+), 43 deletions(-) rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/{AllCarExportVO.java => AllCarExportCnVO.java} (94%) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/AllCarExportEnVO.java rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/{OneCarExportVO.java => OneCarExportCnVO.java} (97%) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/OneCarExportEnVO.java rename jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/{OtaExportVO.java => OtaExportCnVO.java} (96%) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/OtaExportEnVO.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java index 760d10633..37036b834 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java @@ -1,13 +1,10 @@ package com.jero.modules.ota.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.DateUtils; -import com.jero.common.util.PageUtil; import com.jero.common.util.oConvertUtils; import com.jero.modules.dummy.enums.OrderEnum; import com.jero.modules.ota.entity.OtaManageApplyEO; @@ -18,9 +15,12 @@ import com.jero.modules.ota.enums.OtaStatusEnum; import com.jero.modules.ota.mapper.OtaManageApplyEOMapper; import com.jero.modules.ota.service.IOtaManageApplyEOService; import com.jero.modules.ota.service.IOtaManageHistoryService; -import com.jero.modules.ota.vo.AllCarExportVO; -import com.jero.modules.ota.vo.OneCarExportVO; -import com.jero.modules.ota.vo.OtaExportVO; +import com.jero.modules.ota.vo.AllCarExportCnVO; +import com.jero.modules.ota.vo.AllCarExportEnVO; +import com.jero.modules.ota.vo.OneCarExportCnVO; +import com.jero.modules.ota.vo.OneCarExportEnVO; +import com.jero.modules.ota.vo.OtaExportCnVO; +import com.jero.modules.ota.vo.OtaExportEnVO; import com.jero.modules.ota.vo.VersionVO; import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectTaskPlanning; @@ -37,7 +37,6 @@ import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.system.util.StringUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; -import org.apache.poi.ss.formula.functions.T; import org.apache.shiro.SecurityUtils; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -1096,20 +1095,31 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl dataList = new ArrayList<>(); - for (OtaManageApplyEO manageApplyEO : exportList) { - OtaExportVO otaExportVO = new OtaExportVO(); - BeanUtils.copyProperties(manageApplyEO, otaExportVO); - dataList.add(otaExportVO); - } - // Step.3 AutoPoi 导出Excel ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - mv.addObject(NormalExcelConstants.FILE_NAME, "OTA列表"); //此处设置的filename无效 ,前端会重更新设置一下 - mv.addObject(NormalExcelConstants.CLASS, OtaExportVO.class); - ExportParams exportParams=new ExportParams("OTA软件版本", null, "OTA软件版本"); - mv.addObject(NormalExcelConstants.PARAMS,exportParams); - mv.addObject(NormalExcelConstants.DATA_LIST, dataList); + if(CutEnum.CN.getValue().equals(otaManageApplyEO.getCut())){ + List dataList = new ArrayList<>(); + for (OtaManageApplyEO manageApplyEO : exportList) { + OtaExportCnVO otaExportCnVO = new OtaExportCnVO(); + BeanUtils.copyProperties(manageApplyEO, otaExportCnVO); + dataList.add(otaExportCnVO); + } + mv.addObject(NormalExcelConstants.CLASS, OtaExportCnVO.class); + mv.addObject(NormalExcelConstants.DATA_LIST, dataList); + ExportParams exportParams=new ExportParams("OTA软件版本", null, "OTA软件版本"); + mv.addObject(NormalExcelConstants.PARAMS,exportParams); + }else{ + List dataList = new ArrayList<>(); + for (OtaManageApplyEO manageApplyEO : exportList) { + OtaExportEnVO otaExportEnVO = new OtaExportEnVO(); + BeanUtils.copyProperties(manageApplyEO, otaExportEnVO); + dataList.add(otaExportEnVO); + } + mv.addObject(NormalExcelConstants.CLASS, OtaExportEnVO.class); + mv.addObject(NormalExcelConstants.DATA_LIST, dataList); + ExportParams exportParams=new ExportParams("OTA Software version", null, "OTA Software version"); + mv.addObject(NormalExcelConstants.PARAMS,exportParams); + } return mv; } @@ -1127,20 +1137,31 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl dataList = new ArrayList<>(); - for (OtaManageApplyEO manageApplyEO : exportList) { - AllCarExportVO allCarExportVO = new AllCarExportVO(); - BeanUtils.copyProperties(manageApplyEO, allCarExportVO); - dataList.add(allCarExportVO); - } - // Step.3 AutoPoi 导出Excel ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - mv.addObject(NormalExcelConstants.CLASS, AllCarExportVO.class); + + if(CutEnum.CN.getValue().equals(otaManageApplyEO.getCut())){ + List dataList = new ArrayList<>(); + for (OtaManageApplyEO manageApplyEO : exportList) { + AllCarExportCnVO allCarExportVO = new AllCarExportCnVO(); + BeanUtils.copyProperties(manageApplyEO, allCarExportVO); + dataList.add(allCarExportVO); + } + mv.addObject(NormalExcelConstants.CLASS, AllCarExportCnVO.class); + mv.addObject(NormalExcelConstants.DATA_LIST, dataList); + }else{ + List dataList = new ArrayList<>(); + for (OtaManageApplyEO manageApplyEO : exportList) { + AllCarExportEnVO allCarExportEnVO = new AllCarExportEnVO(); + BeanUtils.copyProperties(manageApplyEO, allCarExportEnVO); + dataList.add(allCarExportEnVO); + } + mv.addObject(NormalExcelConstants.CLASS, AllCarExportEnVO.class); + mv.addObject(NormalExcelConstants.DATA_LIST, dataList); + } + ExportParams exportParams=new ExportParams(otaManageApplyEO.getExportName(), null, otaManageApplyEO.getExportName()); mv.addObject(NormalExcelConstants.PARAMS,exportParams); - mv.addObject(NormalExcelConstants.DATA_LIST, dataList); return mv; } @@ -1159,19 +1180,32 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl dataList = new ArrayList<>(); - for (OtaManageApplyEO manageApplyEO : exportList) { - OneCarExportVO oneCarExportVO = new OneCarExportVO(); - BeanUtils.copyProperties(manageApplyEO, oneCarExportVO); - dataList.add(oneCarExportVO); - } - // Step.3 AutoPoi 导出Excel ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - mv.addObject(NormalExcelConstants.CLASS, OneCarExportVO.class); + + if(CutEnum.CN.getValue().equals(otaManageApplyEO.getCut())){ + List dataList = new ArrayList<>(); + for (OtaManageApplyEO manageApplyEO : exportList) { + OneCarExportCnVO oneCarExportCnVO = new OneCarExportCnVO(); + BeanUtils.copyProperties(manageApplyEO, oneCarExportCnVO); + dataList.add(oneCarExportCnVO); + } + mv.addObject(NormalExcelConstants.CLASS, OneCarExportCnVO.class); + mv.addObject(NormalExcelConstants.DATA_LIST, dataList); + }else{ + List dataList = new ArrayList<>(); + for (OtaManageApplyEO manageApplyEO : exportList) { + OneCarExportEnVO oneCarExportEnVO = new OneCarExportEnVO(); + BeanUtils.copyProperties(manageApplyEO, oneCarExportEnVO); + dataList.add(oneCarExportEnVO); + } + mv.addObject(NormalExcelConstants.CLASS, OneCarExportEnVO.class); + mv.addObject(NormalExcelConstants.DATA_LIST, dataList); + } + ExportParams exportParams=new ExportParams(otaManageApplyEO.getExportName(), null, otaManageApplyEO.getExportName()); mv.addObject(NormalExcelConstants.PARAMS,exportParams); - mv.addObject(NormalExcelConstants.DATA_LIST, dataList); + return mv; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/AllCarExportVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/AllCarExportCnVO.java similarity index 94% rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/AllCarExportVO.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/AllCarExportCnVO.java index 1a8ae68a0..6aafe915a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/AllCarExportVO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/AllCarExportCnVO.java @@ -11,7 +11,7 @@ import org.jeecgframework.poi.excel.annotation.Excel; * @auth zhn */ @Data -public class AllCarExportVO { +public class AllCarExportCnVO { @Excel(name = "VDR", width = 15) @ApiModelProperty(value = "VDR") @@ -29,7 +29,7 @@ public class AllCarExportVO { @ApiModelProperty(value = "认证影响") private java.lang.String homologationImpact; - @Excel(name = "影响描述", width = 15) + @Excel(name = "影响描述", width = 30) @ApiModelProperty(value = "影响描述") private java.lang.String homologation; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/AllCarExportEnVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/AllCarExportEnVO.java new file mode 100644 index 000000000..d0a6c4057 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/AllCarExportEnVO.java @@ -0,0 +1,51 @@ +package com.jero.modules.ota.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; + +/** + * @description + * @date 2023/8/9 11:28 + * @auth zhn + */ +@Data +public class AllCarExportEnVO { + + @Excel(name = "VDR", width = 15) + @ApiModelProperty(value = "VDR") + private String vdr; + + @Excel(name = "theme", width = 15) + @ApiModelProperty(value = "主题") + private String summary; + + @Excel(name = "VDR status", width = 15) + @ApiModelProperty(value = "VDR状态") + private String status; + + @Excel(name = "Authentication impact", width = 15) + @ApiModelProperty(value = "认证影响") + private String homologationImpact; + + @Excel(name = "Impact statement", width = 30) + @ApiModelProperty(value = "影响描述") + private String homologation; + + @Excel(name = "Influence statute-CN", width = 15) + @ApiModelProperty(value = "影响法规-CN") + private String impactCnHomo; + + @Excel(name = "Influence statute-EU", width = 15) + @ApiModelProperty(value = "影响法规-EU") + private String impactEuHomo; + + @Excel(name = "Duty Department", width = 15) + @ApiModelProperty(value = "责任部门") + private String masterDomain; + + @Excel(name = "Vehicle Type", width = 50) + @ApiModelProperty(value = "适用车型") + private String appliedVehicleProject; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/OneCarExportVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/OneCarExportCnVO.java similarity index 97% rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/OneCarExportVO.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/OneCarExportCnVO.java index 7160c9c89..16de02882 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/OneCarExportVO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/OneCarExportCnVO.java @@ -15,7 +15,7 @@ import java.util.Date; * @auth zhn */ @Data -public class OneCarExportVO { +public class OneCarExportCnVO { @Excel(name = "VDR", width = 15) @ApiModelProperty(value = "VDR") @@ -33,7 +33,7 @@ public class OneCarExportVO { @ApiModelProperty(value = "认证影响") private java.lang.String homologationImpact; - @Excel(name = "影响说明", width = 15) + @Excel(name = "影响说明", width = 30) @ApiModelProperty(value = "影响说明") private java.lang.String homologation; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/OneCarExportEnVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/OneCarExportEnVO.java new file mode 100644 index 000000000..ed6af67df --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/OneCarExportEnVO.java @@ -0,0 +1,90 @@ +package com.jero.modules.ota.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * @description + * @date 2023/8/9 11:28 + * @auth zhn + */ +@Data +public class OneCarExportEnVO { + + @Excel(name = "VDR", width = 15) + @ApiModelProperty(value = "VDR") + private String vdr; + + @Excel(name = "theme", width = 15) + @ApiModelProperty(value = "主题") + private String summary; + + @Excel(name = "VDR status", width = 15) + @ApiModelProperty(value = "VDR状态") + private String status; + + @Excel(name = "Authentication impact", width = 15) + @ApiModelProperty(value = "认证影响") + private String homologationImpact; + + @Excel(name = "Impact statement", width = 30) + @ApiModelProperty(value = "影响说明") + private String homologation; + + @Excel(name = "Influence statute-CN", width = 15) + @ApiModelProperty(value = "影响法规-CN") + private String impactCnHomo; + + @Excel(name = "Influence statute-EU", width = 15) + @ApiModelProperty(value = "影响法规-EU") + private String impactEuHomo; + + @Excel(name = "Duty Department", width = 15) + @ApiModelProperty(value = "责任部门") + private String masterDomain; + + @Excel(name = "R&H Studio", width = 15) + @ApiModelProperty(value = "R&H Studio") + private String studioText; + + @Excel(name = "Project Version", width = 15) + @ApiModelProperty(value = "项目版本") + private String projectVersionText; + + @Excel(name = "Homo Starts", width = 15) + @ApiModelProperty(value = "认证开始") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date attestationStartTime; + + @Excel(name = "Certification declaration", width = 15) + @ApiModelProperty(value = "认证申报") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date certificationSubmission; + + @Excel(name = "Homo Approved", width = 15) + @ApiModelProperty(value = "认证批准") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date attestationEndTime; + + @Excel(name = "Homologation Progress", width = 15) + @ApiModelProperty(value = "认证进度") + private String attestationSchedule; + + @Excel(name = "Matching state", width = 15) + @ApiModelProperty(value = "匹配状态") + private String matchStatusText; + + @Excel(name = "remarks", width = 15) + @ApiModelProperty(value = "备注") + private String remark; + + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/OtaExportVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/OtaExportCnVO.java similarity index 96% rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/OtaExportVO.java rename to jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/OtaExportCnVO.java index 66adf94c2..8595e804e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/OtaExportVO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/OtaExportCnVO.java @@ -13,7 +13,7 @@ import java.util.Date; * @auth zhn */ @Data -public class OtaExportVO { +public class OtaExportCnVO { @Excel(name = "软件版本", width = 15) @ApiModelProperty(value = "软件版本") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/OtaExportEnVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/OtaExportEnVO.java new file mode 100644 index 000000000..b1539b2f5 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/OtaExportEnVO.java @@ -0,0 +1,31 @@ +package com.jero.modules.ota.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; + +/** + * @description + * @date 2023/8/9 11:28 + * @auth zhn + */ +@Data +public class OtaExportEnVO { + + @Excel(name = "Software version", width = 15) + @ApiModelProperty(value = "软件版本") + private String plannedBpLaunchBatch; + + @Excel(name = "Market", width = 15) + @ApiModelProperty(value = "市场") + private String market; + + @Excel(name = "Vehicle Type", width = 50) + @ApiModelProperty(value = "适用车型") + private String appliedVehicleProject; + + @Excel(name = "Software release time", width = 15) + @ApiModelProperty(value = "软件发布时间") + private String releaseName; + +}