Merge remote-tracking branch 'origin/base-modify' into base-modify

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

@@ -72,6 +72,16 @@ public class VehicleCountRecord {
     )
     private Date countDate;
 
+    /**
+     * 无效数据数量（超过还车时间后还未出车的数据）
+     */
+    @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,24 @@ 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();
+            if (vehicleBookRecordList != null && vehicleBookRecordList.size() > 0) {
+                Iterator<VehicleBookRecordVo> iterator = vehicleBookRecordList.iterator();
+                while (iterator.hasNext()) {
+                    if(iterator.next().getVehicleDepartureLogVo() != null) {
+                        iterator.remove();
+                    }
+                }
+                innerCountRecord.setNoUseNum(vehicleBookRecordList.size());
+            }
+
             innerCountRecord.setType(VehicleCountType.INNER.getCode());
             vehicleCountRecord.setCountDate(nowDate);
             tourCountRecord.setCountDate(nowDate);
@@ -295,7 +313,7 @@ public class VehicleCountRecordBiz extends BaseBiz<VehicleCountRecordMapper, Veh
      *
      * @return
      */
-    @Scheduled(cron = "0 */5 * * * *")
+    @Scheduled(cron = "0 0 */2 * * *")
     public void add() {
         Long nowTime = getDayStart();
         Long lastTime = nowTime + 24 * 3600 * 1000 - 1;
@@ -323,6 +341,13 @@ public class VehicleCountRecordBiz extends BaseBiz<VehicleCountRecordMapper, Veh
             vehicleCountRecord.setDepartureNum(vehicleDepartureList.size());
         }
         Map<String, Object> param = new HashMap<>();
+        SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        try {
+            startDate = simpleDateFormat1.format(startTime);
+            endDate = simpleDateFormat1.format(endTime);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         param.put("startTime", DateTime.parse(startDate, DATE_TIME_FORMATTER).toDate());
         param.put("endTime", DateTime.parse(endDate, DATE_TIME_FORMATTER).toDate());
         //1代表出车 2代表还车
@@ -330,6 +355,7 @@ public class VehicleCountRecordBiz extends BaseBiz<VehicleCountRecordMapper, Veh
         param.put("bookUser", -2);
         //1代表正常出车，2代表提前出车，3代表延期出车
         param.put("type", 2);
+
         //租车提前出车数量
         Integer beforeDepartureNum = vehicleDepartureService.selectAllDepartureLog(param);
         if(beforeDepartureNum != null && beforeDepartureNum > 0) {
@@ -450,6 +476,24 @@ 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();
+        if (vehicleBookRecordList != null && vehicleBookRecordList.size() > 0) {
+            Iterator<VehicleBookRecordVo> iterator = vehicleBookRecordList.iterator();
+            while (iterator.hasNext()) {
+                if(iterator.next().getVehicleDepartureLogVo() != null) {
+                    iterator.remove();
+                }
+            }
+            innerCountRecord.setNoUseNum(vehicleBookRecordList.size());
+        }
+
         vehicleCountRecord.setCountDate(nowDate);
         tourCountRecord.setCountDate(nowDate);
         innerCountRecord.setCountDate(nowDate);

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">