Merge branch 'dev_neo' into 'dev'

Dev neo

See merge request root/atms!71

atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/BBParasBo.java

@@ -20,7 +20,7 @@ public class BBParasBo {
         reportCode = resolverString(args, ec, 0);
         columnIndex = resolverInteger(args, ec, 1);
         rowIndex = resolverInteger(args, ec, 2);
-        period = args.length == 4 ? resolverInteger(args, ec, 3) : 0;
+        period = args.length >= 4 ? resolverInteger(args, ec, 3) : 0;
         year = args.length == 5 ? resolverInteger(args, ec, 4) : 0;
     }
 

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

@@ -48,7 +48,7 @@ public class BB extends FunctionBase implements FreeRefFunction {
     public BigDecimal bb(BBParasBo bo) throws Exception {
         try (CloseableFormulaDataSource closeDataSource = new CloseableFormulaDataSource(formulaContext.getFormulaAgent())) {
             CurrentPeriodBo curPeriod = CurrentPeriodBo.getPeriod(bo.getPeriod().intValue(), formulaContext.getPeriod());
-            curPeriod.fixedCurYear(getYear(curPeriod.getCurYear()));
+            curPeriod.fixedCurYear(getYear(bo.getYear()));
 
             ReportCellDataSourceDto nullCellDto = ReportCellDataSourceDto.nullDataSource(bo, curPeriod);
             closeDataSource.addDS(nullCellDto);