diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java index c337efadd..52b8714bc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java @@ -362,9 +362,33 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl whList = otaBaSjGnxtwhService.list(); + if (ObjectUtils.isNotEmpty(whList)) { + Sheet s1 = wb.getSheetAt(1); + CellStyle style = wb.createCellStyle(); + style.setBorderTop(BorderStyle.THIN); + style.setBorderBottom(BorderStyle.THIN); + style.setBorderLeft(BorderStyle.THIN); + style.setBorderRight(BorderStyle.THIN); + Row row1; + Cell cell1; + int start1 = 1; + for (OtaBaSjGnxtwh wh : whList) { + row1 = s1.createRow(start1); + cell1 = row1.createCell(0); + cell1.setCellStyle(style); + cell1.setCellValue(wh.getGnxt()); + cell1 = row1.createCell(1); + cell1.setCellStyle(style); + cell1.setCellValue(wh.getDykzq()); + start1++; + } + } + //本次升级的系统名称与参数变化 List bhList = this.getByOtaId(otaId); if (ObjectUtils.isNotEmpty(bhList)) { - Workbook wb = ImportFileUtil.readExcel(file); Sheet s = wb.getSheetAt(0); CellStyle style = wb.createCellStyle(); style.setBorderTop(BorderStyle.THIN); @@ -414,8 +438,9 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl{