This commit is contained in:
linfso 2024-07-23 07:22:27 +08:00
parent 97577b6f2d
commit 6ce66ac16e
2 changed files with 14 additions and 13 deletions

View File

@ -41,6 +41,8 @@
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.5.0" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.5.0" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.5.0" level="project" />
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.3" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.9" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.5.0" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.5.0" level="project" />

View File

@ -1,6 +1,5 @@
package com.xdadan.erp.emis.service.billexport;
import com.xdadan.erp.emis.service.billexport.DynamicDataMapping;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.CellCopyPolicy;
import org.apache.poi.ss.usermodel.Workbook;
@ -128,8 +127,8 @@ public class ExcelTemplateProc {
return;
}
for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++) {
XSSFCell cell = row.getCell(i);
fillInTemplateCellDataValue(cell, dataPrefix, dataMap);
// XSSFCell cell = row.getCell(i);
// fillInTemplateCellDataValue(cell, dataPrefix, dataMap);
}
}
@ -162,7 +161,7 @@ public class ExcelTemplateProc {
}
}
if (flag) {
cell.setCellValue(cellValue);
// cell.setCellValue(cellValue);
}
}
@ -179,15 +178,15 @@ public class ExcelTemplateProc {
return null;
}
for (int j = row.getFirstCellNum(); j < row.getLastCellNum(); j++) {
XSSFCell cell = row.getCell(j);
String value = cell.getStringCellValue();
if (value != null) {
for (DynamicDataMapping dynamicData : dynamicDataMappingList) {
if (value.startsWith("{{" + dynamicData.getDataId() + ".")) {
return dynamicData;
}
}
}
// XSSFCell cell = row.getCell(j);
// String value = cell.getStringCellValue();
// if (value != null) {
// for (DynamicDataMapping dynamicData : dynamicDataMappingList) {
// if (value.startsWith("{{" + dynamicData.getDataId() + ".")) {
// return dynamicData;
// }
// }
// }
}
return null;
}