添加model相关修改

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

@@ -372,6 +372,11 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
         sendQueue(orderMQDTO, sign);
     }
 
+    @Override
+    public void updateSelectiveById(BaseOrder entity) {
+        super.updateSelectiveById(entity);
+    }
+
     /**
      * 更新（不成功抛异常）
      *

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

@@ -500,7 +500,7 @@
 
     <select id="searchUsableModel" parameterType="java.util.Map"
             resultMap="searchUsableModelMap">
-        select distinct vm.id as model_id, bc.id as company_id
+        (select distinct vm.id as model_id, bc.id as company_id
         <if test=" catas != null ">
             ,GROUP_CONCAT(vc.cata_id) as catas
         </if>
@@ -520,7 +520,29 @@
         and vm.id is not null
         and vm.status = 1
         and vm.isdel = 0
-        and bc.id is not null
+        and bc.id is not null)
+        <if test="startCompanyId != null or parkBranchCompanyId != null ">
+        union
+        (select id as model_id,
+            <choose>
+                <when test="startCompanyId != null">
+                    #{startCompanyId} as company_id,
+                </when>
+                <otherwise>
+                    #{parkBranchCompanyId} as company_id,
+                </otherwise>
+            </choose>
+            <if test=" catas != null ">
+                null as catas
+            </if>
+            <if test=" yearMonthAndParam !=null and yearNo4Where != null and yearNo4Where == true">
+                0 as hasVehicle
+            </if>
+            <if test="lon != null and lat != null">
+                0 as distance
+            </if>
+                from vehicle_model where vehicle_model.isdel = 0)
+        </if>
         GROUP BY model_id, company_id
         <if test="lon != null and lat != null">, distance</if>
         <!--<if test=" yearMonthAndParam !=null and yearNo4Where != null and yearNo4Where == true">, hasVehicle</if>-->