From f990f7e352782c74a5af3b54651cf1a21fc0d099 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期日, 23 四月 2023 11:51:54 +0800
Subject: [PATCH] 修改开票
---
src/main/java/com/boying/controller/car/PlateServlet3.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/boying/controller/car/PlateServlet3.java b/src/main/java/com/boying/controller/car/PlateServlet3.java
index fc18ed5..a318310 100644
--- a/src/main/java/com/boying/controller/car/PlateServlet3.java
+++ b/src/main/java/com/boying/controller/car/PlateServlet3.java
@@ -433,7 +433,7 @@
outParkService.saveOrUpdate(byCarNoAndBarrierId);
return 0.0;
}else{
- if(w.getParkIds()!=null){
+ if(StringUtils.isNotBlank(w.getParkIds())){
if(w.getEndTime()!=null){
String parkIds = w.getParkIds();
String[] split = parkIds.split(",");
@@ -507,10 +507,12 @@
carType = "鏈堢杞�";
}else {
//鐧藉悕鍗曞浐瀹氬仠杞﹀満杞﹁締
- if(byCarNo.getParkId().equals(barrier.getParkId())){
+ if(StringUtils.isNotBlank(byCarNo.getParkIds()) && byCarNo.getParkIds().contains(barrier.getParkId()+"")){
carType = "鏈堢杞�";
long l = (byCarNo.getEndTime().getTime() - byCarNo.getStartTime().getTime()) / (24 * 3600 * 1000);
carDay = "鏈夋晥鏈熻繕鏈�"+l+"澶�";
+ }else {
+ carType = "涓存椂杞�";
}
}
}
@@ -554,10 +556,10 @@
carType = "鏈堢杞�";
}else {
//鐧藉悕鍗曞浐瀹氬仠杞﹀満杞﹁締
- if(byCarNo.getParkId().equals(barrier.getParkId())){
+ if(StringUtils.isNotBlank(byCarNo.getParkIds()) && byCarNo.getParkIds().contains(barrier.getParkId()+"")){
carType = "鏈堢杞�";
- long l = (byCarNo.getEndTime().getTime() - byCarNo.getStartTime().getTime()) / (24 * 3600 * 1000);
- carDay = "鏈夋晥鏈熻繕鏈�"+l+"澶�";
+ }else {
+ carType = "涓存椂杞�";
}
}
}
--
Gitblit v1.9.1