Merge branch 'refs/heads/develop_tzs_register_0621' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java

@@ -1289,6 +1289,14 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 boolMust.must(syBuilder);
                 this.setRepeatUsedCheckFilterParam(boolMust, companyCode, "useRegister");
             }
+            // 注意：上面条件是过滤出【未做过】某个业务的设备，下面部分是过滤出【做过】某个业务的设备
+            else if(!ObjectUtils.isEmpty(queryType) && ValidationUtil.equals(queryType, "FINISH_SY")){
+                // 查询 已经做过【使用登记】 的设备 【(EQU_STATUS != 空 ) && (USE_ORG_CODE（使用登记证编号） != 空)】
+                BoolQueryBuilder syBuilder = QueryBuilders.boolQuery();
+                syBuilder.must(QueryBuilders.existsQuery("EQU_STATE"))
+                        .must(QueryBuilders.wildcardQuery("USE_ORG_CODE", "*"));
+                boolMust.must(syBuilder);
+            }
         }
 
         // 通用匹配规则，其他条件构建

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgVehicleInformationServiceImpl.java

@@ -527,7 +527,6 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
                             ? "_" + dto.getEstateUnitCreditCode().substring(dto.getEstateUnitCreditCode().length() - 4): "");
             vo.setEstateUnitName(result);
         }
-
         vo.setIdCardFront(ObjectUtils.isEmpty(dto.getIdCardFront()) ? null : JSON.parseArray(dto.getIdCardFront()));
         vo.setIdCardBack(ObjectUtils.isEmpty(dto.getIdCardBack()) ? null : JSON.parseArray(dto.getIdCardBack()));
         vo.setDriveLicenseFront(ObjectUtils.isEmpty(dto.getDriveLicenseFront()) ? null : JSON.parseArray(dto.getDriveLicenseFront()));