modify

atms-api/src/main/java/pwc/taxtech/atms/constant/Constant.java

@@ -49,8 +49,8 @@ public final class Constant {
     public static final String EMPTY = "";
     public static final String DateTimeFormate = "%d年%d月";
 
-    public static final String INPUT_RZJG_SUCCESS="0";
-    public static final String INPUT_RZJG_FAILED="1";
+    public static final String INPUT_RZJG_SUCCESS="1";
+    public static final String INPUT_RZJG_FAILED="2";
 
     public static final String INPUT_RZZT_NOT_BEGIN="0";
     public static final String INPUT_RZZT_BEGINNING="1";
@@ -59,6 +59,15 @@ public final class Constant {
     public static final String OUTPUT_KPZT_NO="0";
     public static final String OUTPUT_KPZT_YES="2";
 
+    public static class HlFpzt{
+        public static final String ZC = "0"; //正常
+        public static final String ZF = "1"; //作废
+        public static final String HC = "2"; //红冲(正常)
+        public static final String SK = "3"; //失控(作废)
+        public static final String YC = "4"; //异常(作废)
+        public static final String TP = "6"; //退票
+    }
+
     public static final String APPROVAL_COMMITTED="committed";
     public static final String APPROVAL_AGREED="agreed";
     public static final String APPROVAL_DISAGREED="disagreed";

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

@@ -81,7 +81,7 @@ public class InputInvoiceDataImportServiceImpl {
         invoiceExample.createCriteria().andGFSHEqualTo(organization.getTaxPayerNumber()).andRZSQBetween(DateUtils.getPeriodBeginFormat(
                 project.getYear(), paras.getPeriodStart(), Constant.DateFormat.YYYYMM), DateUtils.getPeriodEndFormat(project.getYear(),
                 paras.getPeriodEnd(), Constant.DateFormat.YYYYMM)).andRZJGEqualTo(INPUT_RZJG_SUCCESS).andRZZTEqualTo(INPUT_RZZT_OVER)
-                .andFPZTNotEqualTo("1");
+                .andFPZTIn(Arrays.asList(Constant.HlFpzt.ZC, Constant.HlFpzt.HC));
         PageHelper.startPage(paras.getPageInfo().getPageIndex(), paras.getPageInfo().getPageSize());
         List<InputInvoice> invoices = inputInvoiceMapper.selectByExample(invoiceExample);
         DecimalFormat df = new DecimalFormat("#,###.00");