From 8b613dda3a0b607bf0a8f3df55473c3e79cb6de9 Mon Sep 17 00:00:00 2001
From: xiepeng <xiepeng@zcloudchina.com>
Date: Fri, 17 May 2024 17:57:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../freighttrailer/FreighttTrailerController.java     |  2 ++
 .../zcloud/controller/insure/InsureController.java    | 11 +++++++----
 .../freighttrailer/FreightTrailerMapper.java          |  2 ++
 .../impl/FreightTrailerServiceImpl.java               |  1 +
 .../zcloud/service/system/impl/UsersServiceImpl.java  |  1 +
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zcloud/controller/freighttrailer/FreighttTrailerController.java b/src/main/java/com/zcloud/controller/freighttrailer/FreighttTrailerController.java
index 1b62734..77cd4a4 100644
--- a/src/main/java/com/zcloud/controller/freighttrailer/FreighttTrailerController.java
+++ b/src/main/java/com/zcloud/controller/freighttrailer/FreighttTrailerController.java
@@ -31,6 +31,8 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
diff --git a/src/main/java/com/zcloud/controller/insure/InsureController.java b/src/main/java/com/zcloud/controller/insure/InsureController.java
index dc39bee..0d7dee6 100644
--- a/src/main/java/com/zcloud/controller/insure/InsureController.java
+++ b/src/main/java/com/zcloud/controller/insure/InsureController.java
@@ -308,13 +308,16 @@ public class InsureController extends BaseController {
                 List<PageData> drivingLicenseImgs = imgfilesService.listAll(pd);//行驶证照片
                 map.put("drivingLicenseImgs", drivingLicenseImgs);
             }
-            varList.forEach(operating -> {
+            operatingList.forEach(operating -> {
                 operating.put("ID", operating.getString("OPERATING_ID"));
             });
-            map.put("list", varList);
+            map.put("list", operatingList);
             map.put("result", errInfo);
             return map;
         }
+
+
+
         if ("2".equals(pd.getString("TRAFFIC_TYPE"))) {
             // 货运挂车
             List<PageData> freightList = freightTrailerService.trailerList(pd.getString("CORPINFO_ID"));
@@ -338,10 +341,10 @@ public class InsureController extends BaseController {
                 List<PageData> drivingLicenseImgs = imgfilesService.listAll(pd);//行驶证照片
                 map.put("drivingLicenseImgs", drivingLicenseImgs);
             }
-            varList.forEach(freight -> {
+            freightList.forEach(freight -> {
                 freight.put("ID", freight.getString("FREIGHTTRAILER_ID"));
             });
-            map.put("list", varList);
+            map.put("list", freightList);
             map.put("result", errInfo);
             return map;
         }
diff --git a/src/main/java/com/zcloud/mapper/datasource/freighttrailer/FreightTrailerMapper.java b/src/main/java/com/zcloud/mapper/datasource/freighttrailer/FreightTrailerMapper.java
index 283bea0..21e3047 100644
--- a/src/main/java/com/zcloud/mapper/datasource/freighttrailer/FreightTrailerMapper.java
+++ b/src/main/java/com/zcloud/mapper/datasource/freighttrailer/FreightTrailerMapper.java
@@ -94,5 +94,7 @@ public interface FreightTrailerMapper {
     void editInspectTreight(PageData pd);
 
     PageData findTrailerByPlateNumber(PageData pd);
+
+
 }
 
diff --git a/src/main/java/com/zcloud/service/freighttrailer/impl/FreightTrailerServiceImpl.java b/src/main/java/com/zcloud/service/freighttrailer/impl/FreightTrailerServiceImpl.java
index caab6ac..707004a 100644
--- a/src/main/java/com/zcloud/service/freighttrailer/impl/FreightTrailerServiceImpl.java
+++ b/src/main/java/com/zcloud/service/freighttrailer/impl/FreightTrailerServiceImpl.java
@@ -152,5 +152,6 @@ public class FreightTrailerServiceImpl implements FreightTrailerService {
     public PageData findTrailerByPlateNumber(PageData pd) {
         return freightTrailerMapper.findTrailerByPlateNumber(pd);
     }
+
 }
 
diff --git a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
index 65a3292..42f6593 100644
--- a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
+++ b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
@@ -1016,6 +1016,7 @@ public class UsersServiceImpl implements UsersService {
     @Override
     public void editPractitioner(PageData pd, MultipartFile[] files) throws Exception {
         usersMapper.editPractitioner(pd);
+        pd.put("PERSONNEL_TYPE", pd.getString("PERSONNEL_TYPE_NAME"));
         userInfoService.editPractitioner(pd);
 
         List<String> filePaths = new ArrayList<>();