Skip to content

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

Merge branch 'dev_oracle_sherlock' into 'dev_oracle' 

允许手工数据源

See merge request root/atms!192
parents c64c1e24 7708296c
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
atms-api/src/main/java/pwc/taxtech/atms/service/impl/TemplateGroupServiceImpl.java
View file @ a5209be3
...@@ -266,7 +266,7 @@ public class TemplateGroupServiceImpl extends AbstractService { ...@@ -266,7 +266,7 @@ public class TemplateGroupServiceImpl extends AbstractService {
cellTemplate.setIsReadOnly(cell.getCellStyle().getLocked()); cellTemplate.setIsReadOnly(cell.getCellStyle().getLocked());
cellTemplateList.add(cellTemplate); cellTemplateList.add(cellTemplate);
//todo: 这里没有Config数据只有在上传模板以后，在界面里面可以配置公式 //todo: 这里没有Config数据只有在上传模板以后，在界面里面可以配置公式
if (!cell.getCellStyle().getLocked() && hasKeyIn(cell)) { if (!cell.getCellStyle().getLocked() && hasKeyIn(cell) && allowManual) {
cell.setCellValue(StringUtils.EMPTY); cell.setCellValue(StringUtils.EMPTY);
addManualConfig(cellTemplate, template, cell, now, cellTemplateConfigList); addManualConfig(cellTemplate, template, cell, now, cellTemplateConfigList);
} }
...@@ -402,7 +402,7 @@ public class TemplateGroupServiceImpl extends AbstractService { ...@@ -402,7 +402,7 @@ public class TemplateGroupServiceImpl extends AbstractService {
cellTemplate.setIsReadOnly(cell.getCellStyle().getLocked() ? true : false); cellTemplate.setIsReadOnly(cell.getCellStyle().getLocked() ? true : false);
cellTemplateList.add(cellTemplate); cellTemplateList.add(cellTemplate);
//todo: 这里没有Config数据只有在上传模板以后，在界面里面可以配置公式 //todo: 这里没有Config数据只有在上传模板以后，在界面里面可以配置公式
if (!cell.getCellStyle().getLocked() && hasKeyIn(cell)) { if (!cell.getCellStyle().getLocked() && hasKeyIn(cell) && allowManual) {
cell.setCellValue(StringUtils.EMPTY); cell.setCellValue(StringUtils.EMPTY);
addManualConfig(cellTemplate, template, cell, now, cellTemplateConfigList); addManualConfig(cellTemplate, template, cell, now, cellTemplateConfigList);
} }
......
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