[bugfix] add report id to query cellData

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

@@ -71,7 +71,7 @@ public class FormulaAgent extends VatAbstractService {
 
     private CellData getCellDataListByTemplate(String templateId, Long reportId) {
         CellDataExample dataExample = new CellDataExample();
-        dataExample.createCriteria().andCellTemplateIdEqualTo(Long.valueOf(templateId));
+        dataExample.createCriteria().andCellTemplateIdEqualTo(Long.valueOf(templateId)).andReportIdEqualTo(reportId);
         List<CellData> cellDataList = cellDataMapper.selectByExample(dataExample);
 
         if (cellDataList != null && !cellDataList.isEmpty()) return cellDataList.get(FIRST_OR_DEFAULT);

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

@@ -270,7 +270,7 @@ public class ReportGeneratorImpl extends VatAbstractService implements ReportGen
                                 Row row = sheet.getRow(rowNum - 1);
                                 if (row != null) {
                                     Cell cell = row.getCell(colNum - 1);
-                                    if (cell != null) {
+                                        if (cell != null) {
                                         //开始取值然后存放到DataSource
                                         DataSource dataSource = new DataSource();
                                         dataSource.setId(distributedIDService.nextId());