From e20c58a63d3827d9c55cd5f387568fb0916b9590 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 17 三月 2023 23:37:12 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-common/src/main/java/com/java110/common/cmd/machineTranslate/MachineUploadCarLogCmd.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 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..0d10ea2 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(DateUtil.getCurrentDate(),ownerCarDtos.get(0).getEndTime());
+
+ 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 = "涓存椂杞�";
- }
+
//杩涘満澶勭悊
@@ -297,7 +306,7 @@
carInoutDetailPo.setCarInout(CarInoutDetailDto.CAR_INOUT_OUT);
carInoutDetailPo.setCarNum(reqJson.getString("carNum"));
carInoutDetailPo.setCommunityId(reqJson.getString("communityId"));
- carInoutDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+ carInoutDetailPo.setDetailId(GenerateCodeFactory.getDetailId(CODE_PREFIX_ID));
carInoutDetailPo.setInoutId("-1");
carInoutDetailPo.setMachineCode(machineDto.getMachineCode());
carInoutDetailPo.setMachineId(machineDto.getMachineId());
@@ -321,7 +330,7 @@
carInoutDetailPo.setCarInout(CarInoutDetailDto.CAR_INOUT_OUT);
carInoutDetailPo.setCarNum(reqJson.getString("carNum"));
carInoutDetailPo.setCommunityId(reqJson.getString("communityId"));
- carInoutDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+ carInoutDetailPo.setDetailId(GenerateCodeFactory.getDetailId(CODE_PREFIX_ID));
carInoutDetailPo.setInoutId(carInoutDtos.get(0).getInoutId());
carInoutDetailPo.setMachineCode(machineDto.getMachineCode());
carInoutDetailPo.setMachineId(machineDto.getMachineId());
@@ -485,7 +494,7 @@
carInoutDetailPo.setCarInout(CarInoutDetailDto.CAR_INOUT_IN);
carInoutDetailPo.setCarNum(reqJson.getString("carNum"));
carInoutDetailPo.setCommunityId(reqJson.getString("communityId"));
- carInoutDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+ carInoutDetailPo.setDetailId(GenerateCodeFactory.getDetailId(CODE_PREFIX_ID));
carInoutDetailPo.setInoutId(carInoutPo.getInoutId());
carInoutDetailPo.setMachineCode(machineDto.getMachineCode());
carInoutDetailPo.setMachineId(machineDto.getMachineId());
--
Gitblit v1.8.0