12.13修改

This commit is contained in:
赵辉
2025-12-13 23:06:31 +08:00
parent df299a21ae
commit 51b5ae5d13
3 changed files with 11 additions and 7 deletions
@@ -231,4 +231,10 @@ public class UserDriverPo extends BaseVOEntity {
@ApiModelProperty(name = "用户身份") @ApiModelProperty(name = "用户身份")
private Integer userIdentity; private Integer userIdentity;
@ApiModelProperty(name = "经营许可证")
private String driverBusinessLicenseFrontUrl;
@ApiModelProperty(name = "经营许可证号")
private String driverBusinessLicenseNumber;
} }
@@ -302,11 +302,13 @@
ude.driver_corp_legal_name, ude.driver_corp_legal_name,
ude.driver_corp_name, ude.driver_corp_name,
ude.driver_corp_idcard_number, ude.driver_corp_idcard_number,
ude.driver_business_license_front_url,
ude.driver_business_license_number,
WM_CONCAT(dvb.vehicle_license_plate_number) AS vehicleLicensePlateNumber, WM_CONCAT(dvb.vehicle_license_plate_number) AS vehicleLicensePlateNumber,
WM_CONCAT(m.motorcade_name) AS driverTeamName, WM_CONCAT(m.motorcade_name) AS driverTeamName,
md.motorcade_id motorcade_header_id md.motorcade_id motorcade_header_id
FROM "USER" b FROM "USER" b
LEFT JOIN user_driver a ON a.user_id = b.user_id AND b.del_flag = 1 LEFT JOIN user_driver a ON a.user_id = b.user_id AND a.del_flag = 1
LEFT JOIN user_driver_enterprise ude ON a.user_id = ude.user_id AND ude.del_flag = 1 LEFT JOIN user_driver_enterprise ude ON a.user_id = ude.user_id AND ude.del_flag = 1
LEFT JOIN driver_vehicle_bind dvb ON a.user_id = dvb.user_id AND dvb.del_flag = 1 LEFT JOIN driver_vehicle_bind dvb ON a.user_id = dvb.user_id AND dvb.del_flag = 1
LEFT JOIN motorcade m ON a.driver_id = m.motorcade_header_id AND m.del_flag = 1 LEFT JOIN motorcade m ON a.driver_id = m.motorcade_header_id AND m.del_flag = 1
@@ -405,9 +405,7 @@ public class VehicleApplicationService {
throw new ServiceException("车牌号不能为空"); throw new ServiceException("车牌号不能为空");
} }
if (! Pattern.matches(Constants.LICENSE_PLATE_REGEX, vehicleLicensePlateNumber)) { // Removed license plate regex validation as per requirement
throw new ServiceException("车牌号格式不正确");
}
VehicleDto query = new VehicleDto(); VehicleDto query = new VehicleDto();
query.setVehicleLicensePlateNumber(vehicle.getVehicleLicensePlateNumber()); query.setVehicleLicensePlateNumber(vehicle.getVehicleLicensePlateNumber());
@@ -680,9 +678,7 @@ public class VehicleApplicationService {
if (StrUtil.isEmpty(vehicleLicensePlateNumber)) { if (StrUtil.isEmpty(vehicleLicensePlateNumber)) {
throw new ServiceException("车牌号不能为空"); throw new ServiceException("车牌号不能为空");
} }
if (! Pattern.matches(Constants.LICENSE_PLATE_REGEX, vehicleLicensePlateNumber)) { // Removed license plate regex validation as per requirement
throw new ServiceException("车牌号格式不正确");
}
VehicleDto query = new VehicleDto(); VehicleDto query = new VehicleDto();
query.setVehicleLicensePlateNumber(vehicle.getVehicleLicensePlateNumber()); query.setVehicleLicensePlateNumber(vehicle.getVehicleLicensePlateNumber());