Merge branch 'master-count-vehicle' into base-modify

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleCountRecord.java

@@ -78,6 +78,10 @@ public class VehicleCountRecord {
     @Column(name = "no_use_num")
     private Integer noUseNum;
 
+    @Column(name = "cancel_num")
+    private Integer cancelNum;
+
+
     @Transient
     private String startTime;
 

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

@@ -644,6 +644,10 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
 
     }
 
+    public List<VehicleBookRecordVo> selectAllCancelBookRecord(Map<String, Object> param) {
+        return mapper.selectAllCancelBookRecord(param);
+    }
+
 
     public PageDataVO<VehicleRecordInfoVo> getListByParam(VehiclePlanDto vehiclePlanDto) {
         Query query = new Query(vehiclePlanDto);

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

@@ -279,6 +279,11 @@ public class VehicleCountRecordBiz extends BaseBiz<VehicleCountRecordMapper, Veh
             if(innerAfterArrivalNum != null && innerAfterArrivalNum > 0) {
                 innerCountRecord.setAfterArrivalNum(innerAfterArrivalNum);
             }
+            //在当前时间内已经取消的记录数
+            List<VehicleBookRecordVo> vehicleBookRecordVos = vehicleBookRecordBiz.selectAllCancelBookRecord(param);
+            if (vehicleBookRecordVos != null && vehicleBookRecordVos.size() > 0) {
+                innerCountRecord.setCancelNum(vehicleBookRecordVos.size());
+            }
             //过期未出车无效数据
             param.put("startTime", DateTime.parse("1970-01-01 00:00:00", DATE_TIME_FORMATTER).toDate());
             List<VehicleBookRecordVo> vehicleBookRecordList = vehicleBookRecordBiz.selectAllBookRecord(startTime, endTime, 2).getData();
@@ -471,6 +476,11 @@ public class VehicleCountRecordBiz extends BaseBiz<VehicleCountRecordMapper, Veh
             innerCountRecord.setAfterArrivalNum(innerAfterArrivalNum);
         }
         innerCountRecord.setType(VehicleCountType.INNER.getCode());
+        //在当前时间内已经取消的记录数
+        List<VehicleBookRecordVo> vehicleBookRecordVos = vehicleBookRecordBiz.selectAllCancelBookRecord(param);
+        if (vehicleBookRecordVos != null && vehicleBookRecordVos.size() > 0) {
+            innerCountRecord.setCancelNum(vehicleBookRecordVos.size());
+        }
         //过期未出车无效数据
         param.put("startTime", DateTime.parse("1970-01-01 00:00:00", DATE_TIME_FORMATTER).toDate());
         List<VehicleBookRecordVo> vehicleBookRecordList = vehicleBookRecordBiz.selectAllBookRecord(startTime, endTime, 2).getData();

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleBookRecordMapper.java

@@ -43,4 +43,6 @@ public interface VehicleBookRecordMapper extends Mapper<VehicleBookRecord> {
     public List<VehicleBookRecordVo> selectAllBookRecord(Map<String, Object> param);
 
     public List<VehicleBookRecordVo> selectByIds(Map<String, Object> param);
+
+    public List<VehicleBookRecordVo> selectAllCancelBookRecord(Map<String, Object> param);
 }
\ No newline at end of file

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

@@ -531,12 +531,10 @@
     <select id="selectAllCancelBookRecord" resultMap="searchBookRecord" parameterType="Map">
         select v1.* from vehicle_book_record v1
         where v1.status in (4,6)
-        <if test="startTime != null and status == 1">
-            and v1.book_start_date between #{startTime} and #{endTime}
-        </if>
-        <if test="startTime != null and status == 2">
-            and v1.book_end_date between #{startTime} and #{endTime}
+        <if test="startTime != null">
+            and v1.book_start_date &lt; #{startTime} and v1.book_end_date &gt; #{endTime}
         </if>
+        and book_user != -2
     </select>
 
     <select id="selectByIds" resultMap="searchBookRecord" parameterType="Map">