From 9f8ac03f3483ab759aad97b25e7f57c7ba1774d6 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Thu, 22 Sep 2022 21:58:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E9=97=A8=E8=AF=81=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ScmVehicleGressionService.java            | 42 +++++++++++--------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
index be5985d17e..15bc378e61 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
@@ -1141,28 +1141,34 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         temporaryExitPermitInfo.setOrgName(sysOrganization.getName());
         temporaryExitPermitInfo.setDate(new Date());
         temporaryExitPermitInfo.setContractNo("—");
-        temporaryExitPermitInfo.setNum("1");
-        String vin = "";
-        String modelName = "";
-        List<String> list = scmVehicleGressionVehService.fetchVoByMainSid(sid);
-        if (list.size() > 0) {
-            for (String s : list) {
-                vin = s + "," + vin;
-                List<String> vinSids = scmVehicleGressionVehService.fetchVoByVinSids(s);
-                for (String vinSid : vinSids) {
-                    BaseVehicleSelectVo data = baseVehicleFeign.details(vinSid).getData();
-                    ExiCarConfigDetailVo exiCarConfigDetailVo = baseVehicleFeign.selectExiCarConfig(data.getModelSid(), data.getModelConfigSid(), data.getVehModelConfigSid()).getData();
-                    String model = exiCarConfigDetailVo.getVehicleAlias() + exiCarConfigDetailVo.getCarColor();
-                    modelName = model + "," + modelName;
-                }
+
+        List<String> vinList = new ArrayList<>();
+        List<String> vinSidList = new ArrayList<>();
+        List<ScmVehicleGressionVehVo> scmVehicleGressionVehVos = scmVehicleGressionVehService.selectInfoVoByMainSid(sid);
+        if (scmVehicleGressionVehVos.size() > 0) {
+            for (ScmVehicleGressionVehVo v : scmVehicleGressionVehVos) {
+                String vehSid = v.getVehSid();
+                String vin = v.getVehVin();
+                vinList.add(vin);
+                vinSidList.add(vehSid);
             }
         }
+        String vin = String.join(",", vinList);
+        List<String> modelNameList = new ArrayList<>();
+        for (String vinSid : vinSidList) {
+            BaseVehicleSelectVo data = baseVehicleFeign.details(vinSid).getData();
+            ExiCarConfigDetailVo exiCarConfigDetailVo = baseVehicleFeign.selectExiCarConfig(data.getModelSid(), data.getModelConfigSid(), data.getVehModelConfigSid()).getData();
+            String model = exiCarConfigDetailVo.getVehicleAlias() + exiCarConfigDetailVo.getCarColor();
+            modelNameList.add(model);
+        }
+        String modelName = String.join(",", modelNameList);
         temporaryExitPermitInfo.setVinNo(vin);
         temporaryExitPermitInfo.setModelName(modelName);
         temporaryExitPermitInfo.setReason("存放地点变更");
         temporaryExitPermitInfo.setCreatName(scmVehicleGression.getOperator());
         temporaryExitPermitInfo.setCarryCarName("—");
         temporaryExitPermitInfo.setApplyName(scmVehicleGression.getApplicantName());
+        temporaryExitPermitInfo.setNum(String.valueOf(vinSidList.size()));
         return rb.success().setData(temporaryExitPermitInfo);
     }
 
@@ -1219,14 +1225,14 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         AppErtraStateVo vo = new AppErtraStateVo();
         ScmVehicleGression scmVehicleGression = fetchBySid(sid);
         if ("1".equals(scmVehicleGression.getProCardStateKey())) {
-            vo.setPolicyShow(true);
+            vo.setProCardShow(true);
         } else if ("0".equals(scmVehicleGression.getProCardStateKey())) {
-            vo.setPolicyShow(false);
+            vo.setProCardShow(false);
         }
         if ("1".equals(scmVehicleGression.getInsuranceStateKey())) { // 如果保单状态为否 不保存保单照片
-            vo.setProCardShow(true);
+            vo.setPolicyShow(true);
         } else if ("0".equals(scmVehicleGression.getInsuranceStateKey())) {
-            vo.setProCardShow(false);
+            vo.setPolicyShow(false);
         }
         return rb.success().setData(vo);
     }