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

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java

@@ -171,9 +171,9 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         OrderRentVehicleDetail orderRentVehicleDetail = orderRentVehicleBiz.selectById(baseOrder.getDetailId());
         if (orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.DEPARTURE.getCode()) {
             boolean flag = getTodayTime(orderRentVehicleDetail.getStartTime());
-//            if (!flag) {
-//                return ObjectRestResponse.createFailedResult(3502, "今日不是交车日期");
-//            }
+            if (!flag) {
+                return ObjectRestResponse.createFailedResult(3502, "今日不是交车日期");
+            }
             if (null == userDTO.getCompanyId() || !userDTO.getCompanyId().equals(orderRentVehicleDetail.getStartCompanyId())) {
                 return ObjectRestResponse.createFailedResult(3501, "无交车权限");
             }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -317,6 +317,8 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                                     return RestResponse.codeAndMessage(objectRestResponse.getStatus(), objectRestResponse.getMessage());
                                 }
 
+                            } else {
+                                continue;
                             }
                         }
 

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

@@ -41,7 +41,8 @@
         SELECT r.* FROM (
         select DISTINCT v.`id`,
         v.`code`,
-        v.`status`,
+        (CASE WHEN #{status} != null THEN #{status}
+        ELSE 0 END) status ,
         v.number_plate,
         v.brand,
         v.park_branch_company_id,
@@ -113,7 +114,7 @@
             and v.insurance_company = #{insuranceCompany}
         </if>
         <if test="belongToName !=null and belongToName != ''">
-            and v.belong_to_name = like concat('%',#{belongToName},'%')
+            and v.belong_to_name  like concat('%',#{belongToName},'%')
         </if>
         <if test="vin !=null and vin != ''">
             and v.vin = #{vin}
@@ -178,7 +179,8 @@
         SELECT r.* FROM (
         select DISTINCT v.`id`,
         v.`code`,
-        v.`status`,
+        (CASE WHEN #{status} != null THEN #{status}
+        ELSE 0 END) status ,
         v.number_plate,
         v.brand,
         -- IFNULL(v.park_branch_company_id,v.expect_destination_branch_company_id) AS subordinate_branch,
@@ -275,7 +277,7 @@
             and v.insurance_company = #{insuranceCompany}
         </if>
         <if test="belongToName !=null and belongToName != ''">
-            and v.belong_to_name = like concat('%',#{belongToName},'%')
+            and v.belong_to_name like concat('%',#{belongToName},'%')
         </if>
         <if test="vin !=null and vin != ''">
             and v.vin = #{vin}