[DEV] skip bb fromual and psum formual

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportGeneratorImpl.java

@@ -172,7 +172,8 @@ public class ReportGeneratorImpl {
                     //如果有正则匹配就进行更新公式解析
                     if (isFind) {
                         periodCellTemplateConfig.setParsedFormula(StringUtils.isNotBlank(resultFormula) ? resultFormula : null);
-                        if (periodCellTemplateConfig.getFormula() != null && !periodCellTemplateConfig.getFormula().contains("BB("))
+                        if (periodCellTemplateConfig.getFormula() != null && (!periodCellTemplateConfig.getFormula().contains("BB(")
+                                ||!periodCellTemplateConfig.getFormula().contains("PSUM(")))
                             periodCellTemplateConfig.setFormula(StringUtils.isNotBlank(periodCellTemplateConfig.getFormula()) ? resultFormula : null);
                         periodCellTemplateConfigMapper.updateByPrimaryKeySelective(periodCellTemplateConfig);
                     }

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/PSUM.java

@@ -79,11 +79,10 @@ public class PSUM extends FunctionBase implements FreeRefFunction {
                 dto.setAmount(cellValue);
                 dto.setPeriod(formulaContext.getPeriod());
                 dto.setProjectId(formulaContext.getProjectId());
-                dto.setReportName(cellTemplateData.getReportCode());
                 dto.setRowIndex(pCell.rowIndex-1);
                 dto.setColumnIndex(pCell.columnIndex-1);
                 dto.setColumnName((pCell.columnIndex-1)+"列");
-                dto.setReportName((pCell.rowIndex-1)+"行");
+                dto.setRowName((pCell.rowIndex-1)+"行");
                 dto.setReportName(DataSourceName.ReportDataSource);
                 dto.setType( FormulaDataSourceType.Report.getCode());