From ff664962e096ff5fd57f3b7a45142eec440e5a9e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 06 九月 2022 09:05:20 +0800
Subject: [PATCH] 优化代码

---
 service-common/src/main/java/com/java110/common/cmd/machineTranslate/MachineUploadCarLogCmd.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 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 8173843..7ffed41 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
@@ -152,6 +152,15 @@
             reqJson.put("carId", ownerCarDtos.get(0).getCarId());
             tempCar = ownerCarDtos.get(0).getLeaseType();
             tempCarName = ownerCarDtos.get(0).getLeaseTypeName();
+            if(ownerCarDtos.size()>1){
+                for(OwnerCarDto tmpOwnerCarDto : ownerCarDtos){
+                    if(OwnerCarDto.LEASE_TYPE_TEMP.equals(tmpOwnerCarDto.getLeaseType())){
+                       continue;
+                    }
+                    tempCar = tmpOwnerCarDto.getLeaseType();
+                    tempCarName = tmpOwnerCarDto.getLeaseTypeName();
+                }
+            }
         }
 
 
@@ -245,7 +254,7 @@
         carInoutDetailPo.setState(state);
         if(CAR_TYPE_NO_DATA.equals(tempCar)){
             carInoutDetailPo.setCarType(OwnerCarDto.LEASE_TYPE_TEMP);
-            carInoutDetailPo.setCarTypeName(OwnerCarDto.LEASE_TYPE_TEMP);
+            carInoutDetailPo.setCarTypeName("涓存椂杞�");
             //妫�鏌ユ槸鍚︿负榛戠櫧鍚嶅崟
             CarBlackWhiteDto carBlackWhiteDto = new CarBlackWhiteDto();
             carBlackWhiteDto.setCarNum(reqJson.getString("carNum"));
@@ -437,7 +446,7 @@
         carInoutDetailPo.setRemark(reqJson.getString("remark"));
         if(CAR_TYPE_NO_DATA.equals(tempCar)){
             carInoutDetailPo.setCarType(OwnerCarDto.LEASE_TYPE_TEMP);
-            carInoutDetailPo.setCarTypeName(OwnerCarDto.LEASE_TYPE_TEMP);
+            carInoutDetailPo.setCarTypeName("涓存椂杞�");
             //妫�鏌ユ槸鍚︿负榛戠櫧鍚嶅崟
             CarBlackWhiteDto carBlackWhiteDto = new CarBlackWhiteDto();
             carBlackWhiteDto.setCarNum(reqJson.getString("carNum"));

--
Gitblit v1.8.0