82705-修改

This commit is contained in:
wangzhijiang
2024-03-12 18:46:38 +08:00
parent 221702f89f
commit 39febc2f13
@@ -573,10 +573,10 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl<SarFileCompareInf
int i = 1; int i = 1;
for (SarFileCompareItem sarFileCompareItem : leftData) { for (SarFileCompareItem sarFileCompareItem : leftData) {
HSSFRow row1 = sheetItemsLeft.createRow(i); HSSFRow row1 = sheetItemsLeft.createRow(i);
String numberLeft = StringUtils.isNotEmpty(sfcInfo.getSerialNumberLeft()) ? sfcInfo.getSerialNumberLeft():""; // String numberLeft = StringUtils.isNotEmpty(sfcInfo.getSerialNumberLeft()) ? sfcInfo.getSerialNumberLeft():"";
String titleLeft = StringUtils.isNotEmpty(sfcInfo.getTitleLeft()) ? sfcInfo.getTitleLeft():""; // String titleLeft = StringUtils.isNotEmpty(sfcInfo.getTitleLeft()) ? sfcInfo.getTitleLeft():"";
row1.createCell(0).setCellValue(numberLeft + " " +titleLeft); row1.createCell(0).setCellValue(sarFileCompareItem.getItemsNum());
row1.createCell(1).setCellValue(sarFileCompareItem.getItemsNum()); row1.createCell(1).setCellValue(sarFileCompareItem.getItemsName());
row1.getCell(1).setCellStyle(cellStyleBase); row1.getCell(1).setCellStyle(cellStyleBase);
String itemContent = sarFileCompareItem.getItemsText(); String itemContent = sarFileCompareItem.getItemsText();
@@ -680,10 +680,10 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl<SarFileCompareInf
for (SarFileCompareItem sarFileCompareItem : rightData) { for (SarFileCompareItem sarFileCompareItem : rightData) {
HSSFRow row1 = sheetItemsRight.createRow(i); HSSFRow row1 = sheetItemsRight.createRow(i);
String numberRight = StringUtils.isNotEmpty(sfcInfo.getSerialNumberRight()) ? sfcInfo.getSerialNumberRight():""; // String numberRight = StringUtils.isNotEmpty(sfcInfo.getSerialNumberRight()) ? sfcInfo.getSerialNumberRight():"";
String titleRight = StringUtils.isNotEmpty(sfcInfo.getTitleRight()) ? sfcInfo.getTitleRight():""; // String titleRight = StringUtils.isNotEmpty(sfcInfo.getTitleRight()) ? sfcInfo.getTitleRight():"";
row1.createCell(0).setCellValue(numberRight + " " +titleRight); row1.createCell(0).setCellValue(sarFileCompareItem.getItemsNum());
row1.createCell(1).setCellValue(sarFileCompareItem.getItemsNum()); row1.createCell(1).setCellValue(sarFileCompareItem.getItemsName());
row1.getCell(1).setCellStyle(cellStyleBase); row1.getCell(1).setCellStyle(cellStyleBase);
String itemContent = sarFileCompareItem.getItemsText(); String itemContent = sarFileCompareItem.getItemsText();