mother son bug

java110-utils/src/main/java/com/java110/utils/util/DateUtil.java

@@ -666,4 +666,17 @@ public class DateUtil {
         resMonth = tmpDays.divide(monthDay, 4, BigDecimal.ROUND_HALF_UP).add(new BigDecimal(result)).add(preRresMonth).doubleValue();
         return resMonth;
     }
+
+    /**
+     * 通过时间秒毫秒数判断两个时间的间隔
+     * @param date1
+     * @param date2
+     * @return
+     */
+    public static int differentDaysUp(Date date1,Date date2)
+    {
+        double days = ((date2.getTime() - date1.getTime()) / (1000*3600*24*1.00));
+        return new Double(Math.ceil(days)).intValue();
+    }
+
 }

service-common/src/main/java/com/java110/common/cmd/machineTranslate/MachineUploadCarLogCmd.java

@@ -186,15 +186,24 @@ public class MachineUploadCarLogCmd extends Cmd {
                     tempCarName = tmpOwnerCarDto.getLeaseTypeName();
                 }
             }
-        }
 
-        //主副车辆中 有一个车辆在场，这个车场当做临时车处理
-        if (hasInParkingArea(ownerCarDtos.get(0).getCarId(), reqJson.getString("carNum"), reqJson.getString("communityId"), paIds)) {
-            tempCar = CAR_TYPE_NO_DATA;
-            tempCarName = "临时车";
+            //主副车辆中 有一个车辆在场，这个车场当做临时车处理
+            if (hasInParkingArea(ownerCarDtos.get(0).getCarId(), reqJson.getString("carNum"), reqJson.getString("communityId"), paIds)) {
+                tempCar = CAR_TYPE_NO_DATA;
+                tempCarName = "临时车";
+            }
+
+            int day = DateUtil.differentDaysUp(ownerCarDtos.get(0).getEndTime(),DateUtil.getCurrentDate());
+
+            if(day <= -5){
+                tempCar = CAR_TYPE_NO_DATA;
+                tempCarName = "临时车";
+            }
         }
 
 
+
+
         //进场处理
         if (MachineDto.DIRECTION_IN.equals(machineDtos.get(0).getDirection())) {
             carIn(reqJson, machineDtos.get(0), tempCar, tempCarName);