Merge branch 'dev_neo3' into 'dev'

Dev neo3

See merge request root/atms!99

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

@@ -29,7 +29,7 @@ public class ReportCellDataSourceDto extends FormulaDataSourceDto {
         nulDataSource.name = DataSourceName.ReportDataSource;
         nulDataSource.reportTemplateID = bbParasBo.getReportCode();
         nulDataSource.year = currentPeriodBo.curYear;
-        nulDataSource.period = currentPeriodBo.getCurYear();
+        nulDataSource.period = currentPeriodBo.getCurPeriod();
         nulDataSource.columnIndex = bbParasBo.getColumnIndex() - 1;
         nulDataSource.rowIndex = bbParasBo.getRowIndex() - 1;
         nulDataSource.isOnlyManualInput = false;

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

@@ -91,12 +91,12 @@ public class BB extends FunctionBase implements FreeRefFunction {
 
                 return returnEval;
             } else if (bo.getPeriod().intValue() == 0) {
-                Field evaluatorField= OperationEvaluationContext.class.getDeclaredField("_bookEvaluator");
+                Field evaluatorField = OperationEvaluationContext.class.getDeclaredField("_bookEvaluator");
                 evaluatorField.setAccessible(true);
-                WorkbookEvaluator evaluator=(WorkbookEvaluator)evaluatorField.get(ec);
-                ValueEval eval=evaluator.evaluate(ec.getWorkbook().getSheet(ec.getWorkbook().getSheetIndex(bo.getReportCode()))
+                WorkbookEvaluator evaluator = (WorkbookEvaluator) evaluatorField.get(ec);
+                ValueEval eval = evaluator.evaluate(ec.getWorkbook().getSheet(ec.getWorkbook().getSheetIndex(bo.getReportCode()))
                         .getCell(bo.getRowIndex() - 1, bo.getColumnIndex() - 1));
-                return cellValue=new BigDecimal(OperandResolver.coerceValueToDouble(eval));
+                return cellValue = new BigDecimal(OperandResolver.coerceValueToDouble(eval));
             }
 
 
@@ -140,8 +140,10 @@ public class BB extends FunctionBase implements FreeRefFunction {
         } finally {
             LOGGER.warn("error for bb cacls for {} and current for {}", bo.toString(), curPeriod.toString());
             Long dataSourceID = saveDataSource(ec, ds, FormulaDataSourceDetailType.ReportCellDataSourceDto,
-                    cellValue, formulaContext.getPeriod(), formulaContext.getReportTemplateGroupID(),bo.getColumnIndex()-1,bo.getRowIndex()-1);
-            saveFormulaBlock(formulaContext.getPeriod(), ec, bo.expression(curPeriod.getCurPeriod(), curPeriod.getCurYear()), cellValue, dataSourceID);
+                    cellValue, formulaContext.getPeriod(),
+                    formulaContext.getReportTemplateGroupID(), bo.getColumnIndex() - 1, bo.getRowIndex() - 1);
+            saveFormulaBlock(formulaContext.getPeriod(), ec,
+                    bo.expression(curPeriod.getCurPeriod(), curPeriod.getCurYear()), cellValue, dataSourceID);
         }
     }