Commit cc959a2e authored by frank.xa.zhang's avatar frank.xa.zhang

Merge branch 'dev' into dev_frank

parents dc6f7767 2c4b4601
...@@ -10,13 +10,12 @@ import pwc.taxtech.atms.dto.vatdto.CellTemplatePerGroupDto; ...@@ -10,13 +10,12 @@ import pwc.taxtech.atms.dto.vatdto.CellTemplatePerGroupDto;
import java.util.List; import java.util.List;
@Mapper @Mapper
public interface FormulaAdminMapper extends MyMapper { public interface FormulaAdminMapper extends MyMapper {
@Select("SELECT " + @Select("SELECT " +
" cell_template.ID AS cellTemplateID, " + " cell_template.ID AS cellTemplateID, " +
" template.ID AS reportTemplateID, " + " template.ID AS reportTemplateID, " +
" template.template_group_id AS reportTemplateGroupID, " + " template.template_group_id AS reportTemplateGroupID, " +
" cell_template_config.formula AS formula, " +
" cell_template.row_index AS rowIndex, " + " cell_template.row_index AS rowIndex, " +
" cell_template.column_index AS columnIndex, " + " cell_template.column_index AS columnIndex, " +
" template.Code AS reportCode, " + " template.Code AS reportCode, " +
...@@ -27,14 +26,11 @@ public interface FormulaAdminMapper extends MyMapper { ...@@ -27,14 +26,11 @@ public interface FormulaAdminMapper extends MyMapper {
" template " + " template " +
" JOIN " + " JOIN " +
" cell_template ON template.id = cell_template.report_template_id " + " cell_template ON template.id = cell_template.report_template_id " +
" JOIN " +
" cell_template_config ON cell_template.id = cell_template_config.cell_template_id " +
"WHERE " + "WHERE " +
" cell_template_config.data_source_type = 1 " + " template.template_group_id = #{groupId}")
" AND template.template_group_id = #{groupId}")
List<CellTemplatePerGroupDto> getCellTemplatePerGroupDto(@Param("groupId") Long groupId); List<CellTemplatePerGroupDto> getCellTemplatePerGroupDto(@Param("groupId") Long groupId);
@Select("SELECT " + @Select("SELECT " +
" rule.template_group_id as groupId, rule.is_default as isDefault " + " rule.template_group_id as groupId, rule.is_default as isDefault " +
"FROM " + "FROM " +
......
...@@ -36,7 +36,6 @@ public class BBParasBo { ...@@ -36,7 +36,6 @@ public class BBParasBo {
this.cellTemplateId = cellTemplateId; this.cellTemplateId = cellTemplateId;
} }
} }
public void putPeriodCellTempate(Integer period, Long cellTemplateId) { public void putPeriodCellTempate(Integer period, Long cellTemplateId) {
...@@ -130,7 +129,7 @@ public class BBParasBo { ...@@ -130,7 +129,7 @@ public class BBParasBo {
builder.append(")"); builder.append(")");
return builder.toString(); return builder.toString();
} }
return ""; return "0";
} }
@Override @Override
......
...@@ -9,7 +9,6 @@ public class CellTemplatePerGroupDto { ...@@ -9,7 +9,6 @@ public class CellTemplatePerGroupDto {
private String cellTemplateID ; private String cellTemplateID ;
private String reportTemplateID ; private String reportTemplateID ;
private String reportTemplateGroupID ; private String reportTemplateGroupID ;
private String formula ;
private int rowIndex ; private int rowIndex ;
private int columnIndex ; private int columnIndex ;
private String reportCode ; private String reportCode ;
......
package pwc.taxtech.atms.vat.entity; package pwc.taxtech.atms.vat.entity;
import java.math.BigDecimal;
public class PCTEntity { public class PCTEntity {
Integer period; Integer period;
Long cellTemplateId; Long cellTemplateId;
BigDecimal data; String data;
public PCTEntity() { public PCTEntity() {
} }
...@@ -44,11 +42,11 @@ public class PCTEntity { ...@@ -44,11 +42,11 @@ public class PCTEntity {
this.cellTemplateId = cellTemplateId; this.cellTemplateId = cellTemplateId;
} }
public BigDecimal getData() { public String getData() {
return data; return data;
} }
public void setData(BigDecimal data) { public void setData(String data) {
this.data = data; this.data = data;
} }
} }
...@@ -366,7 +366,7 @@ public class ReportGeneratorImpl extends VatAbstractService implements ReportGen ...@@ -366,7 +366,7 @@ public class ReportGeneratorImpl extends VatAbstractService implements ReportGen
data = EMPTY; data = EMPTY;
} }
if(StringUtils.isNotBlank(data)) { if (StringUtils.isNotBlank(data)) {
Pattern pattern = Pattern.compile("[0-9.]*"); Pattern pattern = Pattern.compile("[0-9.]*");
Matcher isNum = pattern.matcher(data); Matcher isNum = pattern.matcher(data);
if (isNum.matches()) { if (isNum.matches()) {
...@@ -374,8 +374,7 @@ public class ReportGeneratorImpl extends VatAbstractService implements ReportGen ...@@ -374,8 +374,7 @@ public class ReportGeneratorImpl extends VatAbstractService implements ReportGen
} else { } else {
cellData.setData(data); cellData.setData(data);
} }
} } else {
else{
cellData.setData(data); cellData.setData(data);
} }
...@@ -588,7 +587,14 @@ public class ReportGeneratorImpl extends VatAbstractService implements ReportGen ...@@ -588,7 +587,14 @@ public class ReportGeneratorImpl extends VatAbstractService implements ReportGen
List<PCTEntity> pctResults = cellDataMapper.queryByPCTs(parameter); List<PCTEntity> pctResults = cellDataMapper.queryByPCTs(parameter);
Map<PCTEntity, BigDecimal> pctCache = new HashMap<>(); Map<PCTEntity, BigDecimal> pctCache = new HashMap<>();
pctResults.forEach(m -> { pctResults.forEach(m -> {
pctCache.put(m, m.getData()); BigDecimal data = null;
try {
data = new BigDecimal(m.getData());
} catch (NumberFormatException e) {
logger.warn("number format ecption for parameter {}", m);
data = BigDecimal.ZERO;
}
pctCache.put(m, data);
}); });
configMapToPCTs.forEach((k, v) -> { configMapToPCTs.forEach((k, v) -> {
......
...@@ -61,12 +61,14 @@ public class BB extends FunctionBase implements FreeRefFunction { ...@@ -61,12 +61,14 @@ public class BB extends FunctionBase implements FreeRefFunction {
dataSource.add(nullCellDto); dataSource.add(nullCellDto);
BigDecimal cellValue = BigDecimal.ZERO; BigDecimal cellValue = BigDecimal.ZERO;
CellTemplatePerGroupDto cellTemplateData = agent.getCellTemplateGroupDto(formulaContext.getReportTemplateGroupID(),
formulaContext.getProjectID()).stream().filter(dto -> dto.getRowIndex() == bo.getColumnIndex() - 1
&& dto.getColumnIndex() == bo.getColumnIndex() - 1).findFirst().orElseThrow(() -> {
return Exceptions.BB_CELL_TEMP_NULL;
});
try { try {
CellTemplatePerGroupDto cellTemplateData = agent.getCellTemplateGroupDto(formulaContext.getReportTemplateGroupID(),
formulaContext.getProjectID()).stream().filter(dto -> dto.getRowIndex() == bo.getRowIndex() - 1
&& dto.getColumnIndex() == bo.getColumnIndex() - 1 && dto.getReportCode().equals(bo.getReportCode()))
.findFirst().orElseThrow(() -> {
return Exceptions.BB_CELL_TEMP_NULL;
});
MyAsserts.assertNotNull(cellTemplateData, Exceptions.BB_CELL_TEMP_NULL); MyAsserts.assertNotNull(cellTemplateData, Exceptions.BB_CELL_TEMP_NULL);
nullCellDto.fixedWithGroup(cellTemplateData); nullCellDto.fixedWithGroup(cellTemplateData);
......
...@@ -712,7 +712,7 @@ ...@@ -712,7 +712,7 @@
cell_template.comment cell_template.comment
FROM period_cell_template cell_template FROM period_cell_template cell_template
JOIN period_cell_template_config config JOIN period_cell_template_config config
ON cell_template.cell_template_id = config.cell_template_id ON ( cell_template.cell_template_id = config.cell_template_id AND cell_template.period = config.period )
WHERE cell_template.report_template_id IN WHERE cell_template.report_template_id IN
<foreach close=")" collection="list" index="index" item="item" open="(" separator=","> <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
#{item} #{item}
......
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