diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java index 9e4bafd..7f2335c 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java @@ -2340,59 +2340,19 @@ public class PatrolTaskResultMainController extends BaseController { SXSSFWorkbook wb = new SXSSFWorkbook(1000); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); SXSSFSheet sheet = wb.createSheet(System.currentTimeMillis() + ""); - CellStyle colStyle = createCellStyle((SXSSFWorkbook) wb, (short) 15, true, true); - CellStyle colStyle2 = createCellStylenoborder((SXSSFWorkbook) wb, (short) 15, true, true); - CellStyle colright = getColRight((SXSSFWorkbook) wb, (short) 10, true, false); + CellStyle colStyle = createCellStyle(wb, (short) 15, true, true); + CellStyle colStyle2 = createCellStylenoborder(wb, (short) 15, true, true); + CellStyle colright = getColRight(wb, (short) 10, true, false); + CellRangeAddress callRangeAddress01 = new CellRangeAddress(0, 0, 0, 17); - CellRangeAddress callRangeAddress02 = new CellRangeAddress(1, 1, 0, 4); - CellRangeAddress callRangeAddress03 = new CellRangeAddress(1, 1, 5, 9); - CellRangeAddress callRangeAddress04 = new CellRangeAddress(1, 1, 10, 14); - CellRangeAddress callRangeAddress05 = new CellRangeAddress(1, 1, 15, 17); - CellRangeAddress callRangeAddress21 = new CellRangeAddress(2, 2, 0, 4); - CellRangeAddress callRangeAddress22 = new CellRangeAddress(2, 2, 5, 9); - CellRangeAddress callRangeAddress23 = new CellRangeAddress(2, 2, 10, 14); - CellRangeAddress callRangeAddress24 = new CellRangeAddress(2, 2, 15, 17); - CellRangeAddress callRangeAddress31 = new CellRangeAddress(3, 3, 0, 4); - CellRangeAddress callRangeAddress32 = new CellRangeAddress(3, 3, 5, 9); - CellRangeAddress callRangeAddress33 = new CellRangeAddress(3, 3, 10, 14); - CellRangeAddress callRangeAddress34 = new CellRangeAddress(3, 3, 15, 17); - CellRangeAddress callRangeAddress41 = new CellRangeAddress(4, 4, 0, 4); - CellRangeAddress callRangeAddress42 = new CellRangeAddress(4, 4, 5, 9); - CellRangeAddress callRangeAddress43 = new CellRangeAddress(4, 4, 10, 14); - CellRangeAddress callRangeAddress44 = new CellRangeAddress(4, 4, 15, 17); - CellRangeAddress callRangeAddress51 = new CellRangeAddress(5, 5, 0, 4); - CellRangeAddress callRangeAddress52 = new CellRangeAddress(5, 5, 5, 9); - CellRangeAddress callRangeAddress53 = new CellRangeAddress(5, 5, 10, 14); - CellRangeAddress callRangeAddress54 = new CellRangeAddress(5, 5, 15, 17); - CellRangeAddress callRangeAddress61 = new CellRangeAddress(6, 7, 0, 4); - CellRangeAddress callRangeAddress62 = new CellRangeAddress(6, 7, 5, 17); - CellRangeAddress callRangeAddress71 = new CellRangeAddress(8, 8, 0, 4); - CellRangeAddress callRangeAddress72 = new CellRangeAddress(8, 8, 5, 17); sheet.addMergedRegion(callRangeAddress01); - sheet.addMergedRegion(callRangeAddress02); - sheet.addMergedRegion(callRangeAddress03); - sheet.addMergedRegion(callRangeAddress04); - sheet.addMergedRegion(callRangeAddress05); - sheet.addMergedRegion(callRangeAddress21); - sheet.addMergedRegion(callRangeAddress22); - sheet.addMergedRegion(callRangeAddress23); - sheet.addMergedRegion(callRangeAddress24); - sheet.addMergedRegion(callRangeAddress31); - sheet.addMergedRegion(callRangeAddress32); - sheet.addMergedRegion(callRangeAddress33); - sheet.addMergedRegion(callRangeAddress34); - sheet.addMergedRegion(callRangeAddress41); - sheet.addMergedRegion(callRangeAddress42); - sheet.addMergedRegion(callRangeAddress43); - sheet.addMergedRegion(callRangeAddress44); - sheet.addMergedRegion(callRangeAddress51); - sheet.addMergedRegion(callRangeAddress52); - sheet.addMergedRegion(callRangeAddress53); - sheet.addMergedRegion(callRangeAddress54); - sheet.addMergedRegion(callRangeAddress61); - sheet.addMergedRegion(callRangeAddress62); - sheet.addMergedRegion(callRangeAddress71); - sheet.addMergedRegion(callRangeAddress72); + for (int i = 1; i < 6; ++i) { + CellRangeAddress callRangeAddress02 = new CellRangeAddress(i, i, 0, 2); + CellRangeAddress callRangeAddress03 = new CellRangeAddress(i, i, 3, 17); + sheet.addMergedRegion(callRangeAddress02); + sheet.addMergedRegion(callRangeAddress03); + } + Row row0 = sheet.createRow(0); row0.setHeight((short) 600); Cell cell0 = row0.createCell(0); @@ -2406,166 +2366,248 @@ public class PatrolTaskResultMainController extends BaseController { font.setBold(true); stylea.setFont(font); cell0.setCellStyle(stylea); + Row row1 = sheet.createRow(1); + row1.setHeight((short) 1000); Cell cell11 = row1.createCell(0); - cell11.setCellValue(MessageUtils.get("变电站")); + cell11.setCellValue(MessageUtils.get("任务名称")); cell11.setCellStyle(colStyle2); - Cell cell12 = row1.createCell(5); - cell12.setCellValue(inspectionReport.getStationName()); + Cell cell12 = row1.createCell(3); + cell12.setCellValue(inspectionReport.getInspectionTaskName()); cell12.setCellStyle(colStyle2); - Cell cell13 = row1.createCell(10); - cell13.setCellValue(MessageUtils.get("电压等级")); - cell13.setCellStyle(colStyle2); - Cell cell14 = row1.createCell(15); - cell14.setCellValue(inspectionReport.getVoltLevel()); - cell14.setCellStyle(colStyle2); for (int i = 0; i < 18; ++i) { - if (i != 0 && i != 5 && i != 10 && i != 15) { - cell14 = row1.createCell(i); - cell14.setCellStyle(colStyle2); + if (i != 0 && i != 3) { + cell12 = row1.createCell(i); + cell12.setCellStyle(colStyle2); } } Row row2 = sheet.createRow(2); - Cell cell21 = row2.createCell(0); - cell21.setCellValue(MessageUtils.get("巡视计划创建日期")); - cell21.setCellStyle(colStyle2); - Cell cell22 = row2.createCell(5); - if (inspectionReport.getInspectionDate() != null) { - cell22.setCellValue(sdf.format(inspectionReport.getInspectionDate())); - } - - cell22.setCellStyle(colStyle2); - Cell cell23 = row2.createCell(10); - cell23.setCellValue(MessageUtils.get("变电站类别")); - cell23.setCellStyle(colStyle2); - Cell cell24 = row2.createCell(15); - cell24.setCellValue(inspectionReport.getStationType()); - cell24.setCellStyle(colStyle2); + row2.setHeight((short) 1000); + Cell cell61 = row2.createCell(0); + cell61.setCellValue(MessageUtils.get("任务时间")); + cell61.setCellStyle(colStyle2); + Cell cell62 = row2.createCell(3); + cell62.setCellValue("任务开始时间：" + formatDateTime(inspectionReport.getInspectionStartTime()) + "，任务结束时间：" + formatDateTime(inspectionReport.getInspectionEndTime())); + cell62.setCellStyle(colStyle2); for (int i = 0; i < 18; ++i) { - if (i != 0 && i != 5 && i != 10 && i != 15) { - cell14 = row2.createCell(i); - cell14.setCellStyle(colStyle2); + if (i != 0 && i != 3) { + cell12 = row2.createCell(i); + cell12.setCellStyle(colStyle2); } } Row row3 = sheet.createRow(3); + row3.setHeight((short) 1000); Cell cell31 = row3.createCell(0); - cell31.setCellValue(MessageUtils.get("巡视任务")); + cell31.setCellValue(MessageUtils.get("任务状态")); cell31.setCellStyle(colStyle2); - Cell cell32 = row3.createCell(5); - cell32.setCellValue(inspectionReport.getInspectionTaskName()); + Cell cell32 = row3.createCell(3); + cell32.setCellValue("已完成"); cell32.setCellStyle(colStyle2); - Cell cell33 = row3.createCell(10); - cell33.setCellValue(MessageUtils.get("环境信息")); - cell33.setCellStyle(colStyle2); - Cell cell34 = row3.createCell(15); - cell34.setCellValue(inspectionReport.getEnvInfo()); - cell34.setCellStyle(colStyle2); for (int i = 0; i < 18; ++i) { - if (i != 0 && i != 5 && i != 10 && i != 15) { - cell14 = row3.createCell(i); - cell14.setCellStyle(colStyle2); + if (i != 0 && i != 3) { + cell12 = row3.createCell(i); + cell12.setCellStyle(colStyle2); } } Row row4 = sheet.createRow(4); + row4.setHeight((short) 1000); Cell cell41 = row4.createCell(0); - cell41.setCellValue(MessageUtils.get("审核人")); + cell41.setCellValue(MessageUtils.get("巡检点")); cell41.setCellStyle(colStyle2); - Cell cell42 = row4.createCell(5); - cell42.setCellValue(inspectionReport.getCheckPerson()); + Cell cell42 = row4.createCell(3); + cell42.setCellValue(inspectionReport.getPatrolStatistics()); cell42.setCellStyle(colStyle2); - Cell cell43 = row4.createCell(10); - cell43.setCellValue(MessageUtils.get("审核时间")); - cell43.setCellStyle(colStyle2); - Cell cell44 = row4.createCell(15); - cell44.setCellValue(DateUtil.formatDateTime(inspectionReport.getCheckTime())); - cell44.setCellStyle(colStyle2); for (int i = 0; i < 18; ++i) { - if (i != 0 && i != 5 && i != 10 && i != 15) { - cell14 = row4.createCell(i); - cell14.setCellStyle(colStyle2); + if (i != 0 && i != 3) { + cell12 = row4.createCell(i); + cell12.setCellStyle(colStyle2); } } Row row5 = sheet.createRow(5); + row5.setHeight((short) 1000); Cell cell51 = row5.createCell(0); - cell51.setCellValue(MessageUtils.get("巡视开始时间")); + cell51.setCellValue(MessageUtils.get("环境信息")); cell51.setCellStyle(colStyle2); - Cell cell52 = row5.createCell(5); - if (inspectionReport.getInspectionStartTime() != null) { - cell52.setCellValue(DateUtil.formatDateTime(inspectionReport.getInspectionStartTime())); - } - + Cell cell52 = row5.createCell(3); + cell52.setCellValue(inspectionReport.getEnvInfo()); cell52.setCellStyle(colStyle2); - Cell cell53 = row5.createCell(10); - cell53.setCellValue(MessageUtils.get("巡视结束时间")); - cell53.setCellStyle(colStyle2); - Cell cell54 = row5.createCell(15); - if (inspectionReport.getInspectionEndTime() != null) { - cell54.setCellValue(DateUtil.formatDateTime(inspectionReport.getInspectionEndTime())); - } - - cell54.setCellStyle(colStyle2); for (int i = 0; i < 18; ++i) { - if (i != 0 && i != 5 && i != 10 && i != 15) { - cell14 = row5.createCell(i); - cell14.setCellStyle(colStyle2); + if (i != 0 && i != 3) { + cell12 = row5.createCell(i); + cell12.setCellStyle(colStyle2); } } - Row row6 = sheet.createRow(6); - row6.setHeight((short) 1000); - Cell cell61 = row6.createCell(0); - cell61.setCellValue(MessageUtils.get("巡视统计")); - cell61.setCellStyle(colStyle2); - Cell cell62 = row6.createCell(5); - cell62.setCellValue(inspectionReport.getPatrolStatistics()); - cell62.setCellStyle(colStyle2); - - int i; - for (i = 0; i < 18; ++i) { - if (i != 0 && i != 5) { - cell14 = row6.createCell(i); - cell14.setCellStyle(colStyle2); - } - } - - row6 = sheet.createRow(7); - for (i = 0; i < 18; ++i) { - cell14 = row6.createCell(i); - cell14.setCellStyle(colStyle2); - } - - Row row7 = sheet.createRow(8); - row7.setHeight((short) 1000); - Cell cell71 = row7.createCell(0); - cell71.setCellValue(MessageUtils.get("巡视结论")); - cell71.setCellStyle(colStyle2); - Cell cell72 = row7.createCell(5); - cell72.setCellValue(inspectionReport.getDescription()); - cell72.setCellStyle(colStyle2); - - //qinyl - for (int j = 0; j < 18; ++j) { - if (j != 0 && j != 5) { - cell14 = row7.createCell(j); - cell14.setCellStyle(colStyle2); - } - } +// Row row1 = sheet.createRow(1); +// Cell cell11 = row1.createCell(0); +// cell11.setCellValue(MessageUtils.get("变电站")); +// cell11.setCellStyle(colStyle2); +// Cell cell12 = row1.createCell(5); +// cell12.setCellValue(inspectionReport.getStationName()); +// cell12.setCellStyle(colStyle2); +// Cell cell13 = row1.createCell(10); +// cell13.setCellValue(MessageUtils.get("电压等级")); +// cell13.setCellStyle(colStyle2); +// Cell cell14 = row1.createCell(15); +// cell14.setCellValue(inspectionReport.getVoltLevel()); +// cell14.setCellStyle(colStyle2); +// +// for (int i = 0; i < 18; ++i) { +// if (i != 0 && i != 5 && i != 10 && i != 15) { +// cell14 = row1.createCell(i); +// cell14.setCellStyle(colStyle2); +// } +// } +// +// Row row2 = sheet.createRow(2); +// Cell cell21 = row2.createCell(0); +// cell21.setCellValue(MessageUtils.get("巡视计划创建日期")); +// cell21.setCellStyle(colStyle2); +// Cell cell22 = row2.createCell(5); +// if (inspectionReport.getInspectionDate() != null) { +// cell22.setCellValue(sdf.format(inspectionReport.getInspectionDate())); +// } +// +// cell22.setCellStyle(colStyle2); +// Cell cell23 = row2.createCell(10); +// cell23.setCellValue(MessageUtils.get("变电站类别")); +// cell23.setCellStyle(colStyle2); +// Cell cell24 = row2.createCell(15); +// cell24.setCellValue(inspectionReport.getStationType()); +// cell24.setCellStyle(colStyle2); +// +// for (int i = 0; i < 18; ++i) { +// if (i != 0 && i != 5 && i != 10 && i != 15) { +// cell14 = row2.createCell(i); +// cell14.setCellStyle(colStyle2); +// } +// } +// +// Row row3 = sheet.createRow(3); +// Cell cell31 = row3.createCell(0); +// cell31.setCellValue(MessageUtils.get("巡视任务")); +// cell31.setCellStyle(colStyle2); +// Cell cell32 = row3.createCell(5); +// cell32.setCellValue(inspectionReport.getInspectionTaskName()); +// cell32.setCellStyle(colStyle2); +// Cell cell33 = row3.createCell(10); +// cell33.setCellValue(MessageUtils.get("环境信息")); +// cell33.setCellStyle(colStyle2); +// Cell cell34 = row3.createCell(15); +// cell34.setCellValue(inspectionReport.getEnvInfo()); +// cell34.setCellStyle(colStyle2); +// +// for (int i = 0; i < 18; ++i) { +// if (i != 0 && i != 5 && i != 10 && i != 15) { +// cell14 = row3.createCell(i); +// cell14.setCellStyle(colStyle2); +// } +// } +// +// Row row4 = sheet.createRow(4); +// Cell cell41 = row4.createCell(0); +// cell41.setCellValue(MessageUtils.get("审核人")); +// cell41.setCellStyle(colStyle2); +// Cell cell42 = row4.createCell(5); +// cell42.setCellValue(inspectionReport.getCheckPerson()); +// cell42.setCellStyle(colStyle2); +// Cell cell43 = row4.createCell(10); +// cell43.setCellValue(MessageUtils.get("审核时间")); +// cell43.setCellStyle(colStyle2); +// Cell cell44 = row4.createCell(15); +// cell44.setCellValue(DateUtil.formatDateTime(inspectionReport.getCheckTime())); +// cell44.setCellStyle(colStyle2); +// +// for (int i = 0; i < 18; ++i) { +// if (i != 0 && i != 5 && i != 10 && i != 15) { +// cell14 = row4.createCell(i); +// cell14.setCellStyle(colStyle2); +// } +// } +// +// Row row5 = sheet.createRow(5); +// Cell cell51 = row5.createCell(0); +// cell51.setCellValue(MessageUtils.get("巡视开始时间")); +// cell51.setCellStyle(colStyle2); +// Cell cell52 = row5.createCell(5); +// if (inspectionReport.getInspectionStartTime() != null) { +// cell52.setCellValue(DateUtil.formatDateTime(inspectionReport.getInspectionStartTime())); +// } +// +// cell52.setCellStyle(colStyle2); +// Cell cell53 = row5.createCell(10); +// cell53.setCellValue(MessageUtils.get("巡视结束时间")); +// cell53.setCellStyle(colStyle2); +// Cell cell54 = row5.createCell(15); +// if (inspectionReport.getInspectionEndTime() != null) { +// cell54.setCellValue(DateUtil.formatDateTime(inspectionReport.getInspectionEndTime())); +// } +// +// cell54.setCellStyle(colStyle2); +// +// for (int i = 0; i < 18; ++i) { +// if (i != 0 && i != 5 && i != 10 && i != 15) { +// cell14 = row5.createCell(i); +// cell14.setCellStyle(colStyle2); +// } +// } +// +// Row row6 = sheet.createRow(6); +// row6.setHeight((short) 1000); +// Cell cell61 = row6.createCell(0); +// cell61.setCellValue(MessageUtils.get("巡视统计")); +// cell61.setCellStyle(colStyle2); +// Cell cell62 = row6.createCell(5); +// cell62.setCellValue(inspectionReport.getPatrolStatistics()); +// cell62.setCellStyle(colStyle2); +// +// int i; +// for (i = 0; i < 18; ++i) { +// if (i != 0 && i != 5) { +// cell14 = row6.createCell(i); +// cell14.setCellStyle(colStyle2); +// } +// } +// +// row6 = sheet.createRow(7); +// +// for (i = 0; i < 18; ++i) { +// cell14 = row6.createCell(i); +// cell14.setCellStyle(colStyle2); +// } +// +// Row row7 = sheet.createRow(8); +// row7.setHeight((short) 1000); +// Cell cell71 = row7.createCell(0); +// cell71.setCellValue(MessageUtils.get("巡视结论")); +// cell71.setCellStyle(colStyle2); +// Cell cell72 = row7.createCell(5); +// cell72.setCellValue(inspectionReport.getDescription()); +// cell72.setCellStyle(colStyle2); +// +// //qinyl +// for (int j = 0; j < 18; ++j) { +// if (j != 0 && j != 5) { +// cell14 = row7.createCell(j); +// cell14.setCellStyle(colStyle2); +// } +// } - InspectionReportData inspectionReportData = new InspectionReportData(); + InspectionReportData inspection = new InspectionReportData(); List list = new ArrayList(); - inspectionReportData.setPointStatus(MessageUtils.get("异常")); - list.add(inspectionReportData); -// InspectionReportData inspection = new InspectionReportData(); + inspection.setPointStatus(MessageUtils.get("异常")); + list.add(inspection); + InspectionReportData inspectionReportData = new InspectionReportData(); // inspection.setPointStatus(MessageUtils.get("待人工确认")); // list.add(inspection); InspectionReportData inection = new InspectionReportData(); @@ -2579,9 +2621,9 @@ public class PatrolTaskResultMainController extends BaseController { for (Iterator var74 = list.iterator(); var74.hasNext(); total += 2) { InspectionReportData arr = (InspectionReportData) var74.next(); SXSSFDrawing patriarch = sheet.createDrawingPatriarch(); - CellRangeAddress callRangeAddressa1 = new CellRangeAddress(9 + total, 9 + total, 0, 17); + CellRangeAddress callRangeAddressa1 = new CellRangeAddress(6 + total, 6 + total, 0, 17); sheet.addMergedRegion(callRangeAddressa1); - Row rowa1 = sheet.createRow(9 + total); + Row rowa1 = sheet.createRow(6 + total); Cell cella1 = rowa1.createCell(0); cella1.setCellValue(arr.getPointStatus() + MessageUtils.get("点位汇总")); CellStyle styleab = wb.createCellStyle(); @@ -2595,18 +2637,18 @@ public class PatrolTaskResultMainController extends BaseController { //qinyl for (int j = 0; j < 18; ++j) { if (j != 0) { - cell14 = rowa1.createCell(j); - cell14.setCellStyle(colStyle2); + cell12 = rowa1.createCell(j); + cell12.setCellStyle(colStyle2); } } - CellRangeAddress callRangeAddressa12 = new CellRangeAddress(10 + total, 10 + total, 15, 17); + CellRangeAddress callRangeAddressa12 = new CellRangeAddress(7 + total, 7 + total, 15, 17); sheet.addMergedRegion(callRangeAddressa12); - rowa1 = sheet.createRow(10 + total); - sheet.addMergedRegion(new CellRangeAddress(10 + total, 10 + total, 2, 4)); - sheet.addMergedRegion(new CellRangeAddress(10 + total, 10 + total, 5, 7)); - sheet.addMergedRegion(new CellRangeAddress(10 + total, 10 + total, 8, 9)); - sheet.addMergedRegion(new CellRangeAddress(10 + total, 10 + total, 12, 13)); + rowa1 = sheet.createRow(7 + total); + sheet.addMergedRegion(new CellRangeAddress(7 + total, 7 + total, 2, 4)); + sheet.addMergedRegion(new CellRangeAddress(7 + total, 7 + total, 5, 7)); + sheet.addMergedRegion(new CellRangeAddress(7 + total, 7 + total, 8, 9)); + sheet.addMergedRegion(new CellRangeAddress(7 + total, 7 + total, 12, 13)); cella1 = rowa1.createCell(0); cella1.setCellValue(MessageUtils.get("编号")); cella1.setCellStyle(colStyle2); @@ -2689,9 +2731,9 @@ public class PatrolTaskResultMainController extends BaseController { imgList = brr.getReportImgList(); } - CellRangeAddress callRangeAddressa4 = new CellRangeAddress(10 + total, 10 + total, 15, 17); + CellRangeAddress callRangeAddressa4 = new CellRangeAddress(7 + total, 7 + total, 15, 17); sheet.addMergedRegion(callRangeAddressa4); - Row rowb1 = sheet.createRow(10 + total); + Row rowb1 = sheet.createRow(7 + total); if (((List) imgList).size() > 0) { rowb1.setHeight((short) 1000); } @@ -2756,24 +2798,24 @@ public class PatrolTaskResultMainController extends BaseController { cella1 = rowb1.createCell(17); cella1.setCellStyle(colStyle); if (((List) imgList).size() > 0) { - sheet.addMergedRegion(new CellRangeAddress(10 + total, 10 + total + ((List) imgList).size(), 0, 0)); - sheet.addMergedRegion(new CellRangeAddress(10 + total, 10 + total + ((List) imgList).size(), 1, 1)); - sheet.addMergedRegion(new CellRangeAddress(10 + total, 10 + total + ((List) imgList).size(), 2, 4)); - sheet.addMergedRegion(new CellRangeAddress(10 + total, 10 + total + ((List) imgList).size(), 5, 7)); - sheet.addMergedRegion(new CellRangeAddress(10 + total, 10 + total + ((List) imgList).size(), 8, 9)); - sheet.addMergedRegion(new CellRangeAddress(10 + total, 10 + total + ((List) imgList).size(), 10, 10)); - sheet.addMergedRegion(new CellRangeAddress(10 + total, 10 + total + ((List) imgList).size(), 11, 11)); - sheet.addMergedRegion(new CellRangeAddress(10 + total, 10 + total + ((List) imgList).size(), 12, 13)); - sheet.addMergedRegion(new CellRangeAddress(10 + total, 10 + total + ((List) imgList).size(), 14, 14)); + sheet.addMergedRegion(new CellRangeAddress(7 + total, 7 + total + ((List) imgList).size(), 0, 0)); + sheet.addMergedRegion(new CellRangeAddress(7 + total, 7 + total + ((List) imgList).size(), 1, 1)); + sheet.addMergedRegion(new CellRangeAddress(7 + total, 7 + total + ((List) imgList).size(), 2, 4)); + sheet.addMergedRegion(new CellRangeAddress(7 + total, 7 + total + ((List) imgList).size(), 5, 7)); + sheet.addMergedRegion(new CellRangeAddress(7 + total, 7 + total + ((List) imgList).size(), 8, 9)); + sheet.addMergedRegion(new CellRangeAddress(7 + total, 7 + total + ((List) imgList).size(), 10, 10)); + sheet.addMergedRegion(new CellRangeAddress(7 + total, 7 + total + ((List) imgList).size(), 11, 11)); + sheet.addMergedRegion(new CellRangeAddress(7 + total, 7 + total + ((List) imgList).size(), 12, 13)); + sheet.addMergedRegion(new CellRangeAddress(7 + total, 7 + total + ((List) imgList).size(), 14, 14)); new ArrayList(); Iterator var93 = ((List) imgList).iterator(); while (var93.hasNext()) { InspectionReportImg crr = (InspectionReportImg) var93.next(); ++total; - CellRangeAddress callRangeAddressb4 = new CellRangeAddress(10 + total, 10 + total, 15, 17); + CellRangeAddress callRangeAddressb4 = new CellRangeAddress(7 + total, 7 + total, 15, 17); sheet.addMergedRegion(callRangeAddressb4); - rowb1 = sheet.createRow(10 + total); + rowb1 = sheet.createRow(7 + total); rowb1.setHeight((short) 1000); cella1 = rowb1.createCell(0); cella1.setCellStyle(colStyle2); @@ -2808,7 +2850,7 @@ public class PatrolTaskResultMainController extends BaseController { cella1 = rowb1.createCell(15); if (crr.getImgType().equals("0")) { try { - insertImage(wb, patriarch, this.images(crr.getImg(), inputStreamMap), 10 + total, 0, 2); + insertImage(wb, patriarch, this.images(crr.getImg(), inputStreamMap), 7 + total, 0, 2); } catch (Exception var97) { var97.printStackTrace(); } @@ -2824,10 +2866,10 @@ public class PatrolTaskResultMainController extends BaseController { cella1.setCellStyle(colStyle); } } else { - sheet.addMergedRegion(new CellRangeAddress(10 + total, 10 + total, 2, 4)); - sheet.addMergedRegion(new CellRangeAddress(10 + total, 10 + total, 5, 7)); - sheet.addMergedRegion(new CellRangeAddress(10 + total, 10 + total, 8, 9)); - sheet.addMergedRegion(new CellRangeAddress(10 + total, 10 + total, 12, 13)); + sheet.addMergedRegion(new CellRangeAddress(7 + total, 7 + total, 2, 4)); + sheet.addMergedRegion(new CellRangeAddress(7 + total, 7 + total, 5, 7)); + sheet.addMergedRegion(new CellRangeAddress(7 + total, 7 + total, 8, 9)); + sheet.addMergedRegion(new CellRangeAddress(7 + total, 7 + total, 12, 13)); } } } @@ -2923,7 +2965,7 @@ public class PatrolTaskResultMainController extends BaseController { int x2 = 1023; int y2 = 255; if (data != null && data.length != 0) { - XSSFClientAnchor anchor = new XSSFClientAnchor(x1, y1, x2, y2, (short) 15, row - 1, (short) 17, row + 1); + XSSFClientAnchor anchor = new XSSFClientAnchor(x1, y1, x2, y2, (short) 15, row - 1, (short) 18, row + 1); pa.createPicture(anchor, wb.addPicture(data, 5)); } }