Merge branch 'lb_dev' into base-modify

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

@@ -54,6 +54,9 @@ public class UsableVeicleDTO extends PageParam {
         @ApiModelProperty(hidden = true)
         Boolean yearNo4Where;
 
+        @ApiModelProperty(hidden = true)
+        Integer withoutRecordWhere = 1;
+
         public void setStartDateTamp(Long startDateTamp) {
             this.startDateTamp = startDateTamp;
             this.startDate = DEFAULT_DATE_TIME_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(startDateTamp), ZoneOffset.ofHours(8)));

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

@@ -17,7 +17,7 @@
     <select id="selectVoAll" resultType="com.xxfc.platform.vehicle.pojo.BranchCompanyStockApplyInfoVo">
       select a.*, b.company_name
       from branch_company_stock_apply_info a
-      left join branch_company_stock_info b on a.company_id = b.id
+      left join `company_base` b on a.company_id = b.id
       order by a.create_time desc
     </select>
 </mapper>
\ No newline at end of file

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

@@ -522,11 +522,17 @@
         </if>
         <!-- yearNo4Where 标识时间参数不用于where条件，用于select部分 -->
         <if test=" yearMonthAndParam !=null and yearNo4Where != null and yearNo4Where == true">
-            ,max(
-            <foreach collection="yearMonthAndParam" index="yearMonth" item="andOperation" separator="and">
-                <include refid="yearMonthAndParamSql"></include>
-            </foreach>
-            ) as hasVehicle
+            ,(max(
+                <foreach collection="yearMonthAndParam" index="yearMonth" item="andOperation" separator="and">
+                    <include refid="yearMonthAndParamSql"></include>
+                </foreach>
+                <!-- 租车列表 不过滤前后预约记录不符的车辆 但是合并标示车型是否有车 即 hasVehicle-->
+                <if test="withoutRecordWhere != null and withoutRecordWhere = 1 and startCompanyId != null and endCompanyId != null ">
+                    and (abr.to_lift_company is null or abr.to_lift_company = #{startCompanyId})
+                    and (abr.to_return_company is null or abr.to_return_company = #{endCompanyId})
+                </if>
+                )
+            )as hasVehicle
         </if>
         <if test="lon != null and lat != null">
             ,st_distance_sphere(point(#{lon}, #{lat}), point(bc.longitude, bc.latitude)) as distance
@@ -557,7 +563,7 @@
             ) > 0
         </if>
         )
-        <!-- union 所有车型 -->
+        <!-- union 所有下架车型 -->
         <if test="startCompanyId != null or parkBranchCompanyId != null ">
             union
             (select vm.id as model_id, bc.id as company_id
@@ -635,14 +641,15 @@
                 </foreach>
             </if>
 
-            <!-- 若需根据预定日期条件查询，针对换为位操作  -->
-                <!-- yearNo4Where 标识时间参数是否用于where条件 -->
+            <!-- 根据前后record 过滤车辆  -->
             <if test="startCompanyId != null and endCompanyId != null ">
-                and (
+                <if test="withoutRecordWhere == null">
+                    and (
                     (abr.to_lift_company is null or abr.to_lift_company = #{startCompanyId})
                     and
                     (abr.to_return_company is null or abr.to_return_company = #{endCompanyId})
-                )
+                    )
+                </if>
             </if>
             <if test=" modelId != null ">
                 and v.model_id = #{modelId}