修复之前判断为0的问题

yudao-server/src/main/java/cn/iocoder/yudao/server/service/CertificateOfApprovalService.java

@@ -97,19 +97,21 @@ public class CertificateOfApprovalService {
         }
         String contractor = extractManufacturer(texts, fieldMap.get("contractor"), 0);
         if (contractor == null) {
-            int contractorOffset = 1;
-            if (!postfix.equals("pdf")) {
-                contractorOffset = 1;
-            }
-            contractor = extractManufacturer(texts, fieldMap.get("contractor"), contractorOffset);
-            if (ObjectUtil.isNotEmpty(contractor)) {
-                //安装单位
-                equipmentRegistryRespVO.setContractor(contractor);
-            }
+            return null;
         } else {
             contractor = matchInstallationUnit(fieldMap.get("contractor"), contractor);
             if (contractor != null) {
                 equipmentRegistryRespVO.setContractor(contractor);
+            } else {
+                int contractorOffset = 1;
+                if (!postfix.equals("pdf")) {
+                    contractorOffset = 1;
+                }
+                contractor = extractManufacturer(texts, fieldMap.get("contractor"), contractorOffset);
+                if (ObjectUtil.isNotEmpty(contractor)) {
+                    //安装单位
+                    equipmentRegistryRespVO.setContractor(contractor);
+                }
             }
         }
         return equipmentRegistryRespVO;

yudao-server/src/main/java/cn/iocoder/yudao/server/service/ProductQualifiedService.java

@@ -63,15 +63,15 @@ public class ProductQualifiedService {
             nominalWorkingPressure = matchWaterVolume(fieldMap.get("nominalWorkingPressure"), nominalWorkingPressure, "MPa");
             if (nominalWorkingPressure != null) {
                 equipmentRegistryRespVO.setNominalWorkingPressure(nominalWorkingPressure);
-            }
-        } else {
-            nominalWorkingPressure = extractManufacturer(texts, fieldMap.get("nominalWorkingPressure"), nominalWorkingPressureOffset);
-            if (ObjectUtil.isNotEmpty(nominalWorkingPressure)) {
-                if (nominalWorkingPressure.equals("MPa")) {
-                    nominalWorkingPressure = extractManufacturer(texts, fieldMap.get("nominalWorkingPressure"), 2);
+            } else {
+                nominalWorkingPressure = extractManufacturer(texts, fieldMap.get("nominalWorkingPressure"), nominalWorkingPressureOffset);
+                if (ObjectUtil.isNotEmpty(nominalWorkingPressure)) {
+                    if (nominalWorkingPressure.equals("MPa")) {
+                        nominalWorkingPressure = extractManufacturer(texts, fieldMap.get("nominalWorkingPressure"), 2);
+                    }
+                    //气瓶公称工作压力
+                    equipmentRegistryRespVO.setNominalWorkingPressure(nominalWorkingPressure);
                 }
-                //气瓶公称工作压力
-                equipmentRegistryRespVO.setNominalWorkingPressure(nominalWorkingPressure);
             }
         }
         int cylinderVolumeOffset = 1;
@@ -83,22 +83,22 @@ public class ProductQualifiedService {
             cylinderVolume = matchWaterVolume(fieldMap.get("cylinderVolume"), cylinderVolume, "L");
             if (cylinderVolume != null) {
                 return equipmentRegistryRespVO.setCylinderVolume(cylinderVolume);
-            }
-        } else {
-            cylinderVolume = extractManufacturer(texts, fieldMap.get("cylinderVolume"), cylinderVolumeOffset);
-            if (isNumeric(cylinderVolume) || isNumericL(cylinderVolume)) {
-                return equipmentRegistryRespVO.setCylinderVolume(cylinderVolume);
             } else {
-                if (cylinderVolume != null && cylinderVolume.equals("L")) {
-                    //处理识别到上一行的情况
-                    cylinderVolume = extractManufacturer(texts, fieldMap.get("cylinderVolume"), -1);
-                    if (isNumeric(cylinderVolume)) {
-                        return equipmentRegistryRespVO.setCylinderVolume(cylinderVolume);
-                    }
+                cylinderVolume = extractManufacturer(texts, fieldMap.get("cylinderVolume"), cylinderVolumeOffset);
+                if (isNumeric(cylinderVolume) || isNumericL(cylinderVolume)) {
+                    return equipmentRegistryRespVO.setCylinderVolume(cylinderVolume);
                 } else {
-                    cylinderVolume = extractManufacturer(texts, "实测水容机: ", 1);
-                    if (isNumeric(cylinderVolume) || isNumericL(cylinderVolume)) {
-                        return equipmentRegistryRespVO.setCylinderVolume(cylinderVolume);
+                    if (cylinderVolume != null && cylinderVolume.equals("L")) {
+                        //处理识别到上一行的情况
+                        cylinderVolume = extractManufacturer(texts, fieldMap.get("cylinderVolume"), -1);
+                        if (isNumeric(cylinderVolume)) {
+                            return equipmentRegistryRespVO.setCylinderVolume(cylinderVolume);
+                        }
+                    } else {
+                        cylinderVolume = extractManufacturer(texts, "实测水容机: ", 1);
+                        if (isNumeric(cylinderVolume) || isNumericL(cylinderVolume)) {
+                            return equipmentRegistryRespVO.setCylinderVolume(cylinderVolume);
+                        }
                     }
                 }
             }

yudao-server/src/main/java/cn/iocoder/yudao/server/service/SpecialGasCylinderService.java

@@ -40,18 +40,19 @@ public class SpecialGasCylinderService {
         equipmentRegistryRespVO.setEquipmentType("特种气瓶");
         equipmentRegistryRespVO.setProductName("车用气瓶");
         String manufacturerField = extractManufacturer(texts, fieldMap.get("manufacturerField"), 0);
-        if (manufacturerField == null) {
-            manufacturerField = extractManufacturer(texts, fieldMap.get("manufacturerField"), 1);
-            if (ObjectUtil.isNotEmpty(manufacturerField)) {
-                equipmentRegistryRespVO.setManufacturer(manufacturerField);
-                equipmentRegistryRespVO.setSupervisionAgency(manufacturerField);
-            }
-        }  else {
+        if (manufacturerField != null) {
             manufacturerField = matchInstallationUnit(fieldMap.get("manufacturerField"), manufacturerField);
             if (manufacturerField != null) {
                 equipmentRegistryRespVO.setManufacturer(manufacturerField);
                 equipmentRegistryRespVO.setSupervisionAgency(manufacturerField);
+            }  else {
+                manufacturerField = extractManufacturer(texts, fieldMap.get("manufacturerField"), 1);
+                if (ObjectUtil.isNotEmpty(manufacturerField)) {
+                    equipmentRegistryRespVO.setManufacturer(manufacturerField);
+                    equipmentRegistryRespVO.setSupervisionAgency(manufacturerField);
+                }
             }
+
         }
         String productionDateField = extractManufacturer(texts, fieldMap.get("productionDateField"), 1);
         if (ObjectUtil.isNotEmpty(productionDateField)) {