kongwz 5 years ago
parent
commit
c6cd593a1e

+ 35 - 32
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP02883.java

@@ -1,33 +1,36 @@
-package com.lantone.qc.kernel.catalogue.firstpagerecord;
-
-import com.lantone.qc.kernel.catalogue.QCCatalogue;
-import com.lantone.qc.kernel.util.CatalogueUtil;
-import com.lantone.qc.pub.Content;
-import com.lantone.qc.pub.model.InputInfo;
-import com.lantone.qc.pub.model.OutputInfo;
-import org.springframework.stereotype.Component;
-
-import java.util.Map;
-
-/**
- * @ClassName : FIRP0737
- * @Description : 现住址邮编信息错误
- * @Author : 胡敬
- * @Date: 2020-05-08 16:00
- */
-@Component
-public class FIRP02883 extends QCCatalogue {
-    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status.set("0");
-        if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
-            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
-            String zipcode = firstpageStructureMap.get(Content.current_address_zipcode);
-            if (!CatalogueUtil.isEmpty(zipcode)) {
-                String regex = "^\\d{6}$";
-                if (!zipcode.matches(regex)) {
-                    status.set("-1");
-                }
-            }
-        }
-    }
+package com.lantone.qc.kernel.catalogue.firstpagerecord;
+
+import com.lantone.qc.kernel.catalogue.QCCatalogue;
+import com.lantone.qc.kernel.util.CatalogueUtil;
+import com.lantone.qc.pub.Content;
+import com.lantone.qc.pub.model.InputInfo;
+import com.lantone.qc.pub.model.OutputInfo;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * @ClassName : FIRP0737
+ * @Description : 现住址邮编信息错误
+ * @Author : 胡敬
+ * @Date: 2020-05-08 16:00
+ */
+@Component
+public class FIRP02883 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status.set("0");
+        if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
+            Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            String zipcode = firstpageStructureMap.get(Content.current_address_zipcode);
+            if (!CatalogueUtil.isEmpty(zipcode)) {
+                if ("-".equals(zipcode) || "/".equals(zipcode)) {
+                    return;
+                }
+                String regex = "^\\d{6}$";
+                if (!zipcode.matches(regex)) {
+                    status.set("-1");
+                }
+            }
+        }
+    }
 }
 }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP02885.java

@@ -24,7 +24,7 @@ public class FIRP02885 extends QCCatalogue {
             Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             String zipcode = firstpageStructureMap.get(Content.household_address_zipcode);
             String zipcode = firstpageStructureMap.get(Content.household_address_zipcode);
             if (StringUtil.isNotBlank(zipcode)) {
             if (StringUtil.isNotBlank(zipcode)) {
-                if ("-".equals(zipcode)) {
+                if ("-".equals(zipcode) || "/".equals(zipcode)) {
                     return;
                     return;
                 }
                 }
                 if (CatalogueUtil.numbersOnly(zipcode)) {
                 if (CatalogueUtil.numbersOnly(zipcode)) {

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP02886.java

@@ -24,7 +24,7 @@ public class FIRP02886 extends QCCatalogue {
             Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             String zipcode = firstpageStructureMap.get(Content.work_unit_zipcode);
             String zipcode = firstpageStructureMap.get(Content.work_unit_zipcode);
             if (StringUtil.isNotBlank(zipcode)) {
             if (StringUtil.isNotBlank(zipcode)) {
-                if ("-".equals(zipcode)) {
+                if ("-".equals(zipcode) || "/".equals(zipcode)) {
                     return;
                     return;
                 }
                 }
                 if (CatalogueUtil.numbersOnly(zipcode)) {
                 if (CatalogueUtil.numbersOnly(zipcode)) {