Merge branch 'dev_neo3' into 'dev'

Dev neo3

See merge request root/atms!102

atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/BBParasBo.java

@@ -36,7 +36,6 @@ public class BBParasBo {
             this.cellTemplateId = cellTemplateId;
         }
 
-
     }
 
     public void putPeriodCellTempate(Integer period, Long cellTemplateId) {
@@ -130,7 +129,7 @@ public class BBParasBo {
             builder.append(")");
             return builder.toString();
         }
-        return "";
+        return "0";
     }
 
     @Override

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

@@ -61,12 +61,14 @@ public class BB extends FunctionBase implements FreeRefFunction {
         dataSource.add(nullCellDto);
 
         BigDecimal cellValue = BigDecimal.ZERO;
-        CellTemplatePerGroupDto cellTemplateData = agent.getCellTemplateGroupDto(formulaContext.getReportTemplateGroupID(),
-                formulaContext.getProjectID()).stream().filter(dto -> dto.getRowIndex() == bo.getColumnIndex() - 1
-                && dto.getColumnIndex() == bo.getColumnIndex() - 1).findFirst().orElseThrow(() -> {
-            return Exceptions.BB_CELL_TEMP_NULL;
-        });
+
         try {
+            CellTemplatePerGroupDto cellTemplateData = agent.getCellTemplateGroupDto(formulaContext.getReportTemplateGroupID(),
+                    formulaContext.getProjectID()).stream().filter(dto -> dto.getRowIndex() == bo.getRowIndex() - 1
+                    && dto.getColumnIndex() == bo.getColumnIndex() - 1 && dto.getReportCode().equals(bo.getReportCode()))
+                    .findFirst().orElseThrow(() -> {
+                        return Exceptions.BB_CELL_TEMP_NULL;
+                    });
 
             MyAsserts.assertNotNull(cellTemplateData, Exceptions.BB_CELL_TEMP_NULL);
             nullCellDto.fixedWithGroup(cellTemplateData);

atms-api/src/main/resources/pwc/taxtech/atms/vat/dao/PeriodCellTemplateConfigMapper.xml

@@ -712,7 +712,7 @@
         cell_template.comment
         FROM period_cell_template cell_template
         JOIN period_cell_template_config config
-        ON cell_template.cell_template_id = config.cell_template_id
+        ON ( cell_template.cell_template_id = config.cell_template_id AND cell_template.period = config.period )
         WHERE cell_template.report_template_id IN
         <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
             #{item}