[bugfix] fixed config bb cpt formla

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

@@ -524,8 +524,8 @@ public class ReportGeneratorImpl extends VatAbstractService implements ReportGen
         Set<PCTEntity> parameter = new HashSet<>();
 
         periodCellTemplateConfigExtendDtos.forEach(p -> {
-            String formula = p.getPeriodCellTemplateConfig().getFormula();
-            String parsedFormula = p.getPeriodCellTemplateConfig().getParsedFormula();
+            String formula = p.getFormula();
+            String parsedFormula = p.getParsedFormula();
             if (formula.contains("BB(")) {
                 logger.debug("period cell template config contains bb formula {}", formula);
                 if (parsedFormula.contains("PCT(")) {
@@ -543,7 +543,7 @@ public class ReportGeneratorImpl extends VatAbstractService implements ReportGen
                         }
                     }
                     if (!parsedPCTs.isEmpty()) {
-                        configMapToPCTs.put(p.getPeriodCellTemplateConfig(), parsedPCTs);
+                        configMapToPCTs.put(p, parsedPCTs);
                     }
 
                     parsedPCTs.stream().forEach(m -> {
@@ -583,17 +583,6 @@ public class ReportGeneratorImpl extends VatAbstractService implements ReportGen
 
             });
         }
-
-        periodCellTemplateConfigExtendDtos.forEach(p->{
-            String formula = p.getFormula();
-            String parsedFormula = p.getParsedFormula();
-            if (formula.contains("BB(")) {
-                logger.debug("period cell template config contains bb formula {}", formula);
-                if (parsedFormula.contains("PCT(")) {
-                    p.setParsedFormula(p.getPeriodCellTemplateConfig().getParsedFormula());
-                }
-            }
-        });
     }
 
     private String convertListToString(List<String> list) {