Merge branch 'dev' into dev_frank

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

 package pwc.taxtech.atms.vat.service.impl;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 import pwc.taxtech.atms.common.datasource.ShardingContextHolder;
 import pwc.taxtech.atms.common.util.MyAsserts;
@@ -27,7 +28,7 @@ import java.util.List;
 
 import static pwc.taxtech.atms.constant.Constant.FIRST_OR_DEFAULT;
 
-@Service
+@Component
 public class FormulaAgent extends VatAbstractService {
     @Autowired
     public FormulaAdminMapper adminMp;
@@ -105,14 +106,14 @@ public class FormulaAgent extends VatAbstractService {
         return adminMp.getPastProjectDbName(year, orgId);
     }
 
-    public CellData getCellData(String dbName, String templateId, int periodId) {
+    public CellData getCellData(String dbName, String templateId,String cellId, int periodId) {
         String currentProjectDb = ShardingContextHolder.getDataSourceKey();
         try {
             ShardingContextHolder.setDataSourceKey(dbName);
             Report report = getReportByTemplate(templateId, periodId);
             MyAsserts.assertNotNull(report, Exceptions.BB_REPORT_NULL);
 
-            CellData cellData = getCellDataListByTemplate(templateId, report.getId());
+            CellData cellData = getCellDataListByTemplate(cellId, report.getId());
             MyAsserts.assertNotNull(cellData, Exceptions.BB_CELL_DATA_NULL);
 
             return cellData;

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

@@ -11,6 +11,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 import pwc.taxtech.atms.common.POIUtil;
 import pwc.taxtech.atms.common.util.SpringContextUtil;
@@ -35,7 +36,7 @@ import java.util.stream.Collectors;
 
 import static pwc.taxtech.atms.constant.Constant.EMPTY;
 
-@Service
+@Component
 public class ReportGeneratorImpl extends VatAbstractService implements ReportGenerator {
 
     private static final Logger logger = LoggerFactory.getLogger(ReportGeneratorImpl.class);

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

 package pwc.taxtech.atms.vat.service.impl;
 
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 import pwc.taxtech.atms.common.datasource.ShardingContextHolder;
 import pwc.taxtech.atms.constant.enums.EnumServiceType;
@@ -16,7 +17,7 @@ import pwc.taxtech.atms.vat.service.ReportService;
 import java.util.*;
 import java.util.stream.Collectors;
 
-@Service
+@Component
 public class ReportServiceImpl extends VatAbstractService implements ReportService {
     @Override
     public OperationResultDto<List<ReportDto>> getReportTemplate(String projectID, EnumServiceType serviceType, Integer periodParam) {

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

@@ -75,7 +75,8 @@ public class BB extends FunctionBase implements FreeRefFunction {
             bo.disCount();
             String dbName = agent.getPastProjectDbName(curPeriod.getCurYear(),
                     formulaContext.getOrganizationID());
-            CellData cellData = agent.getCellData(dbName, cellTemplateData.getReportTemplateID(), curPeriod.getCurPeriod());
+            CellData cellData = agent.getCellData(dbName, cellTemplateData.getReportTemplateID(),
+                    cellTemplateData.getCellTemplateID(), curPeriod.getCurPeriod());
             nullCellDto = ReportCellDataSourceDto.extractFromGroup(bo, curPeriod, cellData, cellTemplateData);
             closeDataSource.clean();
             closeDataSource.addDS(nullCellDto);