Skip to content

T
traffic-front
Commit 69c9343c authored by sherlock's avatar sherlock
Browse files
Options

import keyIn

parent 7f84730a
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
atms-api/src/main/java/pwc/taxtech/atms/service/impl/TemplateGroupServiceImpl.java
View file @ 69c9343c
...@@ -270,7 +270,8 @@ public class TemplateGroupServiceImpl extends AbstractService { ...@@ -270,7 +270,8 @@ public class TemplateGroupServiceImpl extends AbstractService {
cell.setCellValue(StringUtils.EMPTY); cell.setCellValue(StringUtils.EMPTY);
addManualConfig(cellTemplate, template, cell, now, cellTemplateConfigList); addManualConfig(cellTemplate, template, cell, now, cellTemplateConfigList);
} }
if(!cell.getCellStyle().getLocked() && StringUtils.isNotBlank(POIUtil.getCellFormulaString(cell))) { if(!cell.getCellStyle().getLocked() && StringUtils.isNotBlank(POIUtil.getCellFormulaString(cell))
&& "${KeyIn}".equalsIgnoreCase(POIUtil.getCellFormulaString(cell))) {
CellTemplateConfig config = new CellTemplateConfig(); CellTemplateConfig config = new CellTemplateConfig();
config.setId(distributedIdService.nextId()); config.setId(distributedIdService.nextId());
config.setCellTemplateId(cellTemplate.getId()); config.setCellTemplateId(cellTemplate.getId());
...@@ -356,8 +357,7 @@ public class TemplateGroupServiceImpl extends AbstractService { ...@@ -356,8 +357,7 @@ public class TemplateGroupServiceImpl extends AbstractService {
for(int k = row.getFirstCellNum(); k < row.getLastCellNum(); k++){ for(int k = row.getFirstCellNum(); k < row.getLastCellNum(); k++){
Cell cell = row.getCell(k); Cell cell = row.getCell(k);
cell.setCellType(CellType.STRING); cell.setCellType(CellType.STRING);
if(!cell.getCellStyle().getLocked() && StringUtils.isNotBlank(cell.getStringCellValue()) if(!cell.getCellStyle().getLocked() && "${KeyIn}".equalsIgnoreCase(cell.getStringCellValue())){
&& cell.getStringCellValue().equalsIgnoreCase("${KeyIn}")){
cell.setCellValue(""); cell.setCellValue("");
} }
} }
...@@ -406,7 +406,8 @@ public class TemplateGroupServiceImpl extends AbstractService { ...@@ -406,7 +406,8 @@ public class TemplateGroupServiceImpl extends AbstractService {
cell.setCellValue(StringUtils.EMPTY); cell.setCellValue(StringUtils.EMPTY);
addManualConfig(cellTemplate, template, cell, now, cellTemplateConfigList); addManualConfig(cellTemplate, template, cell, now, cellTemplateConfigList);
} }
if(!cell.getCellStyle().getLocked() && StringUtils.isNotBlank(POIUtil.getCellFormulaString(cell))) { if(!cell.getCellStyle().getLocked() && StringUtils.isNotBlank(POIUtil.getCellFormulaString(cell))
&& "${KeyIn}".equalsIgnoreCase(POIUtil.getCellFormulaString(cell))) {
CellTemplateConfig config = new CellTemplateConfig(); CellTemplateConfig config = new CellTemplateConfig();
config.setId(distributedIdService.nextId()); config.setId(distributedIdService.nextId());
config.setCellTemplateId(cellTemplate.getId()); config.setCellTemplateId(cellTemplate.getId());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment