[bugfix] fixed period to cell data when insert to db

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

@@ -401,6 +401,7 @@ public class ReportGeneratorImpl extends VatAbstractService implements ReportGen
                             cellData.setUpdateBy("Admin");
                             cellData.setUpdateTime(createTime);
                             cellData.setProjectId(projectId);
+                            cellData.setPeriod(period);
                             periodCellDataMapper.insertSelective(cellData);
 
                             //after insert celldata, insert the celldatasource for link celldata and datasource

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

@@ -141,7 +141,7 @@ public class BB extends FunctionBase implements FreeRefFunction {
                         formulaContext.getReportTemplateGroupId(), bo.getColumnIndex() - 1, bo.getRowIndex() - 1,
                         formulaContext.getProjectId());
                 saveFormulaBlock(formulaContext.getPeriod(), ec,
-                        bo.expression(), bo.expressionData(), dataSourceId, formulaContext.getProjectId());
+                        bo.expression(), bo.expressionData(), dataSourceId, formulaContext.getProjectId(),formulaContext.getReportId());
             }
         }
     }

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

@@ -179,14 +179,14 @@ public class FunctionBase {
     }
 
     public void saveFormulaBlock(int period, OperationEvaluationContext ec,
-                                 String formulaExpression, String val, Long dataSourceId, String projectId) {
+                                 String formulaExpression, String val, Long dataSourceId, String projectId, long reportId) {
         Long cellTemplateId = getCellTemplateId(period, ec);
         Date creatime = new Date();
         PeriodFormulaBlock periodFormulaBlock = new PeriodFormulaBlock();
         periodFormulaBlock.setProjectId(projectId);
         periodFormulaBlock.setId(SpringContextUtil.distributedIdService.nextId());
         periodFormulaBlock.setPeriod(period);
-        periodFormulaBlock.setReportId(0L);
+        periodFormulaBlock.setReportId(reportId);
         periodFormulaBlock.setCellTemplateId(cellTemplateId);
         periodFormulaBlock.setFormulaExpression(formulaExpression);
         periodFormulaBlock.setData(val);