From 47f2300d67737834f0d9a58a4df658a18749336f Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 07 二月 2023 14:06:33 +0800
Subject: [PATCH] mother son bug

---
 service-common/src/main/java/com/java110/common/cmd/machineTranslate/MachineUploadCarLogCmd.java |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/service-common/src/main/java/com/java110/common/cmd/machineTranslate/MachineUploadCarLogCmd.java b/service-common/src/main/java/com/java110/common/cmd/machineTranslate/MachineUploadCarLogCmd.java
index d45cc4d..229a56b 100644
--- a/service-common/src/main/java/com/java110/common/cmd/machineTranslate/MachineUploadCarLogCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/machineTranslate/MachineUploadCarLogCmd.java
@@ -186,13 +186,22 @@
                     tempCarName = tmpOwnerCarDto.getLeaseTypeName();
                 }
             }
+
+            //涓诲壇杞﹁締涓� 鏈変竴涓溅杈嗗湪鍦猴紝杩欎釜杞﹀満褰撳仛涓存椂杞﹀鐞�
+            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 (hasInParkingArea(ownerCarDtos.get(0).getCarId(), reqJson.getString("carNum"), reqJson.getString("communityId"), paIds)) {
-            tempCar = CAR_TYPE_NO_DATA;
-            tempCarName = "涓存椂杞�";
-        }
+
 
 
         //杩涘満澶勭悊

--
Gitblit v1.8.0