Merge branch 'dev-tiande' of http://113.105.137.151:22280/youjj/cloud-platform into dev-tiande

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

@@ -16,4 +16,8 @@ public class VehicleCommonPriceVo extends VehicleCommonPriceInfo {
 	private Integer mileage = 0;
 	//车辆状况
 	private Integer vehicleStatus;
+
+	private String modelName;
+
+	private Integer vehicleBodyStatus;
 }

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

@@ -11,17 +11,28 @@
         YEAR (NOW()) - YEAR (v.vehicle_register_date)
         ) as vehicleAge,
         v.vehicle_status,
+        v.vehicle_body_status,
+        vm.name as modelName,
         v.mileage_last_update AS mileage
         FROM
         vehicle_common_price_info vci
         LEFT JOIN vehicle v ON v.id = vci.vehicle_id
+        LEFT JOIN branch_company bc2 ON v.subordinate_branch = bc2.id
+        LEFT JOIN company_info ci on ci.id = bc2.company_id
+        LEFT JOIN vehicle_model vm ON  v.model_id = vm.id
         <where>
-            <if test="companyId != null and companyId > 0">
-                and vci.company_id = #{companyId}
-            </if>
             <if test="modelId != null and modelId > 0">
                 and vci.model_id = #{modelId}
             </if>
+            <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>
             and v.is_del = 0 and v.status &lt; 3
         </where>
         order by vci.upd_time DESC