Yangwl
/
LanJu_Mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

问题修复22

Browse Source
master
zhaoxiaolin 4 months ago
parent 54e8525ebc
commit ccfbf80a28
17 changed files with 1133 additions and 164 deletions
Show Stats Download Patch File Download Diff File

3
op-api/op-api-system/src/main/java/com/op/system/api/RemoteFileService.java
Unescape Escape View File

@ -4,6 +4,7 @@ import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.multipart.MultipartFile;
import com.op.common.core.constant.ServiceNameConstants;
@ -33,4 +34,6 @@ public interface RemoteFileService {
@PostMapping(value = "/getFile/{id}")
public InputStream getFile(@PathVariable("id") String id);
@PostMapping(value = "/downLoadFileByte")
public byte[] downLoadFileByte(@RequestBody SysFile sysFile);
}

5
op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteFileFallbackFactory.java
Unescape Escape View File

@ -33,6 +33,11 @@ public class RemoteFileFallbackFactory implements FallbackFactory<RemoteFileServ
public InputStream getFile(String id) {
return null;
}
@Override
public byte[] downLoadFileByte(SysFile sysFile) {
return new byte[0];
}
};
}
}

431
op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelReportMapUtil.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.op.common.core.utils.poi;
import com.alibaba.fastjson2.JSONObject;
import com.op.common.core.domain.ExcelCol;
import com.op.common.core.utils.DateUtils;
import org.apache.commons.compress.utils.IOUtils;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.util.CellRangeAddress;
@ -16,6 +17,7 @@ import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
/**
* Excel导出报告相关处理
@ -24,7 +26,7 @@ import java.util.List;
*/
public class ExcelReportMapUtil {
//下载
public static <T> SXSSFWorkbook initWorkbook(String sheetName , String title , List<ExcelCol> excelCol , List<T> data) throws IOException {
public static <T> SXSSFWorkbook initWorkbook(String sheetName , String title, List<ExcelCol> excelCol , List<T> data, Map<String,String> detailMap) throws IOException {
SXSSFWorkbook workbook = new SXSSFWorkbook();
int colSize = excelCol.size();
@ -35,136 +37,226 @@ public class ExcelReportMapUtil {
}else{
sheet = workbook.createSheet(sheetName);
}
if(title != null){
// 从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 row = sheet.getRow(0); // 获取第1行（索引为0）
if (row == null) {row = sheet.createRow(0); // 如果第1行不存在，则创建它
// 从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<13;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));
}
Cell cell = row.getCell(2); // 获取C列（索引为2）的单元格
if (cell == null) {
cell = row.createCell(2); // 如果C列的单元格不存在，则创建它
}
for(int d5=13;d5<(13+data.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));
}
cell.setCellValue("中山榄菊日化实业有限公司"); // 设置单元格的值
cell.setCellStyle(getTitelStyle(workbook)); // 应用样式到单元格
/**报告二级标题、检验标准**/
// 合并C3到I4的单元格，并设置样式
mergeAndStyleCells(sheet, new CellRangeAddress(2, 3, 2, 8), "包材检验报告");
// 合并J3到L4的单元格，并设置样式
mergeAndStyleCells(sheet, new CellRangeAddress(2, 3, 9, 12), "编码：07GL06C003-001A");
/**左右表格1**/
// 合并A5到B6的单元格，并设置样式和内容
mergeAndStyleCells2(sheet, new CellRangeAddress(4, 5, 0, 1), "包材检验报告", true, true, IndexedColors.GREY_25_PERCENT);
// 合并C5到D6的单元格，并设置样式（无背景色，只有边框和内容居中）
mergeAndStyleCells2(sheet, new CellRangeAddress(4, 5, 2, 3), "", true, false, null);
// 合并E5到F6的单元格，并设置样式和内容
mergeAndStyleCells2(sheet, new CellRangeAddress(4, 5, 4, 5), "生产批号", true, true, IndexedColors.GREY_25_PERCENT);
// 合并G5到I6的单元格，并设置样式（无背景色，只有边框和内容居中）
mergeAndStyleCells2(sheet, new CellRangeAddress(4, 5, 6, 8), "", true, false, null);
// 合并J5到K6的单元格，并设置样式和内容
mergeAndStyleCells2(sheet, new CellRangeAddress(4, 5, 9, 10), "报告编号", true, true, IndexedColors.GREY_25_PERCENT);
// 合并L5到N6的单元格，并设置样式（无背景色，只有边框和内容居中）
mergeAndStyleCells2(sheet, new CellRangeAddress(4, 5, 11, 13), "", true, false, null);
// // 将工作簿写入文件（或输出流）
// try (ByteArrayOutputStream fileOut = new ByteArrayOutputStream()) {
// workbook.write(fileOut);
// // 这里可以将fileOut.toByteArray()保存到文件或发送到其他地方
// // 例如：Files.write(Paths.get("output.xlsx"), fileOut.toByteArray());
// } catch (IOException e) {
// e.printStackTrace();
// } finally {
// try {
// workbook.close();
// } catch (IOException e) {
// e.printStackTrace();
// }
// }
// String[] title1s = title.split(",");
// int rangeVal = colSize/title1s.length;
// //创建主标题行(第一行)
// Row sheetTitleRow = sheet.createRow(0);
//
// Cell titleCell0 = sheetTitleRow.createCell(0);//创建第一行第一个单元格
// titleCell0.setCellValue("");//传值
// titleCell0.setCellStyle(getHeaderFont(sheet.getWorkbook()));//设置样式
//
// //遍历表头名称，创建表头单元格
// for (int i = 0; i < title1s.length; i++) {
// Cell titleCell = sheetTitleRow.createCell(i*rangeVal+1);//创建第一行第一个单元格
// titleCell.setCellValue(title1s[i]);//传值
// titleCell.setCellStyle(getHeaderFont(sheet.getWorkbook()));//设置样式
// if((i*rangeVal+1)!=(i+1)*rangeVal){
// //主标题行合并单元格
// CellRangeAddress cellAddresses = new CellRangeAddress(0, 0, i*rangeVal+1, (i+1)*rangeVal);
// sheet.addMergedRegion(cellAddresses);
// }
// }
//
// //创建表头行（第二行）
// Row sheetHeadRow = sheet.createRow(1);//1
// //遍历表头名称，创建表头单元格
// for (int i = 0; i < colSize; i++) {
// sheet.setColumnWidth(i, (excelCol.get(i).getWidth()) * 256);//宽度单位是字符的256分之一
// Cell headCell = sheetHeadRow.createCell(i);
// headCell.setCellValue(excelCol.get(i).getTitle());//传值
// headCell.setCellStyle(getHeaderFont(sheet.getWorkbook()));//设置样式
// }
// }else {
// //创建表头行（第二行）
// Row sheetHeadRow = sheet.createRow(0);//1
// //遍历表头名称，创建表头单元格
// for (int i = 0; i < colSize; i++) {
// sheet.setColumnWidth(i, (excelCol.get(i).getWidth()) * 256);//宽度单位是字符的256分之一
// Cell headCell = sheetHeadRow.createCell(i);
// headCell.setCellValue(excelCol.get(i).getTitle());//传值
// headCell.setCellStyle(getHeaderFont(sheet.getWorkbook()));//设置样式
// }
// }
//
// //将data中的值填充到excel
// int rowNum = sheet.getLastRowNum()+1;
// if(!CollectionUtils.isEmpty(data)){
// Iterator<T> iterator = data.iterator();
// //遍历数据
// for (;iterator.hasNext();){
// Row dataRow = sheet.createRow(rowNum);//创建行
// T obj = iterator.next();//获取当前行对应的数据
// JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(obj));
// for (int i = 0 ; i < colSize ; i++ ){
// Cell dataCell = dataRow.createCell(i);
// dataCell.setCellStyle(getDataFont(workbook));
// if(title!=null){//定量分析
// dataCell.setCellValue(getValue(jsonObject.get(excelCol.get(i).getField())));
// }else{
// if(i>=2){
// dataCell.setCellValue(getValueNum(jsonObject.get(excelCol.get(i).getField())));
// }else{
// dataCell.setCellValue(getValue(jsonObject.get(excelCol.get(i).getField())));
// }
// }
// }
// iterator.remove();
// rowNum++;
// }
}
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("productGroupName"), 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("incomeBatchNo"), 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("materialName"), 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("materialCode"), 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("supplierName"), 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("supplierCode"), 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("unit"), true, false, null);
Row row10 = sheet.getRow(10);
// 合并A7到B8的单元格，并设置样式和内容
mergeAndStyleCells2(sheet,row10, new CellRangeAddress(10, 11, 0, 1), "物料来源", true, true, IndexedColors.GREY_25_PERCENT);
// 合并C5到D6的单元格，并设置样式（无背景色，只有边框和内容居中）
mergeAndStyleCells2(sheet,row10, new CellRangeAddress(10, 11, 2, 3), detailMap.get("checkType"), true, false, null);
// 合并E5到F6的单元格，并设置样式和内容
mergeAndStyleCells2(sheet,row10, new CellRangeAddress(10, 11, 4, 5), "检验依据", true, true, IndexedColors.GREY_25_PERCENT);
// 合并G5到I6的单元格，并设置样式（无背景色，只有边框和内容居中）
mergeAndStyleCells2(sheet,row10, new CellRangeAddress(10, 11,6, 8), detailMap.get("standardNo"), true, false, null);
// 合并J5到K6的单元格，并设置样式和内容
mergeAndStyleCells2(sheet,row10, new CellRangeAddress(10, 11, 9, 10), "报检日期", true, true, IndexedColors.GREY_25_PERCENT);
// 合并L5到N6的单元格，并设置样式（无背景色，只有边框和内容居中）
mergeAndStyleCells2(sheet,row10, new CellRangeAddress(10, 11, 11, 13), detailMap.get("incomeTime"), true, false, null);
/**上下表格2**/
Row row12 = sheet.getRow(12);
if (row12 == null) {row12 = sheet.createRow(12);}
Cell cellA13 = row12.createCell(0);
cellA13.setCellValue("序号");
cellA13.setCellStyle(getRowStyle(sheet));
mergeAndStyleCells(sheet, new CellRangeAddress(12, 12, 1, 4), "检验项目");
mergeAndStyleCells(sheet, new CellRangeAddress(12, 12, 5, 8), "标准要求");
mergeAndStyleCells(sheet, new CellRangeAddress(12, 12, 9, 10), "实测结果");
Cell cellL13 = row12.createCell(11);
cellL13.setCellValue("判定");
cellL13.setCellStyle(getRowStyle(sheet));
mergeAndStyleCells(sheet, new CellRangeAddress(12, 12, 12, 13), "附件");
//将data中的值填充到excel
int rowNum = 13;
if(!CollectionUtils.isEmpty(data)){
Iterator<T> iterator = data.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-12);
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, 8));
Cell cellData3 = dataRow.getCell(9);
cellData3.setCellValue(getValue(jsonObject.get(excelCol.get(2).getField())));
cellData3.setCellStyle(getDataStyle(sheet));
sheet.addMergedRegion(new CellRangeAddress(rowNum, rowNum, 9, 10));
Cell cellData4 = dataRow.getCell(11);
cellData4.setCellValue(getValue(jsonObject.get(excelCol.get(3).getField())));
cellData4.setCellStyle(getDataStyle(sheet));
Cell cellData5 = dataRow.getCell(12);
cellData5.setCellValue(getValue(jsonObject.get(excelCol.get(4).getField())));
cellData5.setCellStyle(getDataStyle(sheet));
sheet.addMergedRegion(new CellRangeAddress(rowNum, rowNum, 12, 13));
iterator.remove();
rowNum++;
}
}
// 指定要检查的列索引（例如，B列的索引是1）
int columnIndex = 1;
// 遍历所有行，从第二行开始（索引1），因为第一行可能是标题行
for (int rowIndex = 13; 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++;
}
}
Row rowEnd1 = sheet.createRow(rowNum+2);
mergeAndStyleCellsNoBorder(sheet,rowEnd1, new CellRangeAddress(rowNum+2, rowNum+3, 0, 1), "综合检验结论", true, true, IndexedColors.GREY_25_PERCENT);
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);
return workbook;
}
@ -203,14 +295,14 @@ public class ExcelReportMapUtil {
// return cellStyle;
// }
//
// //处理数据
// public static String getValue(Object object){
// if (object==null){
// return "";
// }else {
// return object.toString();
// }
// }
//处理数据
public static String getValue(Object object){
if (object==null){
return "";
}else {
return object.toString();
}
}
// //处理数据
// public static Integer getValueNum(Object object){
// if (object==null){
@ -249,6 +341,44 @@ public class ExcelReportMapUtil {
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);
@ -280,7 +410,7 @@ public class ExcelReportMapUtil {
cell.setCellValue(cellValue); // 设置单元格的值
cell.setCellStyle(style); // 应用样式到单元格
}
private static void mergeAndStyleCells2(Sheet sheet, CellRangeAddress cellRangeAddress, String cellValue, boolean centered, boolean hasBackground, IndexedColors backgroundColor) {
private static void mergeAndStyleCells2(Sheet sheet,Row row, CellRangeAddress cellRangeAddress, String cellValue, boolean centered, boolean hasBackground, IndexedColors backgroundColor) {
// 合并单元格
sheet.addMergedRegion(cellRangeAddress);
@ -306,10 +436,33 @@ public class ExcelReportMapUtil {
style.setBorderTop(BorderStyle.THIN);
// 获取合并后的单元格的第一个单元格，并设置值
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 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());

492
op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelSCReportMapUtil.java
Unescape Escape View File

@ -0,0 +1,492 @@
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 ExcelSCReportMapUtil {
//下载
public static <T> SXSSFWorkbook initWorkbook(String sheetName , String title, List<ExcelCol> excelCol , List<T> data, Map<String,String> detailMap,List<byte[]> bytes) 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<11;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=11;d5<(11+data.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, 8), detailMap.get("materialName")+"/"+detailMap.get("checkLoc"), 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("materialCode"), 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("incomeTime"), 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, 13), detailMap.get("incomeBatchNo"), true, false, null);
// 合并J5到K6的单元格，并设置样式和内容
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, 13), detailMap.get("reason"), true, false, null);
/**上下表格2**///-------------------------------------------------
Row row10 = sheet.getRow(10);
if (row10 == null) {row10 = sheet.createRow(10);}
Cell cellA13 = row10.createCell(0);
cellA13.setCellValue("序号");
cellA13.setCellStyle(getRowStyle(sheet));
mergeAndStyleCells(sheet, new CellRangeAddress(10, 10, 1, 4), "检验项目");
mergeAndStyleCells(sheet, new CellRangeAddress(10, 10, 5, 8), "内容");
mergeAndStyleCells(sheet, new CellRangeAddress(10, 10, 9, 10), "实测结果");
Cell cellL13 = row10.createCell(11);
cellL13.setCellValue("判定");
cellL13.setCellStyle(getRowStyle(sheet));
mergeAndStyleCells(sheet, new CellRangeAddress(10, 10, 12, 13), "附件");
//将data中的值填充到excel
int rowNum = 11;
if(!CollectionUtils.isEmpty(data)){
Iterator<T> iterator = data.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-10);
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, 8));
Cell cellData3 = dataRow.getCell(9);
cellData3.setCellValue(getValue(jsonObject.get(excelCol.get(2).getField())));
cellData3.setCellStyle(getDataStyle(sheet));
sheet.addMergedRegion(new CellRangeAddress(rowNum, rowNum, 9, 10));
Cell cellData4 = dataRow.getCell(11);
cellData4.setCellValue(getValue(jsonObject.get(excelCol.get(3).getField())));
cellData4.setCellStyle(getDataStyle(sheet));
//Cell cellData5 = dataRow.getCell(12);
//cellData5.setCellValue(getValue(jsonObject.get(excelCol.get(4).getField())));
//cellData5.setCellStyle(getDataStyle(sheet));
//sheet.addMergedRegion(new CellRangeAddress(rowNum, rowNum, 12, 13));
// 下载图片
byte[] imageFileBytes = bytes.get(rowNum-11);
if (imageFileBytes != null) {
// 将图片添加到工作簿中
int picIdx = workbook.addPicture(imageFileBytes, Workbook.PICTURE_TYPE_JPEG); // 假设图片是JPEG格式，根据实际情况调整
// 创建绘图对象和锚点
CreationHelper fhelper = workbook.getCreationHelper();
Drawing<?> fdrawing = sheet.createDrawingPatriarch();
ClientAnchor fanchor = fhelper.createClientAnchor();
fanchor.setCol1(12); // 列索引从0开始，1表示第二列（B列）
fanchor.setRow1(rowNum); // 行索引从0开始，1表示第二行
fanchor.setCol2(14); // 14-12是列数
fanchor.setRow2(rowNum+1); //
// 插入图片到指定位置
Picture fpict =fdrawing.createPicture(fanchor, picIdx);
//fpict.resize(); // 根据图片的实际大小调整图片在Excel中的显示大小
}
iterator.remove();
rowNum++;
}
}
// 指定要检查的列索引（例如，B列的索引是1）
int columnIndex = 1;
// 遍历所有行，从第二行开始（索引1），因为第一行可能是标题行
for (int rowIndex = 11; 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++;
}
}
Row rowEnd0 = sheet.createRow(rowNum);
mergeAndStyleCellsNoBorder(sheet,rowEnd0, new CellRangeAddress(rowNum, rowNum+1, 0, 1), "备注", true, true, IndexedColors.GREY_25_PERCENT);
mergeAndStyleCellsNoBorder(sheet,rowEnd0, new CellRangeAddress(rowNum, rowNum+1, 2, 13), detailMap.get("remark"), true, true,null);
Row rowEnd1 = sheet.createRow(rowNum+2);
mergeAndStyleCellsNoBorder(sheet,rowEnd1, new CellRangeAddress(rowNum+2, rowNum+3, 0, 1), "综合检验结论", true, true, IndexedColors.GREY_25_PERCENT);
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);
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 = ExcelSCReportMapUtil.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;
}
}

7
op-modules/op-file/src/main/java/com/op/file/controller/SysFileController.java
Unescape Escape View File

@ -14,6 +14,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
@ -113,6 +114,12 @@ public class SysFileController {
}
}
@PostMapping("/downLoadFileByte")
public byte[] downLoadFileByte(@RequestBody SysFile sysFile) {
byte[] io = sysFileService.imageOnline(sysFile.getUrl());
return io;
}
// 转byte[]
public static byte[] toByteArray(InputStream input) throws IOException {
ByteArrayOutputStream output = new ByteArrayOutputStream();

3
op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java
Unescape Escape View File

@ -18,6 +18,7 @@ import com.op.system.api.domain.dto.BaseBomDTO;
import com.op.system.api.domain.mes.BaseProductDTO;
import com.op.system.api.domain.mes.BaseTeamTDTO;
import org.apache.commons.lang.StringUtils;
import org.apache.poi.util.StringUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -391,7 +392,7 @@ public class MesReportWorkConsumeServiceImpl implements IMesReportWorkConsumeSer
mesReportWorkConsume.setWorkorderCode(sonWorkOrder.getWorkorderCode());
List<MesReportWorkConsume> liblist = mesReportWorkConsumeMapper.getConsumeList(mesReportWorkConsume);
for(MesReportWorkConsume lib:liblist){
lib.setQuantitySplitBom(actPro.multiply(new BigDecimal(lib.getErfmg()))
lib.setQuantitySplitBom(actPro.multiply(new BigDecimal(StringUtils.isBlank(lib.getErfmg())?"1":lib.getErfmg()))
.divide(planPro,6,BigDecimal.ROUND_HALF_UP));
}
sTabs.setLibList(liblist);

78
op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProduceController.java
Unescape Escape View File

@ -1,6 +1,10 @@
package com.op.quality.controller;
import com.op.common.core.domain.ExcelCol;
import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.StringUtils;
import com.op.common.core.utils.poi.ExcelReportMapUtil;
import com.op.common.core.utils.poi.ExcelSCReportMapUtil;
import com.op.common.core.utils.poi.ExcelUtil;
import com.op.common.core.web.controller.BaseController;
import com.op.common.core.web.domain.AjaxResult;
@ -11,15 +15,22 @@ import com.op.common.security.annotation.RequiresPermissions;
import com.op.common.security.utils.SecurityUtils;
import com.op.quality.domain.*;
import com.op.quality.service.IQcCheckReportProduceService;
import com.op.system.api.RemoteFileService;
import com.op.system.api.domain.SysFile;
import com.op.system.api.domain.SysUser;
import org.apache.commons.lang.StringUtils;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 来料检验Controller
@ -32,7 +43,8 @@ import java.util.List;
public class QcCheckReportProduceController extends BaseController {
@Autowired
private IQcCheckReportProduceService qcCheckReportProduceService;
@Autowired
private RemoteFileService remoteFileService;
/**
* 查询来料检验列表
*/
@ -49,7 +61,6 @@ public class QcCheckReportProduceController extends BaseController {
// String dateEndStr = dtf.format(dateEnd)+" 00:00:00";
// qcCheckReportIncome.setCheckTimeEnd(dateEndStr);//end
// }
startPage();
List<QcCheckReportIncome> list = qcCheckReportProduceService.selectQcCheckReportIncomeList(qcCheckReportIncome);
return getDataTable(list);
@ -82,7 +93,68 @@ public class QcCheckReportProduceController extends BaseController {
ExcelUtil<QcCheckReportIncome> util = new ExcelUtil<QcCheckReportIncome>(QcCheckReportIncome.class);
util.exportExcel(response, list, "生产过程检验报告明细");
}
@RequiresPermissions("quality:produceReport:export")
@Log(title = "首检报告导出", businessType = BusinessType.EXPORT)
@PostMapping("/SCReportExport")
public void SCReportExport(HttpServletResponse response, QcCheckTaskIncome qcCheckTaskIncome) {
List<Map> list = qcCheckReportProduceService.getCkeckProjectMap(qcCheckTaskIncome.getRecordId());
List<byte[]> bytes = new ArrayList<>();//图片
SysFile sysFile = null;
for(Map mapdto:list){
sysFile = new SysFile();
if(mapdto.get("files")!=null){
sysFile.setUrl(mapdto.get("files").toString());
byte[] byte0 = remoteFileService.downLoadFileByte(sysFile);
bytes.add(byte0);
}else{
bytes.add(null);
}
}
QcCheckReportIncome detailInfo = qcCheckReportProduceService.selectQcCheckReportIncomeByRecordId(qcCheckTaskIncome.getRecordId());
Map<String,String> detailMap = new HashMap<>();
detailMap.put("orderType",detailInfo.getOrderType());
detailMap.put("title","（黑蚊香）首检确认表");
detailMap.put("incomeBatchNo",detailInfo.getIncomeBatchNo());
detailMap.put("checkNo",detailInfo.getCheckNo());
detailMap.put("materialCode",detailInfo.getMaterialCode());
detailMap.put("materialName",detailInfo.getMaterialName());
detailMap.put("checkLoc",detailInfo.getCheckLoc());
detailMap.put("reason",detailInfo.getReason());
detailMap.put("checkType",detailInfo.getCheckType());
detailMap.put("standardNo",detailInfo.getStandardNo());
detailMap.put("incomeTime",DateUtils.parseDateToStr("yyyy-MM-dd",detailInfo.getIncomeTime()));
if(StringUtils.isNotBlank(detailInfo.getCheckResult())){
detailMap.put("checkResult",detailInfo.getCheckResult().equals("Y")?"√合格":"×不合格");
}
detailMap.put("checkManName",detailInfo.getCheckManName());
detailMap.put("remark",detailInfo.getRemark());
//表格结构数据
ArrayList<ExcelCol> excelCols = new ArrayList<>();
excelCols.add(new ExcelCol("检验项目", "projectRuleName", 30));
excelCols.add(new ExcelCol("内容", "ruleName", 30));
excelCols.add(new ExcelCol("实际检测结果", "actualValue", 30));
excelCols.add(new ExcelCol("判定", "status", 30));
excelCols.add(new ExcelCol("附件", "files", 30));
String sheetName = "首检检验报告";
SXSSFWorkbook workbook = null;
try {
//设置响应头
response.setHeader("Content-disposition",
"attachment; filename=" + sheetName);
response.setContentType("application/octet-stream;charset=UTF-8");
ServletOutputStream outputStream = response.getOutputStream();
//调用工具类
workbook = ExcelSCReportMapUtil.initWorkbook(sheetName, "-", excelCols, list, detailMap,bytes);
workbook.write(outputStream);
} catch (Exception e) {
e.printStackTrace();
} finally {
if (workbook != null) {
workbook.dispose();
}
}
}
/**
* 获取来料检验详细信息
*/

58
op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProductController.java
Unescape Escape View File

@ -1,8 +1,11 @@
package com.op.quality.controller;
import com.op.common.core.domain.ExcelCol;
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.ExcelSCReportMapUtil;
import com.op.common.core.utils.poi.ExcelUtil;
import com.op.common.core.web.controller.BaseController;
import com.op.common.core.web.domain.AjaxResult;
@ -13,16 +16,20 @@ import com.op.common.security.annotation.RequiresPermissions;
import com.op.common.security.utils.SecurityUtils;
import com.op.quality.domain.*;
import com.op.quality.service.IQcCheckReportProductService;
import com.op.system.api.domain.SysFile;
import com.op.system.api.domain.SysUser;
import org.apache.commons.lang.StringUtils;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 来料检验Controller
@ -96,7 +103,56 @@ public class QcCheckReportProductController extends BaseController {
ExcelUtil<ProductReportDTO> util = new ExcelUtil<ProductReportDTO>(ProductReportDTO.class);
util.exportExcel(response, list, "成品检验报告明细数据");
}
@RequiresPermissions("quality:productReport:export")
@Log(title = "成品报告导出", businessType = BusinessType.EXPORT)
@PostMapping("/CPReportExport")
public void SCReportExport(HttpServletResponse response, QcCheckTaskIncome qcCheckTaskIncome) {
List<Map> list = qcCheckReportProductService.getCkeckProjectMap(qcCheckTaskIncome.getRecordId());
QcCheckReportIncome detailInfo = qcCheckReportProductService.selectQcCheckReportIncomeByRecordId(qcCheckTaskIncome.getRecordId());
Map<String,String> detailMap = new HashMap<>();
detailMap.put("orderType",detailInfo.getOrderType());
detailMap.put("title","成品检验报告");
detailMap.put("incomeBatchNo",detailInfo.getIncomeBatchNo());
detailMap.put("checkNo",detailInfo.getCheckNo());
detailMap.put("materialCode",detailInfo.getMaterialCode());
detailMap.put("materialName",detailInfo.getMaterialName());
detailMap.put("checkLoc",detailInfo.getCheckLoc());
detailMap.put("reason",detailInfo.getReason());
detailMap.put("checkType",detailInfo.getCheckType());
detailMap.put("standardNo",detailInfo.getStandardNo());
detailMap.put("incomeTime",DateUtils.parseDateToStr("yyyy-MM-dd",detailInfo.getIncomeTime()));
if(StringUtils.isNotBlank(detailInfo.getCheckResult())){
detailMap.put("checkResult",detailInfo.getCheckResult().equals("Y")?"√合格":"×不合格");
}
detailMap.put("checkManName",detailInfo.getCheckManName());
detailMap.put("remark",detailInfo.getRemark());
//表格结构数据
ArrayList<ExcelCol> excelCols = new ArrayList<>();
excelCols.add(new ExcelCol("检验项目", "projectRuleName", 30));
excelCols.add(new ExcelCol("内容", "ruleName", 30));
excelCols.add(new ExcelCol("实际检测结果", "actualValue", 30));
excelCols.add(new ExcelCol("判定", "status", 30));
excelCols.add(new ExcelCol("附件", "files", 30));
String sheetName = "首检检验报告";
SXSSFWorkbook workbook = null;
try {
//设置响应头
response.setHeader("Content-disposition",
"attachment; filename=" + sheetName);
response.setContentType("application/octet-stream;charset=UTF-8");
ServletOutputStream outputStream = response.getOutputStream();
//调用工具类
// workbook = ExcelSCReportMapUtil.initWorkbook(sheetName, "-", excelCols, list, detailMap);
// workbook.write(outputStream);
} catch (Exception e) {
e.printStackTrace();
} finally {
if (workbook != null) {
workbook.dispose();
}
}
}
/**
* 获取来料检验详细信息
*/

48
op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java
Unescape Escape View File

@ -13,7 +13,7 @@ import javax.annotation.Resource;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.op.quality.service.IQcCheckReportIncomeService;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
@ -24,7 +24,6 @@ import com.op.common.core.domain.ExcelCol;
import com.op.common.core.domain.R;
import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.bean.BeanUtils;
import com.op.common.core.utils.poi.ExcelMapUtil;
import com.op.common.core.utils.poi.ExcelReportMapUtil;
import com.op.common.datasource.creator.DynamicDatasourceCreator;
import com.op.common.security.utils.SecurityUtils;
@ -69,6 +68,9 @@ public class QcCheckTaskIncomeController extends BaseController {
@Autowired
private IQcCheckTaskIncomeService qcCheckTaskIncomeService;
@Autowired
private IQcCheckReportIncomeService qcCheckReportIncomeService;
@Autowired
private RemoteUserService remoteUserService;
@ -137,19 +139,37 @@ public class QcCheckTaskIncomeController extends BaseController {
@Log(title = "来料检验报告导出", businessType = BusinessType.EXPORT)
@PostMapping("/reportExport")
public void reportExport(HttpServletResponse response, QcCheckTaskIncome qcCheckTaskIncome) {
List<HashMap> list = new ArrayList<>();
List<String> title2Cols = new ArrayList<>();
String titleRow1 = "来料检验报告row";
List<Map> list = qcCheckTaskIncomeService.getCkeckProjectMapList(qcCheckTaskIncome);
QcCheckReportIncome detailInfo = qcCheckReportIncomeService.selectQcCheckReportIncomeByRecordId(qcCheckTaskIncome.getRecordId());
Map<String,String> detailMap = new HashMap<>();
detailMap.put("orderType",detailInfo.getOrderType());
if(detailInfo.getOrderType().equals("bp")){
detailMap.put("title","白坯检验报告");
}else{
detailMap.put("title","包材检验报告");
}
detailMap.put("productGroupName",detailInfo.getProductGroupName());
detailMap.put("incomeBatchNo",detailInfo.getIncomeBatchNo());
detailMap.put("checkNo",detailInfo.getCheckNo());
detailMap.put("materialCode",detailInfo.getMaterialCode());
detailMap.put("materialName",detailInfo.getMaterialName());
detailMap.put("supplierName",detailInfo.getSupplierName());
detailMap.put("supplierCode",detailInfo.getSupplierCode());
detailMap.put("quality",detailInfo.getQuality().toString());
detailMap.put("unit",detailInfo.getUnit());
detailMap.put("checkType",detailInfo.getCheckType());
detailMap.put("standardNo",detailInfo.getStandardNo());
detailMap.put("incomeTime",DateUtils.parseDateToStr("yyyy-MM-dd",detailInfo.getIncomeTime()));
detailMap.put("checkResult",detailInfo.getCheckResult().equals("Y")?"√合格":"×不合格");
detailMap.put("checkManName",detailInfo.getCheckManName());
//表格结构数据
ArrayList<ExcelCol> excelCols = new ArrayList<>();
excelCols.add(new ExcelCol("CPK品类", "cpkTypeName", 30));
excelCols.add(new ExcelCol("线体名称", "lineName", 30));
excelCols.add(new ExcelCol("检验节点", "checkTypeName", 30));
excelCols.add(new ExcelCol("检测项", "ruleName", 30));
for (int n = 0; n < title2Cols.size(); n++) {
excelCols.add(new ExcelCol(title2Cols.get(n), "date" + (n+1), 20));
}
excelCols.add(new ExcelCol("平均值", "cpkAvg", 30));
excelCols.add(new ExcelCol("检验项目", "ruleName", 30));
excelCols.add(new ExcelCol("标准要求", "checkStandard", 30));
excelCols.add(new ExcelCol("实测结果", "actualValue", 30));
excelCols.add(new ExcelCol("判定", "status", 30));
excelCols.add(new ExcelCol("附件", "fileUrls", 30));
String sheetName = "来料检验报告";
SXSSFWorkbook workbook = null;
try {
@ -159,7 +179,7 @@ public class QcCheckTaskIncomeController extends BaseController {
response.setContentType("application/octet-stream;charset=UTF-8");
ServletOutputStream outputStream = response.getOutputStream();
//调用工具类
workbook = ExcelReportMapUtil.initWorkbook(sheetName, titleRow1, excelCols, list);
workbook = ExcelReportMapUtil.initWorkbook(sheetName, "未启用", excelCols, list, detailMap);
workbook.write(outputStream);
} catch (Exception e) {
e.printStackTrace();

10
op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java
Unescape Escape View File

@ -54,7 +54,7 @@ public class QcCheckReportIncome extends BaseEntity {
*/
@Excel(name = "物料名称")
private String materialName;
private String productGroupName;
/**
* 收货数量
*/
@ -618,6 +618,14 @@ public class QcCheckReportIncome extends BaseEntity {
return delFlag;
}
public String getProductGroupName() {
return productGroupName;
}
public void setProductGroupName(String productGroupName) {
this.productGroupName = productGroupName;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

3
op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckReportProduceService.java
Unescape Escape View File

@ -4,6 +4,7 @@ import com.op.quality.domain.*;
import com.op.system.api.domain.SysUser;
import java.util.List;
import java.util.Map;
/**
* 生产过程报告Service接口
@ -75,4 +76,6 @@ public interface IQcCheckReportProduceService {
QcCheckReportIncome getTaskInfo(QcCheckReportIncome qcCheckReportIncome);
int submitConfirm(QcCheckReportIncome qcCheckReportIncome);
List<Map> getCkeckProjectMap(String recordId);
}

3
op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckReportProductService.java
Unescape Escape View File

@ -7,6 +7,7 @@ import com.op.quality.domain.QcSupplier;
import com.op.system.api.domain.SysUser;
import java.util.List;
import java.util.Map;
/**
* 成品入库报告Service接口
@ -74,4 +75,6 @@ public interface IQcCheckReportProductService {
List<QcCheckTaskDetail> getCkeckProjectList(QcCheckTaskDetail qcCheckTaskDetail);
public List<QcCheckReportIncome> getPrintData(QcCheckReportIncome qcCheckReportIncome);
List<Map> getCkeckProjectMap(String recordId);
}

3
op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskIncomeService.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.op.quality.service;
import java.util.Date;
import java.util.List;
import java.util.Map;
import com.op.quality.domain.*;
import com.op.system.api.domain.SysUser;
@ -119,4 +120,6 @@ public interface IQcCheckTaskIncomeService {
int changeTaskDetail(QcCheckTaskIncome task);
List<QcCheckTaskIncome> getWarehouseList(QcCheckTaskIncome task);
List<Map> getCkeckProjectMapList(QcCheckTaskIncome qcCheckTaskIncome);
}

96
op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java
Unescape Escape View File

@ -8,6 +8,8 @@ import com.op.quality.domain.*;
import com.op.quality.mapper.*;
import com.op.quality.service.IQcCheckReportProduceService;
import com.op.quality.service.IQcStaticTableService;
import com.op.system.api.RemoteFileService;
import com.op.system.api.domain.SysFile;
import com.op.system.api.domain.SysUser;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
@ -22,6 +24,8 @@ import javax.servlet.http.HttpServletRequest;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
/**
@ -48,7 +52,8 @@ public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceSer
private QcCheckTaskDetailMapper qcCheckTaskDetailMapper;
@Autowired
private IQcStaticTableService qcStaticTableService;
@Autowired
private QMSFileMapper qmsFileMapper;
/**
* 查询来生产过程中验
*
@ -211,6 +216,77 @@ public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceSer
return qcCheckReportIncomeMapper.getCkeckProjectList(qcCheckTaskDetail);
}
@Override
@DS("#header.poolName")
public List<Map> getCkeckProjectMap(String recordId) {
QcCheckTaskDetail qcCheckTaskDetail = new QcCheckTaskDetail();
qcCheckTaskDetail.setRecordId(recordId);
List<QcCheckTaskDetail> dtos = qcCheckReportIncomeMapper.getCkeckProjectList(qcCheckTaskDetail);
for (QcCheckTaskDetail dto : dtos) {
if(com.op.common.core.utils.StringUtils.isNotBlank(dto.getSamplePlan())){
dto.setSamplePlan(dto.getSamplePlan().replace(".00",""));
}
List<BaseFile> files = qmsFileMapper.getBaseFileBatch(dto.getRecordId());
if (!CollectionUtils.isEmpty(files)) {
dto.setFiles(files);
}
//实测结果,定量的用测量值，定性的用remark
if(StringUtils.isNotBlank(dto.getActualValue())){
dto.setActualValue(dto.getActualValue());
}else if(com.op.common.core.utils.StringUtils.isNotBlank(dto.getRemark())){
dto.setActualValue(dto.getRemark());
}
if(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("[",""));
}
}
}
// 定义正则表达式，匹配id=后面的内容直到&fileName之前的部分
String regex = "id=([^&]+)&fileName";
// 创建Pattern对象
Pattern pattern = Pattern.compile(regex);
List<Map> maps = new ArrayList<>();
int n = 1;
for(QcCheckTaskDetail dto:dtos){
Map mapdto = new HashMap();
mapdto.put("xh",n++);
mapdto.put("projectRuleName",dto.getProjectRuleName());
mapdto.put("ruleName",dto.getRuleName());
mapdto.put("actualValue",dto.getActualValue());
if(dto.getStatus().equals("Y")){
mapdto.put("status","✓");
}else if(dto.getStatus().equals("N")){
mapdto.put("status","✘");
}
if(!CollectionUtils.isEmpty(dto.getFiles())){
// 创建Matcher对象
Matcher matcher = pattern.matcher(dto.getFiles().get(0).getFileAddress());
// 查找匹配项
if (matcher.find()) {
// 提取括号内的内容，即id=和&fileName之间的部分
String value = matcher.group(1);
mapdto.put("files",value);
}
}else{
mapdto.put("files",null);
}
maps.add(mapdto);
}
return maps;
}
@Override
@DS("#header.poolName")
public QcCheckTaskProduce getProduceReportXJ(QcCheckTaskProduce qcCheckTaskProduce) {
@ -327,5 +403,23 @@ public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceSer
}
return 0;
}
public static void main(String args[]){
String input = "http://192.168.202.34:30000/prod-api/file/downLoadFile?id=6751554b850718721ec2c04c&fileName=17333839494841.png";
// 定义正则表达式，匹配id=后面的内容直到&fileName之前的部分
String regex = "id=([^&]+)&fileName";
// 创建Pattern对象
Pattern pattern = Pattern.compile(regex);
// 创建Matcher对象
Matcher matcher = pattern.matcher(input);
// 查找匹配项
if (matcher.find()) {
// 提取括号内的内容，即id=和&fileName之间的部分
String value = matcher.group(1);
System.out.println("Extracted value: " + value);
} else {
System.out.println("No match found.");
}
}
}

20
op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProductServiceImpl.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.op.quality.service.impl;
import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.uuid.IdUtils;
@ -17,8 +18,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.*;
/**
* 来料检验Service业务层处理
@ -225,5 +225,19 @@ public class QcCheckReportProductServiceImpl implements IQcCheckReportProductSer
public List<QcCheckReportIncome> getPrintData(QcCheckReportIncome qcCheckReportIncome) {
return null;
}
@Override
@DS("#header.poolName")
public List<Map> getCkeckProjectMap(String recordId) {
QcCheckTaskDetail qcCheckTaskDetail = new QcCheckTaskDetail();
qcCheckTaskDetail.setRecordId(recordId);
List<QcCheckTaskDetail> dtos = qcCheckReportIncomeMapper.getCkeckProjectList(qcCheckTaskDetail);
List<Map> maps = new ArrayList<>();
Map map = null;
for(QcCheckTaskDetail dto:dtos){
map = new HashMap();
maps.add(map);
}
return maps;
}
}

33
op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
Unescape Escape View File

@ -1385,6 +1385,39 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
return qcCheckTaskIncomeMapper.getWarehouseList();
}
@Override
@DS("#header.poolName")
public List<Map> getCkeckProjectMapList(QcCheckTaskIncome qcCheckTaskIncome) {
QcCheckTaskDetail qcCheckTaskDetail = new QcCheckTaskDetail();
qcCheckTaskDetail.setBelongTo(qcCheckTaskIncome.getRecordId());//TODO
List<QcCheckTaskDetail> dtos = qcCheckTaskIncomeMapper.getCkeckProjectList(qcCheckTaskDetail);
List<Map> mapDtos = new ArrayList<>();
for(QcCheckTaskDetail detail:dtos){
Map mapdto = new HashMap();
mapdto.put("ruleName",detail.getRuleName());
mapdto.put("checkStandard",detail.getCheckStandard());
mapdto.put("actualValue",detail.getActualValue());
if("Y".equals(detail.getStatus())){
mapdto.put("status","合格");
}else if("N".equals(detail.getStatus())){
mapdto.put("status","不合格");
}else{
mapdto.put("status","/");
}
List<BaseFile> files = qmsFileMapper.getBaseFileBatch(detail.getRecordId());
if (!CollectionUtils.isEmpty(files)) {
List<String> urls = files.stream().map(BaseFile::getFileAddress).collect(Collectors.toList());
detail.setFiles(files);
detail.setFileUrls(urls);
mapdto.put("fileUrls",urls);
}
mapDtos.add(mapdto);
}
return mapDtos;
}
public static void main(String args[]){
String actualValueStr = "[\"1:0.03\",\"2:0\",\"3:0.34\"]";
try {

4
op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml
Unescape Escape View File

@ -46,6 +46,8 @@
<result property="workorderCodeSap" column="workorder_code_sap"/>
<result property="modelType" column="modelType"/>
<result property="remark" column="remark"/>
<result property="productGroupName" column="product_group_name"/>
</resultMap>
<sql id="selectQcCheckReportIncomeVo">
@ -101,7 +103,7 @@
qct.check_status, qct.check_man_code, qct.check_man_name,
qct.check_time, qct.check_result, qct.status, qct.check_type, qct.attr1, qct.attr2, qct.attr3, qct.attr4,
qct.create_by, qct.create_time, qct.update_by, qct.update_time,
qct.factory_code, qct.del_flag,qct.reason,qct.product_type,bp.product_group_name order_type,qct.jgy,qct.pgy,qct.cxzz,
qct.factory_code, qct.del_flag,qct.reason,qct.product_type,qct.order_type,bp.product_group_name,qct.jgy,qct.pgy,qct.cxzz,
ISNULL(bp.mvgr5, '09JS08S-048B') standardNo
from qc_check_task qct
left join base_product bp on bp.product_code = qct.material_code

Write Preview
Loading…
Cancel
Save