[dev] over write save datasorce for bb use praramer index

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

@@ -100,7 +100,7 @@ public class BB extends FunctionBase implements FreeRefFunction {
             }
 
 
-            bo.disCount();
+//            bo.disCount();
             CellData cellData = null;
 
             String dbName = agent.getPastProjectDbName(curPeriod.getCurYear(),
@@ -140,7 +140,7 @@ 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());
+                    cellValue, formulaContext.getPeriod(), formulaContext.getReportTemplateGroupID(),bo.getColumnIndex(),bo.getRowIndex()+1);
             saveFormulaBlock(formulaContext.getPeriod(), ec, bo.expression(curPeriod.getCurPeriod(), curPeriod.getCurYear()), cellValue, dataSourceID);
         }
     }

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

@@ -10,10 +10,11 @@ import org.slf4j.LoggerFactory;
 import pwc.taxtech.atms.common.util.SpringContextUtil;
 import pwc.taxtech.atms.constant.enums.FormulaDataSourceDetailType;
 import pwc.taxtech.atms.constant.enums.FormulaDataSourceType;
-import pwc.taxtech.atms.vat.entity.*;
+import pwc.taxtech.atms.vat.entity.DataSource;
+import pwc.taxtech.atms.vat.entity.DataSourceDetail;
+import pwc.taxtech.atms.vat.entity.PeriodFormulaBlock;
 import pwc.taxtech.atms.vat.service.impl.FormulaAgent;
 
-import java.lang.reflect.Type;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.HashMap;
@@ -90,12 +91,17 @@ public class FunctionBase {
         }
     }
 
+    public Long saveDataSource(OperationEvaluationContext ec, List<Object> dataSourceList,
+                               FormulaDataSourceDetailType formulaDataSourceDetailType, BigDecimal val, int period, Long templateGroupId) {
+        return saveDataSource(ec, dataSourceList, formulaDataSourceDetailType, val, period, templateGroupId, null, null);
+    }
+
     public Long saveDataSource(OperationEvaluationContext ec, List<Object> dataSourceList,
                                FormulaDataSourceDetailType formulaDataSourceDetailType, BigDecimal val,
-                               int period, Long templateGroupId) {
+                               int period, Long templateGroupId, Integer colNumP, Integer rowNumP) {
         String reportCode = ec.getWorkbook().getSheetName(ec.getSheetIndex());
-        int colNum = ec.getColumnIndex();
-        int rowNum = ec.getRowIndex();
+        int colNum = colNumP == null ? ec.getColumnIndex() : colNumP;
+        int rowNum = rowNumP == null ? ec.getRowIndex() : rowNumP;
         //根据这三个值还有period获取 cell_template_Id的值
         Map<String, Object> map = new HashMap<>();
         map.put("code", reportCode);