经营性道路货物运输驾驶员从业资格证申领;网络预约出租汽车驾驶员证核发

reborts/src/main/java/com/lilosoft/business/rocr/service/project/yibin/DLYSCYZGZHFBDHJService.java

@@ -35,8 +35,6 @@ public class DLYSCYZGZHFBDHJService extends BaseProjectService {
     @Override
     public void accept(String fileData, RobotCase rc) throws Exception {
         JSONArray fileDataArray = JSONArray.parseArray(fileData);
-        log.info(fileData);
-        log.info(JSONObject.toJSONString(rc));
         Map<String, Object> dests = new HashMap<>();
         String busiDesc = "";
         Map<String, Object> returnMap = new HashMap<>();
@@ -117,13 +115,16 @@ public class DLYSCYZGZHFBDHJService extends BaseProjectService {
             }
             try {
                 //身份证应与驾驶证上一致
+                if(!ObjectUtils.isEmpty(driverLicenseCheckData)){
                     if (!ObjectUtils.isEmpty(idcardCheckData) && idcardCheckData.size() == 1) {
                         boolean personIdcard = false;
-                    String textAll = driverLicenseCheckData.get(0).get("textAll");
+                        String textAll = JSONObject.toJSONString(driverLicenseCheckData.get(0));
                         for (Map<String, String> checkData : idcardCheckData) {
                             String tempName = checkData.get("name").replaceAll(" ", "");// 身份证上的姓名
-
-                        if (!ObjectUtils.isEmpty(tempName) && !textAll.contains(tempName)) {
+                            if(textAll==null){
+                                textAll = tempName;
+                            }
+                            if (!ObjectUtils.isEmpty(tempName) && textAll.contains(tempName)) {
                                 personIdcard = true;
                                 break;
                             }
@@ -133,6 +134,8 @@ public class DLYSCYZGZHFBDHJService extends BaseProjectService {
                             reportList.add(getPubProjectService().createResultInfo("", busiDesc, String.format("身份证上姓名与驾驶证上不一致!", busiDesc), 2));
                         }
                     }
+                }
+
             } catch (Exception e) {
                 isDriverLicenseOk = false;
                 reportList.add(getPubProjectService().createResultInfo("", busiDesc, String.format("识别提取%s失败", busiDesc), 2));
@@ -153,29 +156,7 @@ public class DLYSCYZGZHFBDHJService extends BaseProjectService {
                 reportList.add(getPubProjectService().createResultInfo("", busiDesc, String.format("识别提取%s失败", busiDesc), 2));
                 log.error(String.format("%s识别验证处理异常！", busiDesc), e);
             }
-            try {
-                //身份证应与资格证上一致
-                if (!ObjectUtils.isEmpty(idcardCheckData) && idcardCheckData.size() == 1) {
-                    boolean personIdcard = false;
-                    String textAll = certificateCheckData.get(0).get("textAll");
-                    for (Map<String, String> checkData : idcardCheckData) {
-                        String tempName = checkData.get("name").replaceAll(" ", "");// 身份证上的姓名
 
-                        if (!ObjectUtils.isEmpty(tempName) && !textAll.contains(tempName)) {
-                            personIdcard = true;
-                            break;
-                        }
-                    }
-                    if (!personIdcard) {
-                        isCertificateOk = false;
-                        reportList.add(getPubProjectService().createResultInfo("", busiDesc, String.format("身份证上姓名与资格证上不一致!", busiDesc), 2));
-                    }
-                }
-            } catch (Exception e) {
-                isCertificateOk = false;
-                reportList.add(getPubProjectService().createResultInfo("", busiDesc, String.format("识别提取%s失败", busiDesc), 2));
-                log.error(String.format("%s识别验证处理异常！", busiDesc), e);
-            }
 
             /************************************资格证复印件************************************/
             try {
@@ -357,9 +338,10 @@ public class DLYSCYZGZHFBDHJService extends BaseProjectService {
                                 driverLicenseCheckData.add(tempCheckData);
                                 name.add("驾驶证");
                             }else if(checkDataStr.contains("从业资格") && checkDataStr.contains("经营性") && checkDataStr.contains("道路")){
+                                if(ObjectUtils.isEmpty(certificateCheckData)) {
                                     certificateCheckData.add(tempCheckData);
                                     name.add("资格证");
-                                if(name.contains("资格证")){
+                                }else {
                                     certificateCopyCheckData.add(tempCheckData);
                                     name.add("资格证复印件");
                                 }
@@ -373,9 +355,10 @@ public class DLYSCYZGZHFBDHJService extends BaseProjectService {
                                 driverLicenseCheckData.add(tempCheckData);
                                 name.add("驾驶证");
                             } else if (tempStr.contains("从业资格") && tempStr.contains("经营性") && tempStr.contains("道路") ) {//资格证
+                                if(ObjectUtils.isEmpty(certificateCheckData)) {
                                     certificateCheckData.add(tempCheckData);
                                     name.add("资格证");
-                                if(name.contains("资格证")){
+                                }else {
                                     certificateCopyCheckData.add(tempCheckData);
                                     name.add("资格证复印件");
                                 }
@@ -386,6 +369,10 @@ public class DLYSCYZGZHFBDHJService extends BaseProjectService {
                             tempCheckData = ConvertJsonToMap.wordConvertJsonToMap(checkData, sealImageId);
                             idcardCheckData.add(tempCheckData);
                             name.add("身份证");
+                        } else if ("js_card".equals(code)) {//驾驶证
+                            tempCheckData = ConvertJsonToMap.wordConvertJsonToMap(checkData, sealImageId);
+                            driverLicenseCheckData.add(tempCheckData);
+                            name.add("身份证");
                         } else {
                             name.add("其他");
                         }