fix bug

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

@@ -54,7 +54,7 @@ public class JXFP extends FunctionBase implements FreeRefFunction {
         int resultType = getIntParam(args[3], ec);
         int period = getIntParam(args[4], ec);
         // 客户情况只计算增值税专票
-        String invoiceType = "004";
+//        String invoiceType = "004";
 
         String formulaExpression = "JXFP(" + certificationPeriod + "," + invoiceTypeParam + ","
                 + authenticationType + "," + resultType + "," + period + ")";
@@ -82,22 +82,22 @@ public class JXFP extends FunctionBase implements FreeRefFunction {
 
         List<CertifiedInvoicesList> inputInvoices;
         if (authenticationType == 1 && formulaContext.getIsYear()) {
-            inputInvoices = getInvoice(null, invoiceType,
+            inputInvoices = getInvoice(null, invoiceTypeParam,
                     Constant.InputInvoiceCertificationResult.CheckPass, Constant.InputInvoiceCertificationResult.ScanPass,
                     null);
         } else if (authenticationType == 1) {
-            inputInvoices =getInvoice(period, invoiceType,
+            inputInvoices =getInvoice(period, invoiceTypeParam,
                     Constant.InputInvoiceCertificationResult.CheckPass, Constant.InputInvoiceCertificationResult.ScanPass,
                     null);
         }
         // 认证未通过与未认证暂认为是同一个意思
         else if (authenticationType == 2 && formulaContext.getIsYear()) {
-            inputInvoices = getInvoice(null, invoiceType,
+            inputInvoices = getInvoice(null, invoiceTypeParam,
                     null, null, Constant.InputInvoiceCertificationResult.NotPass);
         }
         // 认证未通过与未认证暂认为是同一个意思
         else if (authenticationType == 0 || authenticationType == 2) {
-            inputInvoices =getInvoice(period, invoiceType, null,
+            inputInvoices =getInvoice(period, invoiceTypeParam, null,
                     null, Constant.InputInvoiceCertificationResult.NotPass);
         } else {
             saveFormulaBlock(period, ec, formulaExpression, new BigDecimal("0.0"), 0L, formulaContext.getProjectId());
@@ -195,7 +195,7 @@ public class JXFP extends FunctionBase implements FreeRefFunction {
         return strtodate;
     }
 
-    public List<CertifiedInvoicesList> getInvoice(Integer period, String invoiceType, String checkPass, String scanPass, String notPass) {
+    public List<CertifiedInvoicesList> getInvoice(Integer period, Integer invoiceType, String checkPass, String scanPass, String notPass) {
         CertifiedInvoicesListExample example = new CertifiedInvoicesListExample();
         CertifiedInvoicesListExample.Criteria criteria = example.createCriteria();