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

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

@@ -186,13 +186,13 @@ public class DFFS extends FunctionBase implements FreeRefFunction {
 
         for (TrialBalanceFinal balance : temp) {
             ReportCellDataSourceDto dto = new ReportCellDataSourceDto();
-            dto.setAmount(balance.getPeriodCr());
+            dto.setAmount(balance.getPeriodCrBeq());
             dto.setPeriod(period);
             dto.setIsOnlyManualInput(Boolean.FALSE);
             dto.setName(Constant.DataSourceName.ReportDataSource);
             dto.setType(FormulaDataSourceType.Report.getCode());
             contain.add(dto);
         }
-        return temp.stream().mapToDouble(a -> a.getPeriodCr().doubleValue()).sum();
+        return temp.stream().mapToDouble(a -> a.getPeriodCrBeq().doubleValue()).sum();
     }
 }

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

@@ -183,13 +183,13 @@ public class JFFS extends FunctionBase implements FreeRefFunction {
 
         for (TrialBalanceFinal balance : temp) {
             ReportCellDataSourceDto dto = new ReportCellDataSourceDto();
-            dto.setAmount(balance.getPeriodDr());
+            dto.setAmount(balance.getPeriodDrBeq());
             dto.setPeriod(period);
             dto.setIsOnlyManualInput(Boolean.FALSE);
             dto.setName(Constant.DataSourceName.ReportDataSource);
             dto.setType(FormulaDataSourceType.Report.getCode());
             contain.add(dto);
         }
-        return temp.stream().mapToDouble(a -> a.getPeriodDr().doubleValue()).sum();
+        return temp.stream().mapToDouble(a -> a.getPeriodDrBeq().doubleValue()).sum();
     }
 }