ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(自定义对比): 78403

Browse Source
This commit is contained in:
yjz
2023-11-14 16:56:23 +08:00
parent e317fa7387
commit d57a3688e2
1 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareInfoServiceImpl.java
+29 -2
View File
@@ -446,7 +446,7 @@ public class LawsCustomCompareInfoServiceImpl extends ServiceImpl<LawsCustomComp
if (i == 2){ if (i == 2){
// 特点列 // 特点列
createFeatureColumn(standardVOS, featureList, indexRow, indexCell, cellStyle); createFeatureColumn(standardVOS, featureList, indexRow, indexCell, cellStyle, sheet);
}else { }else {
// 普通列 // 普通列
/** /**
@@ -467,10 +467,14 @@ public class LawsCustomCompareInfoServiceImpl extends ServiceImpl<LawsCustomComp
&& Objects.equals(standardVO.getId(), v.getStandardId()) && Objects.equals(standardVO.getId(), v.getStandardId())
&& Objects.equals(compareList.get(finalI - 3).getId(), v.getCompareItemId())) && Objects.equals(compareList.get(finalI - 3).getId(), v.getCompareItemId()))
.findFirst(); .findFirst();
int finalIndex = index;
cellOptional.ifPresent(v -> { cellOptional.ifPresent(v -> {
cell.setCellValue(v.getContent()); cell.setCellValue(v.getContent());
// 处理文件 // 处理文件
writeFile(v); writeFile(v);
// 对比分析结果
int allSize = featureList.size() * standardVOS.size();
setCompareResult(finalIndex, allSize, indexRow, compareList, cellStyle, finalI);
}); });
} }
} }
@@ -478,6 +482,18 @@ public class LawsCustomCompareInfoServiceImpl extends ServiceImpl<LawsCustomComp
} }
} }
private void setCompareResult(int finalIndex, int allSize, Row indexRow, List<LawsCustomCompareInventory> compareList, CellStyle cellStyle, int finalI) {
// 最后一列
if (finalIndex == allSize){
// 对比分析结果
Cell cellEnd = indexRow.createCell(finalIndex + 1);
cellEnd.setCellStyle(cellStyle);
if (StringUtils.isNotBlank(compareList.get(finalI - 3).getCompareResult())){
cellEnd.setCellValue(compareList.get(finalI - 3).getCompareResult());
}
}
}
private void writeFile(LawsCustomCompareCell v) { private void writeFile(LawsCustomCompareCell v) {
if (StringUtils.isNotBlank(v.getFileId())){ if (StringUtils.isNotBlank(v.getFileId())){
OSSFile ossFile = iossFileService.getById(v.getFileId()); OSSFile ossFile = iossFileService.getById(v.getFileId());
@@ -528,7 +544,7 @@ public class LawsCustomCompareInfoServiceImpl extends ServiceImpl<LawsCustomComp
* } * }
*/ */
private static void createFeatureColumn(List<StandardVO> standardVOS, List<LawsCustomCompareInventory> featureList, Row indexRow, Cell indexCell, CellStyle cellStyle) { private static void createFeatureColumn(List<StandardVO> standardVOS, List<LawsCustomCompareInventory> featureList, Row indexRow, Cell indexCell, CellStyle cellStyle, XSSFSheet sheet) {
indexCell.setCellValue("特点/对比项"); indexCell.setCellValue("特点/对比项");
// 计算列数量 // 计算列数量
int index = 0; int index = 0;
@@ -539,6 +555,17 @@ public class LawsCustomCompareInfoServiceImpl extends ServiceImpl<LawsCustomComp
Cell cell = indexRow.createCell(index); Cell cell = indexRow.createCell(index);
cell.setCellValue(lawsCustomCompareInventory.getCellTitle()); cell.setCellValue(lawsCustomCompareInventory.getCellTitle());
cell.setCellStyle(cellStyle); cell.setCellStyle(cellStyle);
// 对比分析结果
if (index == featureList.size() * standardVOS.size()){
Row row = sheet.getRow(0);
Cell cellEnd = row.createCell(index + 1);
cellEnd.setCellStyle(cellStyle);
cellEnd.setCellValue("对比分析结果");
// 合并单元格
CellRangeAddress region = new CellRangeAddress(0, 2, index + 1, index + 1);
sheet.addMergedRegionUnsafe(region);
}
} }
} }
} }