Merge branch 'dev_oracle' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_oracle

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

@@ -172,9 +172,6 @@ public class ReportGeneratorImpl {
                     //如果有正则匹配就进行更新公式解析
                     if (isFind) {
                         periodCellTemplateConfig.setParsedFormula(StringUtils.isNotBlank(resultFormula) ? resultFormula : null);
-                        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

@@ -77,13 +77,14 @@ public class PSUM extends FunctionBase implements FreeRefFunction {
                 ReportCellDataSourceDto dto = new ReportCellDataSourceDto();
                 dto.fixedWithGroup(cellTemplateData);
                 dto.setAmount(cellValue);
+                dto.setName(DataSourceName.ReportDataSource);
                 dto.setPeriod(formulaContext.getPeriod());
                 dto.setProjectId(formulaContext.getProjectId());
                 dto.setRowIndex(pCell.rowIndex-1);
                 dto.setColumnIndex(pCell.columnIndex-1);
                 dto.setColumnName((pCell.columnIndex-1)+"列");
                 dto.setRowName((pCell.rowIndex-1)+"行");
-                dto.setReportName(DataSourceName.ReportDataSource);
+                dto.setReportName(ec.getWorkbook().getSheetName(ec.getSheetIndex()));
                 dto.setType( FormulaDataSourceType.Report.getCode());
 
                 dataSource.add(dto);

atms-web/src/main/webapp/app/common/controls/formula-translator/formula-translator.js

@@ -48,6 +48,7 @@ commonModule
                 var formula = _.findWhere(formulaList, { code: formulaName });
                 if (formula) {
                     rtn = formula.name + '(';
+                    if(formulaName=='PSUM') return rtn +formulaParams;
                     var paramInfo = getParamsFromStr(formulaParams); // 括号内输入的参数
                     var knownParams = angular.copy(formula.params || []); // 公式已知的参数（数据库中与该公式关联的参数）
                     knownParams.forEach(function (p) {