Commit 7cfc09de authored by 周健威's avatar 周健威

修改bug

parent b14e0550
...@@ -137,11 +137,6 @@ public class SpecialRentBiz extends BaseBiz<SpecialRentMapper, SpecialRent> { ...@@ -137,11 +137,6 @@ public class SpecialRentBiz extends BaseBiz<SpecialRentMapper, SpecialRent> {
CompanyDetail companyDetail = vehicleFeign.getCompanyDetail(specialRent.getStartCompanyId()).getData(); CompanyDetail companyDetail = vehicleFeign.getCompanyDetail(specialRent.getStartCompanyId()).getData();
specialRent.setStartCompanyName(companyDetail.getName()); specialRent.setStartCompanyName(companyDetail.getName());
specialRent.setStartCityCode(companyDetail.getAddrCity()); specialRent.setStartCityCode(companyDetail.getAddrCity());
}
if(null != specialRent.getEndCompanyId()) {
CompanyDetail companyDetail = vehicleFeign.getCompanyDetail(specialRent.getEndCompanyId()).getData();
specialRent.setEndCompanyName(companyDetail.getName());
specialRent.setEndCityCode(companyDetail.getAddrCity());
specialRent.setStartCityName(companyDetail.getCityName()); specialRent.setStartCityName(companyDetail.getCityName());
} }
if(null != specialRent.getEndCompanyId()) { if(null != specialRent.getEndCompanyId()) {
......
...@@ -71,4 +71,8 @@ public class VehicleVO extends Vehicle { ...@@ -71,4 +71,8 @@ public class VehicleVO extends Vehicle {
private List<VehicleExtensionVO> vehicleExtensions; private List<VehicleExtensionVO> vehicleExtensions;
private String manageProvinceName;
private String manageCityName;
} }
\ No newline at end of file
...@@ -1462,7 +1462,9 @@ ...@@ -1462,7 +1462,9 @@
c.`name` categoryName, c.`name` categoryName,
bc.`name` as companyName, bc.`name` as companyName,
bc1.`leader` as manageCompanyLeader, bc1.`leader` as manageCompanyLeader,
bc1.`leader_contact_info` as manageCompanyLeaderContact bc1.`leader_contact_info` as manageCompanyLeaderContact,
bc1.province_name as manageProvinceName,
bc1.city_name as manageCityName
<if test="lon != null and lat != null"> <if test="lon != null and lat != null">
,st_distance_sphere(point(#{lon}, #{lat}), point(bc.longitude, bc.latitude)) as distance ,st_distance_sphere(point(#{lon}, #{lat}), point(bc.longitude, bc.latitude)) as distance
</if> </if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment