Merge branch 'master-vehicle-price' into dev-tiande

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehiclePageQueryVo.java

@@ -28,9 +28,19 @@ public class VehiclePageQueryVo {
     private Integer brand;
 
     /**
-     * 所属分支机构（id）
+     * 所属门店（id）
      */
     private Integer subordinateBranch;
+
+    /**
+     * 停靠门店
+     */
+    private Integer parkBranchCompanyId;
+
+    /**
+     * 所属公司
+     */
+    private Integer companyId;
     /**
      * 所属省份（id）
      */

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

@@ -172,6 +172,12 @@
         <if test="subordinateBranch !=null ">
             and ( v.park_branch_company_id = #{subordinateBranch})
         </if>
+        <if test="parkBranchCompanyId !=null ">
+            and ( bc.id = #{parkBranchCompanyId})
+        </if>
+        <if test="companyId !=null ">
+            and ( ci.id = #{companyId})
+        </if>
         <if test=" addrProvince !=null or addrCity !=null or zoneId !=null ">
             <if test="addrProvince !=null">
                 and bc.addr_province=#{addrProvince}
@@ -339,8 +345,13 @@
             </foreach>
         </if>
         <if test="subordinateBranch !=null ">
-            and ( v.park_branch_company_id = #{subordinateBranch} or
-            v.expect_destination_branch_company_id=#{subordinateBranch} )
+            and ( v.park_branch_company_id = #{subordinateBranch})
+        </if>
+        <if test="parkBranchCompanyId !=null ">
+            and ( bc.id = #{parkBranchCompanyId})
+        </if>
+        <if test="companyId !=null ">
+            and ( ci.id = #{companyId})
         </if>
         <if test=" addrProvince !=null or  addrCity !=null or zoneId !=null ">
             <if test="addrProvince !=null">
@@ -458,6 +469,12 @@
         <if test="subordinateBranch !=null ">
             and ( v.park_branch_company_id = #{subordinateBranch})
         </if>
+        <if test="parkBranchCompanyId !=null ">
+            and ( bc.id = #{parkBranchCompanyId})
+        </if>
+        <if test="companyId !=null ">
+            and ( ci.id = #{companyId})
+        </if>
         <if test=" addrProvince !=null or addrCity !=null or zoneId !=null ">
             <if test="addrProvince !=null">
                 and bc.addr_province=#{addrProvince}