modify

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

@@ -518,8 +518,8 @@ public class ReportGeneratorImpl {
     public void addFunctionsAndContext(Workbook workbook, String[] functions, FormulaContext formulaContext) {
         FreeRefFunction[] functionImpls = {new SGSR(formulaContext), new FSJZ(formulaContext), new ND(formulaContext),
                 new BB(formulaContext), new XXFP(formulaContext), new GZSD(formulaContext), new ProjectContext(formulaContext)
-                , new JXFPMX(formulaContext), new JXFP(formulaContext), new PSUM(formulaContext) ,new DFFS(formulaContext),
-                new JFFS(formulaContext),new WPSR(formulaContext)};
+                , new JXFPMX(formulaContext), new JXFP(formulaContext), new PSUM(formulaContext), new DFFS(formulaContext),
+                new JFFS(formulaContext), new WPSR(formulaContext)};
         UDFFinder udfs = new DefaultUDFFinder(functions, functionImpls);
         UDFFinder udfToolpack = new AggregatingUDFFinder(udfs);
         workbook.addToolPack(udfToolpack);

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

@@ -51,7 +51,7 @@ public class ReportServiceImpl {
     private final static Logger logger = LoggerFactory.getLogger(ReportServiceImpl.class);
     private BlockingQueue<PeriodJob> queue = new LinkedBlockingQueue<>();
     private final static String[] functions = {"SGSR", "FSJZ", "ND", "BB", "XXFP", "GZSD", "ProjectContext", "JXFPMX",
-            "JXFP", "PSUM", "DFFS","JFFS", "WPSR"};
+            "JXFP", "PSUM", "DFFS", "JFFS", "WPSR"};
 
     @Autowired
     private ReportGeneratorImpl reportGenerator;

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

@@ -6,12 +6,9 @@ import org.apache.poi.ss.formula.WorkbookEvaluator;
 import org.apache.poi.ss.formula.eval.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import pwc.taxtech.atms.common.util.MyAsserts;
 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.dpo.CellTemplatePerGroupDto;
-import pwc.taxtech.atms.exception.Exceptions;
 import pwc.taxtech.atms.vat.entity.PeriodDataSource;
 import pwc.taxtech.atms.vat.entity.PeriodDataSourceDetail;
 import pwc.taxtech.atms.vat.entity.PeriodFormulaBlock;
@@ -19,11 +16,7 @@ import pwc.taxtech.atms.vat.service.impl.FormulaAgent;
 
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class FunctionBase {
     protected final Logger logger = LoggerFactory.getLogger(this.getClass());