Commit b33627fd authored by 周健威's avatar 周健威

Merge remote-tracking branch 'origin/dev' into dev

parents 98a6984c a29e96b0
...@@ -171,9 +171,9 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp ...@@ -171,9 +171,9 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
OrderRentVehicleDetail orderRentVehicleDetail = orderRentVehicleBiz.selectById(baseOrder.getDetailId()); OrderRentVehicleDetail orderRentVehicleDetail = orderRentVehicleBiz.selectById(baseOrder.getDetailId());
if (orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.DEPARTURE.getCode()) { if (orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.DEPARTURE.getCode()) {
boolean flag = getTodayTime(orderRentVehicleDetail.getStartTime()); boolean flag = getTodayTime(orderRentVehicleDetail.getStartTime());
// if (!flag) { if (!flag) {
// return ObjectRestResponse.createFailedResult(3502, "今日不是交车日期"); return ObjectRestResponse.createFailedResult(3502, "今日不是交车日期");
// } }
if (null == userDTO.getCompanyId() || !userDTO.getCompanyId().equals(orderRentVehicleDetail.getStartCompanyId())) { if (null == userDTO.getCompanyId() || !userDTO.getCompanyId().equals(orderRentVehicleDetail.getStartCompanyId())) {
return ObjectRestResponse.createFailedResult(3501, "无交车权限"); return ObjectRestResponse.createFailedResult(3501, "无交车权限");
} }
......
...@@ -317,6 +317,8 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR ...@@ -317,6 +317,8 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
return RestResponse.codeAndMessage(objectRestResponse.getStatus(), objectRestResponse.getMessage()); return RestResponse.codeAndMessage(objectRestResponse.getStatus(), objectRestResponse.getMessage());
} }
} else {
continue;
} }
} }
......
...@@ -41,7 +41,8 @@ ...@@ -41,7 +41,8 @@
SELECT r.* FROM ( SELECT r.* FROM (
select DISTINCT v.`id`, select DISTINCT v.`id`,
v.`code`, v.`code`,
v.`status`, (CASE WHEN #{status} != null THEN #{status}
ELSE 0 END) status ,
v.number_plate, v.number_plate,
v.brand, v.brand,
v.park_branch_company_id, v.park_branch_company_id,
...@@ -113,7 +114,7 @@ ...@@ -113,7 +114,7 @@
and v.insurance_company = #{insuranceCompany} and v.insurance_company = #{insuranceCompany}
</if> </if>
<if test="belongToName !=null and belongToName != ''"> <if test="belongToName !=null and belongToName != ''">
and v.belong_to_name = like concat('%',#{belongToName},'%') and v.belong_to_name like concat('%',#{belongToName},'%')
</if> </if>
<if test="vin !=null and vin != ''"> <if test="vin !=null and vin != ''">
and v.vin = #{vin} and v.vin = #{vin}
...@@ -178,7 +179,8 @@ ...@@ -178,7 +179,8 @@
SELECT r.* FROM ( SELECT r.* FROM (
select DISTINCT v.`id`, select DISTINCT v.`id`,
v.`code`, v.`code`,
v.`status`, (CASE WHEN #{status} != null THEN #{status}
ELSE 0 END) status ,
v.number_plate, v.number_plate,
v.brand, v.brand,
-- IFNULL(v.park_branch_company_id,v.expect_destination_branch_company_id) AS subordinate_branch, -- IFNULL(v.park_branch_company_id,v.expect_destination_branch_company_id) AS subordinate_branch,
...@@ -275,7 +277,7 @@ ...@@ -275,7 +277,7 @@
and v.insurance_company = #{insuranceCompany} and v.insurance_company = #{insuranceCompany}
</if> </if>
<if test="belongToName !=null and belongToName != ''"> <if test="belongToName !=null and belongToName != ''">
and v.belong_to_name = like concat('%',#{belongToName},'%') and v.belong_to_name like concat('%',#{belongToName},'%')
</if> </if>
<if test="vin !=null and vin != ''"> <if test="vin !=null and vin != ''">
and v.vin = #{vin} and v.vin = #{vin}
......
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