From a68f69ad9a0565a98e1360d066dee96e551d6d48 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Fri, 6 Dec 2024 18:21:55 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D23?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/utils/poi/ExcelCPReportMapUtil.java | 596 ++++++++++++++++++ .../core/utils/poi/ExcelSCReportMapUtil.java | 87 ++- .../QcCheckReportProduceController.java | 51 ++ .../QcCheckReportProductController.java | 21 +- .../service/IQcCheckReportProductService.java | 2 +- .../impl/QcCheckReportProductServiceImpl.java | 58 +- 6 files changed, 769 insertions(+), 46 deletions(-) create mode 100644 op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelCPReportMapUtil.java diff --git a/op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelCPReportMapUtil.java b/op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelCPReportMapUtil.java new file mode 100644 index 00000000..dfdeb2c6 --- /dev/null +++ b/op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelCPReportMapUtil.java @@ -0,0 +1,596 @@ +package com.op.common.core.utils.poi; + +import com.alibaba.fastjson2.JSONObject; +import com.op.common.core.domain.ExcelCol; +import org.apache.commons.compress.utils.IOUtils; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.xssf.streaming.SXSSFWorkbook; +import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.HttpURLConnection; +import java.net.URL; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +/** + * Excel导出报告相关处理 + * + * @author OP + */ +public class ExcelCPReportMapUtil { + //下载 + public static SXSSFWorkbook initWorkbook(String sheetName , String title, List excelCol , + List data0, List data1,Map detailMap) throws IOException { + SXSSFWorkbook workbook = new SXSSFWorkbook(); + int colSize = excelCol.size(); + + //创建Sheet（工作簿） + Sheet sheet = null; + if (!StringUtils.hasText(sheetName)){ + sheet = workbook.createSheet(); + }else{ + sheet = workbook.createSheet(sheetName); + } + + // 从resources目录获取图片字节数组 + byte[] imageBytes = getImageBytesFromResources("image/logo.png"); + /**logo**/ + int pictureIdx = workbook.addPicture(imageBytes, Workbook.PICTURE_TYPE_PNG); + CreationHelper helper = workbook.getCreationHelper(); + Drawing drawing = sheet.createDrawingPatriarch(); + ClientAnchor anchor = helper.createClientAnchor(); + anchor.setCol1(0); // B列 + anchor.setRow1(0); // 第2行（Excel的行和列都是从0开始计数的） + anchor.setCol2(1); // C列（图片宽度跨越的列数，这里设置为1列宽） + anchor.setRow2(2); // 第6行（图片高度跨越的行数，这里设置为4行高，可以根据图片大小调整） + Picture pict = drawing.createPicture(anchor, pictureIdx); + pict.resize(); // 根据图片的实际大小调整图片在Excel中的显示大小 + /**报告标题**/ + sheet.addMergedRegion(new CellRangeAddress(0, 1, 2, 11)); + // 获取合并后的单元格的第一个单元格（即C1），并设置值 + Row row1 = sheet.getRow(0); // 获取第1行（索引为0） + if (row1 == null) {row1 = sheet.createRow(0); // 如果第1行不存在，则创建它 + } + Cell cell = row1.getCell(2); // 获取C列（索引为2）的单元格 + if (cell == null) { + cell = row1.createCell(2); // 如果C列的单元格不存在，则创建它 + } + cell.setCellValue("中山榄菊日化实业有限公司"); // 设置单元格的值 + cell.setCellStyle(getTitelStyle(workbook)); // 应用样式到单元格 + /**报告二级标题、检验标准**/ + // 合并C3到I4的单元格，并设置样式 + mergeAndStyleCells(sheet, new CellRangeAddress(2, 3, 2, 8), detailMap.get("title")); + // 合并J3到L4的单元格，并设置样式 + mergeAndStyleCells(sheet, new CellRangeAddress(2, 3, 9, 12), "编码"+detailMap.get("standardNo")); + /**左右表格1**/ + //画边框 + for(int r5=4;r5<12;r5++){ + Row row05 = sheet.getRow(r5); + if (row05 == null) {row05 = sheet.createRow(r5);} + for (int col = 0; col < 14; col++) { + Cell cell1 = row05.createCell(col); + cell1.setCellStyle(getRowStyle(sheet)); + } + } + for(int d5=12;d5<(14+data0.size()+data1.size());d5++){ + Row row05 = sheet.getRow(d5); + if (row05 == null) {row05 = sheet.createRow(d5);} + for (int col = 0; col < 14; col++) { + Cell cell1 = row05.createCell(col); + cell1.setCellStyle(getDataStyle(sheet)); + } + } + + Row row5 = sheet.getRow(4); + // 合并A5到B6的单元格，并设置样式和内容 + mergeAndStyleCells2(sheet,row5, new CellRangeAddress(4, 5, 0, 1), "产品名称", true, true, IndexedColors.GREY_25_PERCENT); + // 合并C5到D6的单元格，并设置样式（无背景色，只有边框和内容居中） + mergeAndStyleCells2(sheet,row5, new CellRangeAddress(4, 5, 2, 3), detailMap.get("materialName"), true, false, null); + // 合并E5到F6的单元格，并设置样式和内容 + mergeAndStyleCells2(sheet,row5, new CellRangeAddress(4, 5, 4, 5), "生产数量(单位/箱)", true, true, IndexedColors.GREY_25_PERCENT); + // 合并G5到I6的单元格，并设置样式（无背景色，只有边框和内容居中） + mergeAndStyleCells2(sheet,row5, new CellRangeAddress(4, 5, 6, 8), detailMap.get("quality"), true, false, null); + // 合并J5到K6的单元格，并设置样式和内容 + mergeAndStyleCells2(sheet,row5, new CellRangeAddress(4, 5, 9, 10), "检验编码", true, true, IndexedColors.GREY_25_PERCENT); + // 合并L5到N6的单元格，并设置样式（无背景色，只有边框和内容居中） + mergeAndStyleCells2(sheet,row5, new CellRangeAddress(4, 5, 11, 13), detailMap.get("checkNo"), true, false, null); + Row row7 = sheet.getRow(6); + // 合并A7到B8的单元格，并设置样式和内容 + mergeAndStyleCells2(sheet,row7, new CellRangeAddress(6, 7, 0, 1), "产品编码", true, true, IndexedColors.GREY_25_PERCENT); + // 合并C5到D6的单元格，并设置样式（无背景色，只有边框和内容居中） + mergeAndStyleCells2(sheet,row7, new CellRangeAddress(6, 7, 2, 3), detailMap.get("materialCode"), true, false, null); + // 合并E5到F6的单元格，并设置样式和内容 + mergeAndStyleCells2(sheet,row7, new CellRangeAddress(6, 7, 4, 5), "抽样地点", true, true, IndexedColors.GREY_25_PERCENT); + // 合并G5到I6的单元格，并设置样式（无背景色，只有边框和内容居中） + mergeAndStyleCells2(sheet,row7, new CellRangeAddress(6, 7, 6, 8), detailMap.get("checkLoc"), true, false, null); + // 合并J5到K6的单元格，并设置样式和内容 + mergeAndStyleCells2(sheet,row7, new CellRangeAddress(6, 7, 9, 10), "报检日期", true, true, IndexedColors.GREY_25_PERCENT); + // 合并L5到N6的单元格，并设置样式（无背景色，只有边框和内容居中） + mergeAndStyleCells2(sheet,row7, new CellRangeAddress(6, 7, 11, 13), detailMap.get("incomeTime"), true, false, null); + Row row9 = sheet.getRow(8); + // 合并A7到B8的单元格，并设置样式和内容 + mergeAndStyleCells2(sheet,row9, new CellRangeAddress(8, 9, 0, 1), "生产批号", true, true, IndexedColors.GREY_25_PERCENT); + // 合并C5到D6的单元格，并设置样式（无背景色，只有边框和内容居中） + mergeAndStyleCells2(sheet,row9, new CellRangeAddress(8, 9, 2, 3), detailMap.get("incomeBatchNo"), true, false, null); + // 合并E5到F6的单元格，并设置样式和内容 + mergeAndStyleCells2(sheet,row9, new CellRangeAddress(8, 9, 4, 5), "检验依据", true, true, IndexedColors.GREY_25_PERCENT); + // 合并G5到I6的单元格，并设置样式（无背景色，只有边框和内容居中） + mergeAndStyleCells2(sheet,row9, new CellRangeAddress(8, 9,6, 8), detailMap.get("quality"), true, false, null); + // 合并J5到K6的单元格，并设置样式和内容 + mergeAndStyleCells2(sheet,row9, new CellRangeAddress(8, 9, 9, 10), "检验日期 ", true, true, IndexedColors.GREY_25_PERCENT); + // 合并L5到N6的单元格，并设置样式（无背景色，只有边框和内容居中） + mergeAndStyleCells2(sheet,row9, new CellRangeAddress(8, 9, 11, 13), detailMap.get("checkTime"), true, false, null); + Row row10 = sheet.getRow(10); + mergeAndStyleCells2(sheet,row10, new CellRangeAddress(10, 10, 0, 13), "包装检验项目", true, false, null); + /**上下表格2**///------------------------------------------------- + Row row11 = sheet.getRow(11); + if (row11 == null) {row11 = sheet.createRow(11);} + Cell cellA13 = row11.createCell(0); + cellA13.setCellValue("序号"); + cellA13.setCellStyle(getRowStyle(sheet)); + mergeAndStyleCells(sheet, new CellRangeAddress(11, 11, 1, 4), "检验项目"); + mergeAndStyleCells(sheet, new CellRangeAddress(11, 11, 5, 9), "标准要求"); + Cell cellK = row11.createCell(10); + cellK.setCellValue("抽检数(PC)"); + cellK.setCellStyle(getRowStyle(sheet)); + mergeAndStyleCells(sheet, new CellRangeAddress(11, 11, 11, 12), "实测结果"); + Cell cellL13 = row11.createCell(13); + cellL13.setCellValue("判定"); + cellL13.setCellStyle(getRowStyle(sheet)); + + //将data中的值填充到excel + int rowNum = 12; + if(!CollectionUtils.isEmpty(data0)){ + Iterator iterator = data0.iterator(); + //遍历数据 + for (;iterator.hasNext();){ + + T obj = iterator.next();//获取当前行对应的数据 + JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(obj)); + + Row dataRow = sheet.getRow(rowNum);//创建行 + // 假设使用了默认字体和字符宽度来计算行高（这是一个简化的示例） + int cellHeight = (int) (cell.getStringCellValue().length() * 6); // 每个字符大约15个单位高度 + dataRow.setHeightInPoints(Math.max(dataRow.getHeightInPoints(), cellHeight)); + + Cell cellData0 = dataRow.getCell(0); + cellData0.setCellValue(rowNum-11); + cellData0.setCellStyle(getDataStyle(sheet)); + + Cell cellData1 = dataRow.getCell(1); + cellData1.setCellValue(getValue(jsonObject.get(excelCol.get(0).getField()))); + cellData1.setCellStyle(getDataStyle(sheet)); + + Cell cellData2 = dataRow.getCell(5); + cellData2.setCellValue(getValue(jsonObject.get(excelCol.get(1).getField()))); + cellData2.setCellStyle(getDataStyle(sheet)); + sheet.addMergedRegion(new CellRangeAddress(rowNum, rowNum, 5, 9)); + + Cell cellData3 = dataRow.getCell(10); + cellData3.setCellValue(getValue(jsonObject.get(excelCol.get(2).getField()))); + cellData3.setCellStyle(getDataStyle(sheet)); + + Cell cellData4 = dataRow.getCell(11); + cellData4.setCellValue(getValue(jsonObject.get(excelCol.get(3).getField()))); + cellData4.setCellStyle(getDataStyle(sheet)); + sheet.addMergedRegion(new CellRangeAddress(rowNum, rowNum, 11, 12)); + + Cell cellData5 = dataRow.getCell(13); + cellData5.setCellValue(getValue(jsonObject.get(excelCol.get(4).getField()))); + cellData5.setCellStyle(getDataStyle(sheet)); + + iterator.remove(); + rowNum++; + } + } + + // 指定要检查的列索引（例如，B列的索引是1） + int columnIndex = 1; + // 遍历所有行，从第二行开始（索引1），因为第一行可能是标题行 + for (int rowIndex = 12; rowIndex <= sheet.getLastRowNum(); ) { + Row currentRow = sheet.getRow(rowIndex); + if (currentRow != null) { + Cell currentCell = currentRow.getCell(columnIndex); + if (currentCell != null && currentCell.getCellType() == CellType.STRING) { // 假设我们处理字符串类型的单元格 + String currentValue = currentCell.getStringCellValue(); + + // 查找连续相同值的行 + int lastRowIndex = rowIndex; + while (lastRowIndex + 1 <= sheet.getLastRowNum()) { + Row nextRow = sheet.getRow(lastRowIndex + 1); + if (nextRow != null) { + Cell nextCell = nextRow.getCell(columnIndex); + if (nextCell != null && nextCell.getCellType() == CellType.STRING && + nextCell.getStringCellValue().equals(currentValue)) { + lastRowIndex++; // 继续向下查找 + } else { + break; // 找到不同值，停止查找 + } + } else { + break; // 没有更多行，停止查找 + } + } + + // 合并找到的行 + if (rowIndex != lastRowIndex) { // 只有在找到连续相同值的行时才进行合并 + sheet.addMergedRegion(new CellRangeAddress(rowIndex, lastRowIndex, 1, 4)); + }else{ + sheet.addMergedRegion(new CellRangeAddress(rowIndex, rowIndex, 1, 4)); + } + + // 更新rowIndex以跳过已合并的行 + rowIndex = lastRowIndex + 1; // 从下一个未合并的行开始继续遍历 + } else { + // 如果当前单元格不是字符串类型，则直接跳到下一行 + rowIndex++; + } + } else { + // 如果当前行为空，则直接跳到下一行 + rowIndex++; + } + } + //表格2 + int startNum2= rowNum; + Row row100 = sheet.getRow(startNum2); + mergeAndStyleCells2(sheet,row100, new CellRangeAddress(startNum2, startNum2, 0, 13), "内容物分析项目", true, false, null); + Row row101 = sheet.getRow(startNum2+1); + if (row101 == null) {row101 = sheet.createRow(startNum2+1);} + Cell cellA103 = row101.createCell(0); + cellA103.setCellValue("序号"); + cellA103.setCellStyle(getRowStyle(sheet)); + mergeAndStyleCells(sheet, new CellRangeAddress(startNum2+1, startNum2+1, 1, 4), "检验项目"); + mergeAndStyleCells(sheet, new CellRangeAddress(startNum2+1, startNum2+1, 5, 9), "标准要求"); + Cell cellK0 = row101.createCell(10); + cellK0.setCellValue("抽检数(PC)"); + cellK0.setCellStyle(getRowStyle(sheet)); + mergeAndStyleCells(sheet, new CellRangeAddress(startNum2+1, startNum2+1, 11, 12), "实测结果"); + Cell cellL103 = row101.createCell(13); + cellL103.setCellValue("判定"); + cellL103.setCellStyle(getRowStyle(sheet)); + //将data中的值填充到excel + int rowNum2 = startNum2+2,m=1; + if(!CollectionUtils.isEmpty(data1)){ + Iterator iterator = data1.iterator(); + //遍历数据 + for (;iterator.hasNext();){ + + T obj = iterator.next();//获取当前行对应的数据 + JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(obj)); + + Row dataRow = sheet.getRow(rowNum2);//创建行 + // 假设使用了默认字体和字符宽度来计算行高（这是一个简化的示例） + int cellHeight = (int) (cell.getStringCellValue().length() * 6); // 每个字符大约15个单位高度 + dataRow.setHeightInPoints(Math.max(dataRow.getHeightInPoints(), cellHeight)); + + Cell cellData0 = dataRow.getCell(0); + cellData0.setCellValue(m++); + cellData0.setCellStyle(getDataStyle(sheet)); + + Cell cellData1 = dataRow.getCell(1); + cellData1.setCellValue(getValue(jsonObject.get(excelCol.get(0).getField()))); + cellData1.setCellStyle(getDataStyle(sheet)); + + Cell cellData2 = dataRow.getCell(5); + cellData2.setCellValue(getValue(jsonObject.get(excelCol.get(1).getField()))); + cellData2.setCellStyle(getDataStyle(sheet)); + sheet.addMergedRegion(new CellRangeAddress(rowNum2, rowNum2, 5, 9)); + + Cell cellData3 = dataRow.getCell(10); + cellData3.setCellValue(getValue(jsonObject.get(excelCol.get(2).getField()))); + cellData3.setCellStyle(getDataStyle(sheet)); + + Cell cellData4 = dataRow.getCell(11); + cellData4.setCellValue(getValue(jsonObject.get(excelCol.get(3).getField()))); + cellData4.setCellStyle(getDataStyle(sheet)); + sheet.addMergedRegion(new CellRangeAddress(rowNum2, rowNum2, 11, 12)); + + Cell cellData5 = dataRow.getCell(13); + cellData5.setCellValue(getValue(jsonObject.get(excelCol.get(4).getField()))); + cellData5.setCellStyle(getDataStyle(sheet)); + + iterator.remove(); + rowNum2++; + } + } + // 指定要检查的列索引（例如，B列的索引是1） + int columnIndex2 = 1; + // 遍历所有行，从第二行开始（索引1），因为第一行可能是标题行 + for (int rowIndex = startNum2+2; rowIndex <= sheet.getLastRowNum(); ) { + Row currentRow = sheet.getRow(rowIndex); + if (currentRow != null) { + Cell currentCell = currentRow.getCell(columnIndex2); + if (currentCell != null && currentCell.getCellType() == CellType.STRING) { // 假设我们处理字符串类型的单元格 + String currentValue = currentCell.getStringCellValue(); + + // 查找连续相同值的行 + int lastRowIndex = rowIndex; + while (lastRowIndex + 1 <= sheet.getLastRowNum()) { + Row nextRow = sheet.getRow(lastRowIndex + 1); + if (nextRow != null) { + Cell nextCell = nextRow.getCell(columnIndex2); + if (nextCell != null && nextCell.getCellType() == CellType.STRING && + nextCell.getStringCellValue().equals(currentValue)) { + lastRowIndex++; // 继续向下查找 + } else { + break; // 找到不同值，停止查找 + } + } else { + break; // 没有更多行，停止查找 + } + } + + // 合并找到的行 + if (rowIndex != lastRowIndex) { // 只有在找到连续相同值的行时才进行合并 + sheet.addMergedRegion(new CellRangeAddress(rowIndex, lastRowIndex, 1, 4)); + }else{ + sheet.addMergedRegion(new CellRangeAddress(rowIndex, rowIndex, 1, 4)); + } + + // 更新rowIndex以跳过已合并的行 + rowIndex = lastRowIndex + 1; // 从下一个未合并的行开始继续遍历 + } else { + // 如果当前单元格不是字符串类型，则直接跳到下一行 + rowIndex++; + } + } else { + // 如果当前行为空，则直接跳到下一行 + rowIndex++; + } + } + + Row rowEnd1 = sheet.createRow(rowNum2+2); + mergeAndStyleCellsNoBorder(sheet,rowEnd1, new CellRangeAddress(rowNum2+2, rowNum2+3, 0, 1), "综合检验结论", true, true, IndexedColors.GREY_25_PERCENT); + mergeAndStyleCellsNoBorder(sheet,rowEnd1, new CellRangeAddress(rowNum2+2, rowNum2+3, 2, 3), detailMap.get("checkResult"), true, false, null); + mergeAndStyleCellsNoBorder(sheet,rowEnd1, new CellRangeAddress(rowNum2+2, rowNum2+3, 5, 10), "备注:判定合格打“√”，不合格打“×”", true, true, null); + Row rowEnd2 = sheet.createRow(rowNum2+5); + mergeAndStyleCellsNoBorder(sheet,rowEnd2, new CellRangeAddress(rowNum2+5, rowNum2+5, 0, 2), "品质主管", true, true, IndexedColors.GREY_25_PERCENT); + mergeAndStyleCellsNoBorder(sheet,rowEnd2, new CellRangeAddress(rowNum2+5, rowNum2+5, 3, 8), "", true, false, null); + mergeAndStyleCellsNoBorder(sheet,rowEnd2, new CellRangeAddress(rowNum2+5, rowNum2+5, 10, 11), "品管员", true, true, IndexedColors.GREY_25_PERCENT); + mergeAndStyleCellsNoBorder(sheet,rowEnd2, new CellRangeAddress(rowNum2+5, rowNum2+5, 12, 13), detailMap.get("checkManName"), true, false, null); + + return workbook; + } + +// //标题样式 +// public static CellStyle getHeaderFont(Workbook workbook){ +// Font font = workbook.createFont(); +// font.setFontHeightInPoints((short) 15);//字体大小 +// font.setBold(true);//加粗 +// CellStyle cellStyle = workbook.createCellStyle(); +// cellStyle.setFont(font); +// cellStyle.setAlignment(HorizontalAlignment.CENTER_SELECTION);//设置水平居中 +// cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//设置垂直居中 +// // 设置上边框 +// cellStyle.setBorderTop(BorderStyle.THIN); +// // 设置下边框 +// cellStyle.setBorderBottom(BorderStyle.THIN); +// // 设置左边框 +// cellStyle.setBorderLeft(BorderStyle.THIN); +// // 设置右边框 +// cellStyle.setBorderRight(BorderStyle.THIN); +// cellStyle.setFillBackgroundColor(IndexedColors.AQUA.getIndex()); +// +// return cellStyle; +// } + +// //内容样式 +// public static CellStyle getDataFont(Workbook workbook){ +// Font font = workbook.createFont(); +// font.setFontHeightInPoints((short) 12);//字体大小 +// font.setBold(false);//不加粗 +// CellStyle cellStyle = workbook.createCellStyle(); +// cellStyle.setFont(font); +// cellStyle.setAlignment(HorizontalAlignment.CENTER_SELECTION);//设置水平居中 +// cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//设置垂直居中 +// cellStyle.setWrapText(true);//设置单元格内容自动换行 +// return cellStyle; +// } +// + //处理数据 + public static String getValue(Object object){ + if (object==null){ + return ""; + }else { + return object.toString(); + } + } +// //处理数据 +// public static Integer getValueNum(Object object){ +// if (object==null){ +// return 0; +// }else { +// return Integer.parseInt(object.toString()); +// } +// } + // 从resources目录获取图片的字节数组 + private static byte[] getImageBytesFromResources(String resourceName) { + try (InputStream inputStream = ExcelCPReportMapUtil.class.getClassLoader().getResourceAsStream(resourceName); + ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) { + + if (inputStream == null) { + throw new RuntimeException("找不到资源: " + resourceName); + } + + IOUtils.copy(inputStream, byteArrayOutputStream); + return byteArrayOutputStream.toByteArray(); + + } catch (IOException e) { + throw new RuntimeException("读取资源时出错: " + resourceName, e); + } + } + //报告大标题样式-1 + public static CellStyle getTitelStyle(Workbook workbook){ + Font font = workbook.createFont(); + // 设置字体为加粗 + font.setBold(true); + // 设置字体大小（例如，设置为16） + font.setFontHeightInPoints((short) 24); + CellStyle cellStyle = workbook.createCellStyle(); + cellStyle.setFont(font); + cellStyle.setAlignment(HorizontalAlignment.CENTER_SELECTION);//设置水平居中 + cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//设置垂直居中 + cellStyle.setWrapText(true);//设置单元格内容自动换行 + return cellStyle; + } + public static CellStyle getRowStyle(Sheet sheet){ + CellStyle style = sheet.getWorkbook().createCellStyle(); + // 设置边框线 + style.setBorderBottom(BorderStyle.THIN); + style.setBorderLeft(BorderStyle.THIN); + style.setBorderRight(BorderStyle.THIN); + style.setBorderTop(BorderStyle.THIN); + // 设置水平居中 + style.setAlignment(HorizontalAlignment.CENTER); + style.setWrapText(true);//设置单元格内容自动换行 + // 设置垂直居中 + style.setVerticalAlignment(VerticalAlignment.CENTER); + Font font = sheet.getWorkbook().createFont(); + font.setBold(true); + // 设置字体大小（例如，设置为14） + font.setFontHeightInPoints((short) 14); + style.setFont(font); + return style; + } + public static CellStyle getDataStyle(Sheet sheet){ + CellStyle style = sheet.getWorkbook().createCellStyle(); + // 设置边框线 + style.setBorderBottom(BorderStyle.THIN); + style.setBorderLeft(BorderStyle.THIN); + style.setBorderRight(BorderStyle.THIN); + style.setBorderTop(BorderStyle.THIN); + Font font = sheet.getWorkbook().createFont(); + + // 设置字体大小（例如，设置为14） + font.setFontHeightInPoints((short) 14); + style.setFont(font); + style.setWrapText(true);//设置单元格内容自动换行 + // 设置水平居中 + style.setAlignment(HorizontalAlignment.LEFT); + // 设置垂直居中 + style.setVerticalAlignment(VerticalAlignment.CENTER); + return style; + } + private static void mergeAndStyleCells(Sheet sheet, CellRangeAddress cellRangeAddress, String cellValue) { + // 合并单元格 + sheet.addMergedRegion(cellRangeAddress); + + // 创建一个单元格样式 + CellStyle style = sheet.getWorkbook().createCellStyle(); + + // 设置字体为加粗 + Font font = sheet.getWorkbook().createFont(); + font.setBold(true); + // 设置字体大小（例如，设置为14） + font.setFontHeightInPoints((short) 14); + style.setFont(font); + + // 设置水平居中 + style.setAlignment(HorizontalAlignment.CENTER); + // 设置垂直居中 + style.setVerticalAlignment(VerticalAlignment.CENTER); + style.setWrapText(true);//设置单元格内容自动换行 + // 获取合并后的单元格的第一个单元格，并设置值 + Row row = sheet.getRow(cellRangeAddress.getFirstRow()); + if (row == null) { + row = sheet.createRow(cellRangeAddress.getFirstRow()); + } + Cell cell = row.getCell(cellRangeAddress.getFirstColumn()); + if (cell == null) { + cell = row.createCell(cellRangeAddress.getFirstColumn()); + } + cell.setCellValue(cellValue); // 设置单元格的值 + cell.setCellStyle(style); // 应用样式到单元格 + } + private static void mergeAndStyleCells2(Sheet sheet,Row row, CellRangeAddress cellRangeAddress, String cellValue, boolean centered, boolean hasBackground, IndexedColors backgroundColor) { + // 合并单元格 + sheet.addMergedRegion(cellRangeAddress); + + // 创建一个单元格样式 + CellStyle style = sheet.getWorkbook().createCellStyle(); + + // 设置字体居中 + if (centered) { + style.setAlignment(HorizontalAlignment.CENTER); + style.setVerticalAlignment(VerticalAlignment.CENTER); + } + + // 设置背景颜色（如果有） + if (hasBackground && backgroundColor != null) { + style.setFillForegroundColor(backgroundColor.getIndex()); + style.setFillPattern(FillPatternType.SOLID_FOREGROUND); + } + + // 设置边框线 + style.setBorderBottom(BorderStyle.THIN); + style.setBorderLeft(BorderStyle.THIN); + style.setBorderRight(BorderStyle.THIN); + style.setBorderTop(BorderStyle.THIN); + + // 获取合并后的单元格的第一个单元格，并设置值 + Cell cell = row.getCell(cellRangeAddress.getFirstColumn()); + if (cell == null) { + cell = row.createCell(cellRangeAddress.getFirstColumn()); + } + cell.setCellValue(cellValue); // 设置单元格的值 + cell.setCellStyle(style); // 应用样式到单元格 + } + private static void mergeAndStyleCellsNoBorder(Sheet sheet,Row row, CellRangeAddress cellRangeAddress, String cellValue, boolean centered, boolean hasBackground, IndexedColors backgroundColor) { + // 合并单元格 + sheet.addMergedRegion(cellRangeAddress); + + // 创建一个单元格样式 + CellStyle style = sheet.getWorkbook().createCellStyle(); + + // 设置字体居中 + if (centered) { + style.setAlignment(HorizontalAlignment.CENTER); + style.setVerticalAlignment(VerticalAlignment.CENTER); + } + + // 设置背景颜色（如果有） + if (hasBackground && backgroundColor != null) { + style.setFillForegroundColor(backgroundColor.getIndex()); + style.setFillPattern(FillPatternType.SOLID_FOREGROUND); + } + + // 获取合并后的单元格的第一个单元格，并设置值 + Cell cell = row.getCell(cellRangeAddress.getFirstColumn()); + if (cell == null) { + cell = row.createCell(cellRangeAddress.getFirstColumn()); + } + cell.setCellValue(cellValue); // 设置单元格的值 + cell.setCellStyle(style); // 应用样式到单元格 + } + + // 下载图片的方法 + private static byte[] downloadImage(String imageUrl) throws IOException { + URL url = new URL("http://192.168.202.20:9300/downLoadFile?id=6750f005dfe388096d533c66&fileName=1733357574344_IMG_20241112_124257_956.jpg"); + HttpURLConnection connection = (HttpURLConnection) url.openConnection(); + connection.setRequestMethod("GET"); + connection.connect(); + + int responseCode = connection.getResponseCode(); + if (responseCode != HttpURLConnection.HTTP_OK) { + throw new IOException("Failed to download image: HTTP error code : " + responseCode); + } + + // 获取图片大小并读取图片数据 + int contentLength = connection.getContentLength(); + byte[] imageBytes = new byte[contentLength]; + try (InputStream inputStream = connection.getInputStream()) { + int bytesRead = -1; + int totalBytesRead = 0; + while ((bytesRead = inputStream.read(imageBytes, totalBytesRead, contentLength - totalBytesRead)) != -1) { + totalBytesRead += bytesRead; + } + } + + return imageBytes; + } +} diff --git a/op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelSCReportMapUtil.java b/op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelSCReportMapUtil.java index e818736e..ba779813 100644 --- a/op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelSCReportMapUtil.java +++ b/op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelSCReportMapUtil.java @@ -242,13 +242,62 @@ public class ExcelSCReportMapUtil { mergeAndStyleCellsNoBorder(sheet,rowEnd1, new CellRangeAddress(rowNum+2, rowNum+3, 2, 3), detailMap.get("checkResult"), true, false, null); mergeAndStyleCellsNoBorder(sheet,rowEnd1, new CellRangeAddress(rowNum+2, rowNum+3, 5, 10), "备注:判定合格打“√”，不合格打“×”", true, true, null); Row rowEnd2 = sheet.createRow(rowNum+5); - mergeAndStyleCellsNoBorder(sheet,rowEnd2, new CellRangeAddress(rowNum+5, rowNum+5, 0, 1), "品管经理/主任", true, true, IndexedColors.GREY_25_PERCENT); - mergeAndStyleCellsNoBorder(sheet,rowEnd2, new CellRangeAddress(rowNum+5, rowNum+5, 2, 3), "", true, false, null); - mergeAndStyleCellsNoBorder(sheet,rowEnd2, new CellRangeAddress(rowNum+5, rowNum+5, 5, 6), "品质主管", true, true, IndexedColors.GREY_25_PERCENT); - mergeAndStyleCellsNoBorder(sheet,rowEnd2, new CellRangeAddress(rowNum+5, rowNum+5, 7, 8), "", true, false, null); - mergeAndStyleCellsNoBorder(sheet,rowEnd2, new CellRangeAddress(rowNum+5, rowNum+5, 10, 11), "品管员", true, true, IndexedColors.GREY_25_PERCENT); - mergeAndStyleCellsNoBorder(sheet,rowEnd2, new CellRangeAddress(rowNum+5, rowNum+5, 12, 13), detailMap.get("checkManName"), true, false, null); + mergeAndStyleCellsNoBorder(sheet,rowEnd2, new CellRangeAddress(rowNum+5, rowNum+5, 0, 1), "车间组长/机管员签名", true, true, IndexedColors.GREY_25_PERCENT); + // 下载图片 + int signNum = bytes.size()-3; + byte[] imageFileBytes1 = bytes.get(signNum); + if (imageFileBytes1 != null) { + // 将图片添加到工作簿中 + int picIdx = workbook.addPicture(imageFileBytes1, Workbook.PICTURE_TYPE_JPEG); // 假设图片是JPEG格式，根据实际情况调整 + // 创建绘图对象和锚点 + CreationHelper fhelper = workbook.getCreationHelper(); + Drawing fdrawing = sheet.createDrawingPatriarch(); + ClientAnchor fanchor = fhelper.createClientAnchor(); + fanchor.setCol1(2); // 列索引从0开始，1表示第二列（B列） + fanchor.setRow1(rowNum+5); // 行索引从0开始，1表示第二行 + fanchor.setCol2(5); // 14-12是列数 + fanchor.setRow2(rowNum+7); // + // 插入图片到指定位置 + Picture fpict =fdrawing.createPicture(fanchor, picIdx); + //fpict.resize(); // 根据图片的实际大小调整图片在Excel中的显示大小 + } + // 下载图片 + byte[] imageFileBytes2 = bytes.get(signNum+1); + if (imageFileBytes2 != null) { + // 将图片添加到工作簿中 + int picIdx = workbook.addPicture(imageFileBytes2, Workbook.PICTURE_TYPE_JPEG); // 假设图片是JPEG格式，根据实际情况调整 + // 创建绘图对象和锚点 + CreationHelper fhelper = workbook.getCreationHelper(); + Drawing fdrawing = sheet.createDrawingPatriarch(); + ClientAnchor fanchor = fhelper.createClientAnchor(); + fanchor.setCol1(6); // 列索引从0开始，1表示第二列（B列） + fanchor.setRow1(rowNum+5); // 行索引从0开始，1表示第二行 + fanchor.setCol2(9); // 14-12是列数 + fanchor.setRow2(rowNum+7); // + // 插入图片到指定位置 + Picture fpict =fdrawing.createPicture(fanchor, picIdx); + //fpict.resize(); // 根据图片的实际大小调整图片在Excel中的显示大小 + } + Row rowEnd3 = sheet.createRow(rowNum+8); + mergeAndStyleCellsNoBorder(sheet,rowEnd3, new CellRangeAddress(rowNum+8, rowNum+8, 0, 1), "质量管理部品管员签名", true, true, IndexedColors.GREY_25_PERCENT); + // 下载图片 + byte[] imageFileBytes3 = bytes.get(signNum+2); + if (imageFileBytes3 != null) { + // 将图片添加到工作簿中 + int picIdx = workbook.addPicture(imageFileBytes3, Workbook.PICTURE_TYPE_JPEG); // 假设图片是JPEG格式，根据实际情况调整 + // 创建绘图对象和锚点 + CreationHelper fhelper = workbook.getCreationHelper(); + Drawing fdrawing = sheet.createDrawingPatriarch(); + ClientAnchor fanchor = fhelper.createClientAnchor(); + fanchor.setCol1(2); // 列索引从0开始，1表示第二列（B列） + fanchor.setRow1(rowNum+8); // 行索引从0开始，1表示第二行 + fanchor.setCol2(5); // 14-12是列数 + fanchor.setRow2(rowNum+10); // + // 插入图片到指定位置 + Picture fpict =fdrawing.createPicture(fanchor, picIdx); + //fpict.resize(); // 根据图片的实际大小调整图片在Excel中的显示大小 + } return workbook; } @@ -463,30 +512,4 @@ public class ExcelSCReportMapUtil { cell.setCellValue(cellValue); // 设置单元格的值 cell.setCellStyle(style); // 应用样式到单元格 } - - // 下载图片的方法 - private static byte[] downloadImage(String imageUrl) throws IOException { - URL url = new URL("http://192.168.202.20:9300/downLoadFile?id=6750f005dfe388096d533c66&fileName=1733357574344_IMG_20241112_124257_956.jpg"); - HttpURLConnection connection = (HttpURLConnection) url.openConnection(); - connection.setRequestMethod("GET"); - connection.connect(); - - int responseCode = connection.getResponseCode(); - if (responseCode != HttpURLConnection.HTTP_OK) { - throw new IOException("Failed to download image: HTTP error code : " + responseCode); - } - - // 获取图片大小并读取图片数据 - int contentLength = connection.getContentLength(); - byte[] imageBytes = new byte[contentLength]; - try (InputStream inputStream = connection.getInputStream()) { - int bytesRead = -1; - int totalBytesRead = 0; - while ((bytesRead = inputStream.read(imageBytes, totalBytesRead, contentLength - totalBytesRead)) != -1) { - totalBytesRead += bytesRead; - } - } - - return imageBytes; - } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProduceController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProduceController.java index eef8dca2..f908a06f 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProduceController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProduceController.java @@ -30,6 +30,8 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import java.util.stream.Collectors; /** @@ -111,6 +113,55 @@ public class QcCheckReportProduceController extends BaseController { } } QcCheckReportIncome detailInfo = qcCheckReportProduceService.selectQcCheckReportIncomeByRecordId(qcCheckTaskIncome.getRecordId()); + + // 定义正则表达式，匹配id=后面的内容直到&fileName之前的部分 + String regex = "id=([^&]+)&fileName"; + // 创建Pattern对象 + Pattern pattern = Pattern.compile(regex); + // 创建Matcher对象 + if(StringUtils.isNotBlank(detailInfo.getCxzz())){ + Matcher matcher = pattern.matcher(detailInfo.getCxzz());//产线组长 + // 查找匹配项 + if (matcher.find()) { + // 提取括号内的内容，即id=和&fileName之间的部分 + String value = matcher.group(1); + SysFile sysFile1 = new SysFile(); + sysFile1.setUrl(value); + byte[] byte0 = remoteFileService.downLoadFileByte(sysFile1); + bytes.add(byte0); + } + }else{ + bytes.add(null); + } + if(StringUtils.isNotBlank(detailInfo.getJgy())){ + Matcher matcher2 = pattern.matcher(detailInfo.getJgy());//机管员 + // 查找匹配项 + if (matcher2.find()) { + // 提取括号内的内容，即id=和&fileName之间的部分 + String value = matcher2.group(1); + SysFile sysFile1 = new SysFile(); + sysFile1.setUrl(value); + byte[] byte0 = remoteFileService.downLoadFileByte(sysFile1); + bytes.add(byte0); + } + }else{ + bytes.add(null); + } + Matcher matcher3 = pattern.matcher(detailInfo.getPgy());//机管员 + if(StringUtils.isNotBlank(detailInfo.getPgy())){ + // 查找匹配项 + if (matcher3.find()) { + // 提取括号内的内容，即id=和&fileName之间的部分 + String value = matcher3.group(1); + SysFile sysFile1 = new SysFile(); + sysFile1.setUrl(value); + byte[] byte0 = remoteFileService.downLoadFileByte(sysFile1); + bytes.add(byte0); + } + }else{ + bytes.add(null); + } + Map detailMap = new HashMap<>(); detailMap.put("orderType",detailInfo.getOrderType()); detailMap.put("title","（黑蚊香）首检确认表"); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProductController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProductController.java index 18103f5c..a9723b19 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProductController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProductController.java @@ -5,6 +5,7 @@ import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.StringUtils; import com.op.common.core.utils.bean.BeanUtils; +import com.op.common.core.utils.poi.ExcelCPReportMapUtil; import com.op.common.core.utils.poi.ExcelSCReportMapUtil; import com.op.common.core.utils.poi.ExcelUtil; import com.op.common.core.web.controller.BaseController; @@ -107,20 +108,21 @@ public class QcCheckReportProductController extends BaseController { @Log(title = "成品报告导出", businessType = BusinessType.EXPORT) @PostMapping("/CPReportExport") public void SCReportExport(HttpServletResponse response, QcCheckTaskIncome qcCheckTaskIncome) { - List list = qcCheckReportProductService.getCkeckProjectMap(qcCheckTaskIncome.getRecordId()); + List> list = qcCheckReportProductService.getCkeckProjectMap(qcCheckTaskIncome.getRecordId()); QcCheckReportIncome detailInfo = qcCheckReportProductService.selectQcCheckReportIncomeByRecordId(qcCheckTaskIncome.getRecordId()); Map detailMap = new HashMap<>(); detailMap.put("orderType",detailInfo.getOrderType()); detailMap.put("title","成品检验报告"); - detailMap.put("incomeBatchNo",detailInfo.getIncomeBatchNo()); detailMap.put("checkNo",detailInfo.getCheckNo()); + detailMap.put("incomeBatchNo",detailInfo.getIncomeBatchNo()); detailMap.put("materialCode",detailInfo.getMaterialCode()); detailMap.put("materialName",detailInfo.getMaterialName()); detailMap.put("checkLoc",detailInfo.getCheckLoc()); - detailMap.put("reason",detailInfo.getReason()); + detailMap.put("quality",detailInfo.getQuality().toString()); detailMap.put("checkType",detailInfo.getCheckType()); detailMap.put("standardNo",detailInfo.getStandardNo()); - detailMap.put("incomeTime",DateUtils.parseDateToStr("yyyy-MM-dd",detailInfo.getIncomeTime())); + detailMap.put("incomeTime",DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",detailInfo.getIncomeTime())); + detailMap.put("checkTime",DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",detailInfo.getCheckTime())); if(StringUtils.isNotBlank(detailInfo.getCheckResult())){ detailMap.put("checkResult",detailInfo.getCheckResult().equals("Y")?"√合格":"×不合格"); } @@ -130,11 +132,12 @@ public class QcCheckReportProductController extends BaseController { //表格结构数据 ArrayList excelCols = new ArrayList<>(); excelCols.add(new ExcelCol("检验项目", "projectRuleName", 30)); - excelCols.add(new ExcelCol("内容", "ruleName", 30)); + excelCols.add(new ExcelCol("标准要求", "checkStandard", 30)); + excelCols.add(new ExcelCol("抽检数(PC)", "samplePlan", 30)); excelCols.add(new ExcelCol("实际检测结果", "actualValue", 30)); excelCols.add(new ExcelCol("判定", "status", 30)); - excelCols.add(new ExcelCol("附件", "files", 30)); - String sheetName = "首检检验报告"; + + String sheetName = "成品检验报告"; SXSSFWorkbook workbook = null; try { //设置响应头 @@ -143,8 +146,8 @@ public class QcCheckReportProductController extends BaseController { response.setContentType("application/octet-stream;charset=UTF-8"); ServletOutputStream outputStream = response.getOutputStream(); //调用工具类 -// workbook = ExcelSCReportMapUtil.initWorkbook(sheetName, "-", excelCols, list, detailMap); -// workbook.write(outputStream); + workbook = ExcelCPReportMapUtil.initWorkbook(sheetName, "-", excelCols, list.get(0),list.get(1), detailMap); + workbook.write(outputStream); } catch (Exception e) { e.printStackTrace(); } finally { diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckReportProductService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckReportProductService.java index 8af51d2b..809f9818 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckReportProductService.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckReportProductService.java @@ -76,5 +76,5 @@ public interface IQcCheckReportProductService { public List getPrintData(QcCheckReportIncome qcCheckReportIncome); - List getCkeckProjectMap(String recordId); + List> getCkeckProjectMap(String recordId); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProductServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProductServiceImpl.java index 21408f3d..013bc3bf 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProductServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProductServiceImpl.java @@ -41,6 +41,8 @@ public class QcCheckReportProductServiceImpl implements IQcCheckReportProductSer private QcCheckTaskDetailMapper qcCheckTaskDetailMapper; @Autowired private QcStaticTableMapper qcStaticTableMapper; + @Autowired + private QMSFileMapper qmsFileMapper; /** * 查询来料检验 * @@ -227,17 +229,65 @@ public class QcCheckReportProductServiceImpl implements IQcCheckReportProductSer } @Override @DS("#header.poolName") - public List getCkeckProjectMap(String recordId) { + public List> getCkeckProjectMap(String recordId) { QcCheckTaskDetail qcCheckTaskDetail = new QcCheckTaskDetail(); qcCheckTaskDetail.setRecordId(recordId); List dtos = qcCheckReportIncomeMapper.getCkeckProjectList(qcCheckTaskDetail); - List maps = new ArrayList<>(); + for (QcCheckTaskDetail dto : dtos) { + if(com.op.common.core.utils.StringUtils.isNotBlank(dto.getSamplePlan())){ + dto.setSamplePlan(dto.getSamplePlan().replace(".00","")); + } + +// List files = qmsFileMapper.getBaseFileBatch(dto.getRecordId()); +// if (!CollectionUtils.isEmpty(files)) { +// dto.setFiles(files); +// } + //实测结果,定量的用测量值，定性的用remark + if(com.op.common.core.utils.StringUtils.isNotBlank(dto.getActualValue())){ + dto.setActualValue(dto.getActualValue()); + }else if(com.op.common.core.utils.StringUtils.isNotBlank(dto.getRemark())){ + dto.setActualValue(dto.getRemark()); + } + + if(com.op.common.core.utils.StringUtils.isNotBlank(dto.getActualValue()) && dto.getActualValue().equals("[\"/\"]")){ + dto.setStatus("未检验"); + } + + //检验项目 + String ruleName = dto.getRuleName(); + if(com.op.common.core.utils.StringUtils.isNotBlank(ruleName)){ + String projectRuleName0 = ruleName.split("]")[0]; + if(com.op.common.core.utils.StringUtils.isNotBlank(projectRuleName0)){ + dto.setProjectRuleName(projectRuleName0.replace("[","")); + } + } + } + List> listmaps = new ArrayList<>(); + List maps0 = new ArrayList<>(); + List maps1 = new ArrayList<>(); Map map = null; for(QcCheckTaskDetail dto:dtos){ map = new HashMap(); + map.put("projectRuleName",dto.getProjectRuleName()); + map.put("checkStandard",dto.getCheckStandard()); + map.put("samplePlan",dto.getSamplePlan()); + map.put("actualValue",dto.getActualValue()); + if("Y".equals(dto.getStatus())){ + map.put("status","合格"); + }else if("N".equals(dto.getStatus())){ + map.put("status","不合格"); + }else{ + map.put("status","/"); + } - maps.add(map); + if(dto.getItemType().equals("1")){ + maps0.add(map); + }else{ + maps1.add(map); + } } - return maps; + listmaps.add(maps0); + listmaps.add(maps1); + return listmaps; } }