Merge remote-tracking branch 'origin/develop_tzs_register' 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/JgVehicleInformationServiceImpl.java

@@ -209,7 +209,14 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
             CompanyBo company = reginParams.getCompany();
 
             JgVehicleInformationDto vehicleInfoDto = JSON.parseObject(JSON.toJSONString(map), JgVehicleInformationDto.class);
-
+            //新增使用登记表字段
+            Optional.ofNullable(map.get("useRegistrationFormFile"))
+                    .map(JSONObject::toJSONString)
+                    .ifPresent(vehicleInfoDto::setUseRegistrationFormFile);
+            Map<String, Object> vehicle = commonService.getRegistrationFormUrl("vehicle", map);
+            if(Objects.nonNull(vehicle)){
+                vehicleInfoDto.setUseRegistrationFormUrl(String.valueOf(vehicle.get("useRegistrationFormUrl")));
+            }
             List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) map.get("equipmentLists");
             if (CollectionUtils.isEmpty(equipmentLists) ||
                     equipmentLists.stream().map(v -> (String) v.get("chargingMedium")).distinct().count() != 1) {