From 5bd07d6de51cb8b4d3e0c67c2167c2a85956a512 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 21 Aug 2023 18:06:12 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=88=86=E8=BD=A6=E5=9E=8B=E5=92=8C?= =?UTF-8?q?=E5=85=A8=E8=BD=A6=E5=9E=8B=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OtaManageApplyEOController.java | 27 +++++- .../modules/ota/entity/OtaManageApplyEO.java | 8 ++ .../ota/service/IOtaManageApplyEOService.java | 9 +- .../impl/OtaManageApplyEOServiceImpl.java | 73 +++++++++++++-- .../jero/modules/ota/vo/AllCarExportVO.java | 52 +++++++++++ .../jero/modules/ota/vo/OneCarExportVO.java | 91 +++++++++++++++++++ 6 files changed, 247 insertions(+), 13 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/AllCarExportVO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/OneCarExportVO.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java index d208101fd..5e9864cb0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java @@ -72,8 +72,9 @@ public class OtaManageApplyEOController extends JeroController pageList = otaManageApplyEOService.getOtaCarPage(otaManageApplyEO,pageNo,pageSize,cut); - return Result.OK(pageList); + List list = otaManageApplyEOService.getOtaCarPage(otaManageApplyEO, cut); + Page pages = PageUtil.getPages(pageNo, pageSize, list); + return Result.OK(pages); } /** * 下拉数据-软件版本，适用车型，市场 @@ -294,6 +295,28 @@ public class OtaManageApplyEOController extends JeroController { /** * 分车型列表-分页列表查询 * @param otaManageApplyEO - * @param pageNo - * @param pageSize * @return */ - IPage getOtaCarPage(OtaManageApplyEO otaManageApplyEO,Integer pageNo,Integer pageSize,String cut); + List getOtaCarPage(OtaManageApplyEO otaManageApplyEO,String cut); /** * 下拉数据-软件版本，适用车型，市场 * @return @@ -125,4 +122,8 @@ public interface IOtaManageApplyEOService extends IService { List getStatisticalStatus(String projectId, String plannedBpLaunchBatch, String cut); ModelAndView otaExportXls(HttpServletRequest request, OtaManageApplyEO otaManageApplyEO); + + ModelAndView allCarExportXls(HttpServletRequest request, OtaManageApplyEO otaManageApplyEO); + + ModelAndView oneCarExportXls(HttpServletRequest request, OtaManageApplyEO otaManageApplyEO); } 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 b805645f6..760d10633 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 @@ -18,6 +18,8 @@ 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.VersionVO; import com.jero.modules.project.entity.ProjectLibraryBase; @@ -35,6 +37,7 @@ 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; @@ -575,12 +578,10 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl getOtaCarPage(OtaManageApplyEO otaManageApplyEO, Integer pageNo, Integer pageSize,String cut) { + public List getOtaCarPage(OtaManageApplyEO otaManageApplyEO,String cut) { List otaManageApplyEOList = otaManageApplyEOMapper.getOtaCarPage(otaManageApplyEO); List list = new ArrayList<>(); String carMarket = otaManageApplyEO.getAppliedVehicleProject(); @@ -697,8 +698,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl pageList = getOtaPage(otaManageApplyEO); List exportList = null; @@ -1113,7 +1111,68 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl pageList = getOtaPage(otaManageApplyEO); + List exportList = null; + + // 过滤选中数据 + String selections = request.getParameter("selections"); + if (oConvertUtils.isNotEmpty(selections)) { + List selectionList = Arrays.asList(selections.split(",")); + exportList = pageList.stream().filter(e -> selectionList.contains(e.getId())).collect(Collectors.toList()); + } else { + exportList = pageList; + } + + List 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); + ExportParams exportParams=new ExportParams(otaManageApplyEO.getExportName(), null, otaManageApplyEO.getExportName()); + mv.addObject(NormalExcelConstants.PARAMS,exportParams); + mv.addObject(NormalExcelConstants.DATA_LIST, dataList); + return mv; + } + + @Override + public ModelAndView oneCarExportXls(HttpServletRequest request, OtaManageApplyEO otaManageApplyEO) { + // Step.2 获取导出数据 + List pageList = getOtaCarPage(otaManageApplyEO,otaManageApplyEO.getCut()); + List exportList = null; + + // 过滤选中数据 + String selections = request.getParameter("selections"); + if (oConvertUtils.isNotEmpty(selections)) { + List selectionList = Arrays.asList(selections.split(",")); + exportList = pageList.stream().filter(e -> selectionList.contains(e.getId())).collect(Collectors.toList()); + } else { + exportList = pageList; + } + + List 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); + 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/AllCarExportVO.java new file mode 100644 index 000000000..1a8ae68a0 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/AllCarExportVO.java @@ -0,0 +1,52 @@ +package com.jero.modules.ota.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +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 AllCarExportVO { + + @Excel(name = "VDR", width = 15) + @ApiModelProperty(value = "VDR") + private java.lang.String vdr; + + @Excel(name = "主题", width = 15) + @ApiModelProperty(value = "主题") + private java.lang.String summary; + + @Excel(name = "VDR状态", width = 15) + @ApiModelProperty(value = "VDR状态") + private java.lang.String status; + + @Excel(name = "认证影响", width = 15) + @ApiModelProperty(value = "认证影响") + private java.lang.String homologationImpact; + + @Excel(name = "影响描述", width = 15) + @ApiModelProperty(value = "影响描述") + private java.lang.String homologation; + + @Excel(name = "影响法规-CN", width = 15) + @ApiModelProperty(value = "影响法规-CN") + private java.lang.String impactCnHomo; + + @Excel(name = "影响法规-EU", width = 15) + @ApiModelProperty(value = "影响法规-EU") + private java.lang.String impactEuHomo; + + @Excel(name = "责任部门", width = 15) + @ApiModelProperty(value = "责任部门") + private java.lang.String masterDomain; + + @Excel(name = "适用车型", width = 50) + @ApiModelProperty(value = "适用车型") + private java.lang.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/OneCarExportVO.java new file mode 100644 index 000000000..7160c9c89 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/vo/OneCarExportVO.java @@ -0,0 +1,91 @@ +package com.jero.modules.ota.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +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 OneCarExportVO { + + @Excel(name = "VDR", width = 15) + @ApiModelProperty(value = "VDR") + private java.lang.String vdr; + + @Excel(name = "主题", width = 15) + @ApiModelProperty(value = "主题") + private java.lang.String summary; + + @Excel(name = "VDR状态", width = 15) + @ApiModelProperty(value = "VDR状态") + private java.lang.String status; + + @Excel(name = "认证影响", width = 15) + @ApiModelProperty(value = "认证影响") + private java.lang.String homologationImpact; + + @Excel(name = "影响说明", width = 15) + @ApiModelProperty(value = "影响说明") + private java.lang.String homologation; + + @Excel(name = "影响法规-CN", width = 15) + @ApiModelProperty(value = "影响法规-CN") + private java.lang.String impactCnHomo; + + @Excel(name = "影响法规-EU", width = 15) + @ApiModelProperty(value = "影响法规-EU") + private java.lang.String impactEuHomo; + + @Excel(name = "责任部门", width = 15) + @ApiModelProperty(value = "责任部门") + private java.lang.String masterDomain; + + @Excel(name = "R&H Studio", width = 15) + @ApiModelProperty(value = "R&H Studio") + private java.lang.String studioText; + + @Excel(name = "项目版本", width = 15) + @ApiModelProperty(value = "项目版本") + private java.lang.String projectVersionText; + + @Excel(name = "认证开始", width = 15) + @ApiModelProperty(value = "认证开始") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date attestationStartTime; + + @Excel(name = "认证申报", width = 15) + @ApiModelProperty(value = "认证申报") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date certificationSubmission; + + @Excel(name = "认证批准", width = 15) + @ApiModelProperty(value = "认证批准") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date attestationEndTime; + + @Excel(name = "认证进度", width = 15) + @ApiModelProperty(value = "认证进度") + private java.lang.String attestationSchedule; + + @Excel(name = "匹配状态", width = 15) + @ApiModelProperty(value = "匹配状态") + private java.lang.String matchStatusText; + + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private java.lang.String remark; + + +} 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 2/5] =?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; + +} From 5cb8aa8a750be09d30262cb78a05aa762e63e560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Mon, 21 Aug 2023 19:03:15 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OtaManageApplyEOController.java | 3 +- .../modules/ota/entity/OtaManageReceive.java | 7 +++ .../ota/mapper/OtaManageApplyEOMapper.java | 3 - .../ota/mapper/OtaManageReceiveMapper.java | 1 + .../ota/mapper/xml/OtaManageApplyEOMapper.xml | 8 +-- .../ota/mapper/xml/OtaManageReceiveMapper.xml | 8 +++ .../ota/service/IOtaManageApplyEOService.java | 3 +- .../ota/service/IOtaManageReceiveService.java | 3 + .../impl/OtaManageApplyEOServiceImpl.java | 59 ++++++------------- .../impl/OtaManageReceiveServiceImpl.java | 5 ++ 10 files changed, 46 insertions(+), 54 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java index 5e9864cb0..2e90891c9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java @@ -9,6 +9,7 @@ import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.common.util.PageUtil; import com.jero.modules.ota.entity.OtaManageApplyEO; +import com.jero.modules.ota.entity.OtaManageReceive; import com.jero.modules.ota.service.IOtaManageApplyEOService; import com.jero.modules.ota.vo.VersionVO; import io.swagger.annotations.Api; @@ -271,7 +272,7 @@ public class OtaManageApplyEOController extends JeroController getVdrListByProject(String projectId, String cut) { - List resList = otaManageApplyEOService.getVdrListByProject(projectId, cut); + List resList = otaManageApplyEOService.getVdrListByProject(projectId, cut); return Result.OK("操作成功！", resList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageReceive.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageReceive.java index f3226595a..87712f25e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageReceive.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/entity/OtaManageReceive.java @@ -111,4 +111,11 @@ public class OtaManageReceive implements Serializable { @ApiModelProperty(value = "适用车型") private String appliedVehicleProject; + /**发布时间*/ + @Excel(name = "发布时间", width = 15) + @ApiModelProperty(value = "发布时间") + private String releaseDate; + + + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java index 82086c564..0fa2821d2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java @@ -29,9 +29,6 @@ public interface OtaManageApplyEOMapper extends BaseMapper { */ List getOtaCarPage(@Param("otaManageApplyEO") OtaManageApplyEO otaManageApplyEO); - List getReceiveByVdr(@Param("vdrList") List vdrList); - - List getByAppliedVehicleProject(@Param("appliedVehicleProject") String appliedVehicleProject); List getOtaCarList(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageReceiveMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageReceiveMapper.java index d3ef85bfd..0e0cc0753 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageReceiveMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageReceiveMapper.java @@ -13,5 +13,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @Version: V1.0 */ public interface OtaManageReceiveMapper extends BaseMapper { + List getReceiveByVdr(@Param("vdrList") List vdrList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml index afccc9060..073f00ed5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml @@ -43,13 +43,7 @@ order by create_time desc - + + select * from ota_manage_receive + where id in + + #{item} + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java index 796a894fb..b4293d068 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java @@ -2,6 +2,7 @@ package com.jero.modules.ota.service; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.ota.entity.OtaManageApplyEO; +import com.jero.modules.ota.entity.OtaManageReceive; import com.jero.modules.ota.vo.VersionVO; import org.springframework.web.servlet.ModelAndView; @@ -117,7 +118,7 @@ public interface IOtaManageApplyEOService extends IService { List reject(String ids, String rejectReason,String cut); - List getVdrListByProject(String projectId, String cut); + List getVdrListByProject(String projectId, String cut); List getStatisticalStatus(String projectId, String plannedBpLaunchBatch, String cut); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageReceiveService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageReceiveService.java index 414355008..9fb151488 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageReceiveService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageReceiveService.java @@ -1,5 +1,6 @@ package com.jero.modules.ota.service; +import com.jero.modules.ota.entity.OtaManageApplyEO; import com.jero.modules.ota.entity.OtaManageReceive; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -58,4 +59,6 @@ public interface IOtaManageReceiveService extends IService { * @return */ List queryList(); + + List getReceiveByVdr(List vdrList); } 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..78fddfe82 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 @@ -9,8 +9,10 @@ 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.cert.template.entity.CertCategoryParamsInfoEO; import com.jero.modules.dummy.enums.OrderEnum; import com.jero.modules.ota.entity.OtaManageApplyEO; +import com.jero.modules.ota.entity.OtaManageReceive; import com.jero.modules.ota.entity.OtaManageReceiveNsdpEO; import com.jero.modules.ota.enums.OtaCarEnum; import com.jero.modules.ota.enums.OtaHomoImpactEnum; @@ -18,6 +20,7 @@ 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.service.IOtaManageReceiveService; import com.jero.modules.ota.vo.AllCarExportVO; import com.jero.modules.ota.vo.OneCarExportVO; import com.jero.modules.ota.vo.OtaExportVO; @@ -52,19 +55,7 @@ import javax.servlet.http.HttpServletRequest; import java.text.Collator; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Set; -import java.util.UUID; +import java.util.*; import java.util.stream.Collectors; /** @@ -92,6 +83,9 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl getVdrListByProject(String projectId, String cut) { - List res = new ArrayList<>(); + public List getVdrListByProject(String projectId, String cut) { + List resList = new ArrayList<>(); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(OtaManageApplyEO::getProjectVersion, projectId); List otaManageApplyEOS = this.list(queryWrapper); + //查找已维护项目的数据，根据VDR去重 List vdrList = otaManageApplyEOS.stream() .filter(e -> StringUtils.isNotBlank(e.getVdr())) .map(OtaManageApplyEO::getVdr).distinct().collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(vdrList)) { - res = otaManageApplyEOMapper.getReceiveByVdr(vdrList); - List plannedBpLaunchBatchList = res.stream() - .filter(e -> StringUtils.isNotBlank(e.getPlannedBpLaunchBatch())) - .map(OtaManageApplyEO::getPlannedBpLaunchBatch).distinct().collect(Collectors.toList()); - List manageReceiveNsdpEOList = otaManageApplyEOMapper.getReleaseDate(plannedBpLaunchBatchList); - for (OtaManageApplyEO manageApplyEO : res) { - manageApplyEO.setVdr(manageApplyEO.getId()); - List collect = manageReceiveNsdpEOList.stream() - .filter(e -> StringUtils.isNotBlank(e.getReleaseName()) - && e.getReleaseName().equals(manageApplyEO.getPlannedBpLaunchBatch())).collect(Collectors.toList()); - if (!collect.isEmpty()) { - List releaseDateList = collect.stream().map(OtaManageReceiveNsdpEO::getReleaseDate).distinct().collect(Collectors.toList()); - List list = new ArrayList<>(); - for (String s : releaseDateList) { - list.add(Integer.parseInt(s.replaceAll("-", ""))); - } - Integer max = Collections.max(list); - try { - //发布时间 - manageApplyEO.setReleaseName(sdf.format(dateFormat.parse(max.toString()))); - manageApplyEO.setReleaseNameDate(dateFormat.parse(max.toString())); - } catch (ParseException e) { - log.error(e.getMessage(), e); - } - } + resList = otaManageReceiveService.getReceiveByVdr(vdrList).stream() + .collect(Collectors.collectingAndThen(Collectors + .toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getPlannedBpLaunchBatch()))), ArrayList::new)); + for (OtaManageReceive rec : resList) { + rec.setAppliedVehicleProject("全部"); } } - - return res; + return resList; } @Override diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageReceiveServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageReceiveServiceImpl.java index b26af5976..3460e8ef2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageReceiveServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageReceiveServiceImpl.java @@ -86,4 +86,9 @@ public class OtaManageReceiveServiceImpl extends ServiceImpl queryList() { return list(); } + + @Override + public List getReceiveByVdr(List vdrList) { + return this.getBaseMapper().getReceiveByVdr(vdrList); + } } From 30e1d465526ab5a12f9674fc45eabe30db472ee1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Mon, 21 Aug 2023 19:06:45 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/ota/service/impl/OtaManageApplyEOServiceImpl.java | 3 --- 1 file changed, 3 deletions(-) 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 8c0030614..828e9045b 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 @@ -24,9 +24,6 @@ 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.service.IOtaManageReceiveService; -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.VersionVO; import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectTaskPlanning; From 7abdd1526ef8fb9378f8b0134511a1dcfa40d6d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Mon, 21 Aug 2023 20:44:30 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OtaManageApplyEOController.java | 7 +- .../ota/mapper/OtaManageApplyEOMapper.java | 1 + .../ota/mapper/xml/OtaManageApplyEOMapper.xml | 12 ++ .../ota/service/IOtaManageApplyEOService.java | 4 +- .../impl/OtaManageApplyEOServiceImpl.java | 137 ++++++++++++------ 5 files changed, 114 insertions(+), 47 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java index 2e90891c9..a3a05f161 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java @@ -272,7 +272,7 @@ public class OtaManageApplyEOController extends JeroController getVdrListByProject(String projectId, String cut) { - List resList = otaManageApplyEOService.getVdrListByProject(projectId, cut); + List resList = otaManageApplyEOService.getVdrListByProject(projectId, cut); return Result.OK("操作成功！", resList); } @@ -280,11 +280,10 @@ public class OtaManageApplyEOController extends JeroController getStatisticalStatus(String projectId, String plannedBpLaunchBatch, String cut) { - List resList = otaManageApplyEOService.getStatisticalStatus(projectId, plannedBpLaunchBatch, cut); - return Result.OK("操作成功！", resList); + Map res = otaManageApplyEOService.getStatisticalStatus(projectId, plannedBpLaunchBatch, cut); + return Result.OK("操作成功！", res); } - /** * OTA管理导出excel * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java index 0fa2821d2..e4cdc8894 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/OtaManageApplyEOMapper.java @@ -39,4 +39,5 @@ public interface OtaManageApplyEOMapper extends BaseMapper { List getVersionInfo(@Param("vdr") String vdr); + List getListByProjectId(@Param("projectId") String projectId,@Param("plannedBpLaunchBatch") String plannedBpLaunchBatch); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml index 073f00ed5..a4ed5c8e8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml @@ -15,6 +15,18 @@ + +