Merge branch 'dev_oracle_neo' into 'dev_oracle'

Dev oracle neo

See merge request root/atms!183

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

@@ -485,7 +485,7 @@ public class ReportServiceImpl {
                         FormulaEvaluator evaluator = workbook.getCreationHelper().createFormulaEvaluator();
                         evaluator.evaluateAll();
 
-                        reportGenerator.updateWorkbookCaclsValueToDb(projectId, periodParam, workbook, resources, genJob);
+                        reportGenerator.updateWorkbookCaclsValueToDb(projectId, periodParam, workbook, resources,isMergeManualData, genJob);
 
                         genJob.setStatus(WrapPeriodJobDto.STATUS_END);
                         periodJobMapper.updateByPrimaryKey(genJob);
@@ -858,6 +858,7 @@ public class ReportServiceImpl {
                 PeriodCellData cellData = periodCellDataMapper.selectByPrimaryKey(data.getCellId());
                 if (cellData.getData() != data.getAmount().toString()) {
                     cellData.setData(data.getAmount().toString());
+                    if(StringUtils.isEmpty(cellData.getFormulaExp()))cellData.setFormulaExp(data.getAmount().toString());
                     periodCellDataMapper.updateByPrimaryKeySelective(cellData);
                 }
             }
@@ -865,7 +866,9 @@ public class ReportServiceImpl {
             List<DataSourceExtendDto> dataSourceExtendDtos = periodDataSourceMapper.getManualDataSource(data.getCellId());
 
             PeriodCellTemplateExample periodCellTemplateExample = new PeriodCellTemplateExample();
-            periodCellTemplateExample.createCriteria().andCellTemplateIdEqualTo(Long.parseLong(data.getCellTemplateId())).andPeriodEqualTo(data.getPeriod());
+            periodCellTemplateExample.createCriteria().andCellTemplateIdEqualTo(Long.parseLong(data.getCellTemplateId()))
+                    .andPeriodEqualTo(data.getPeriod()).andProjectIdEqualTo(projectId);
+
             Optional<PeriodCellTemplate> periodCellTemplate = periodCellTemplateMapper.selectByExample(periodCellTemplateExample).stream().findFirst();
 
             BigDecimal originalAmount = new BigDecimal("0");