Merge branch 'dev_oracle_sherlock' into 'dev_oracle'

xxfp bug

See merge request root/atms!170

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

@@ -170,7 +170,7 @@ public class FunctionBase {
         periodFormulaBlock.setReportId(0L);
         periodFormulaBlock.setCellTemplateId(cellTemplateId);
         periodFormulaBlock.setFormulaExpression(formulaExpression);
-        periodFormulaBlock.setData(val.toString());
+        periodFormulaBlock.setData(val.setScale(2, BigDecimal.ROUND_HALF_UP).toString());
         periodFormulaBlock.setDataSourceId(dataSourceId);
         periodFormulaBlock.setCreateBy("Admin");
         periodFormulaBlock.setCreateTime(creatime);

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

@@ -48,7 +48,7 @@ public class XXFP extends FunctionBase implements FreeRefFunction {
         int period = getIntParam(args[3], ec);
         String invoiceType = "004";
 
-        String formulaExpression = "XXFP(\"" + taxRate + "\"," + invoiceType + "," + amountType + "," + period + ")";
+        String formulaExpression = "XXFP(\"" + taxRate + "\"," + invoiceTypeParam + "," + amountType + "," + period + ")";
         logger.debug(formulaExpression);
 
         Integer curYear = formulaContext.getYear();