Merge remote-tracking branch 'origin/master'

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 = "";
+        List<String> vinList = new ArrayList<>();
-        String modelName = "";
+        List<String> vinSidList = new ArrayList<>();
-        List<String> list = scmVehicleGressionVehService.fetchVoByMainSid(sid);
+        List<ScmVehicleGressionVehVo> scmVehicleGressionVehVos = scmVehicleGressionVehService.selectInfoVoByMainSid(sid);
-        if (list.size() > 0) {
+        if (scmVehicleGressionVehVos.size() > 0) {
-            for (String s : list) {
+            for (ScmVehicleGressionVehVo v : scmVehicleGressionVehVos) {
-                vin = s + "," + vin;
+                String vehSid = v.getVehSid();
-                List<String> vinSids = scmVehicleGressionVehService.fetchVoByVinSids(s);
+                String vin = v.getVehVin();
-                for (String vinSid : vinSids) {
+                vinList.add(vin);
-                    BaseVehicleSelectVo data = baseVehicleFeign.details(vinSid).getData();
+                vinSidList.add(vehSid);
-                    ExiCarConfigDetailVo exiCarConfigDetailVo = baseVehicleFeign.selectExiCarConfig(data.getModelSid(), data.getModelConfigSid(), data.getVehModelConfigSid()).getData();
-                    String model = exiCarConfigDetailVo.getVehicleAlias() + exiCarConfigDetailVo.getCarColor();
-                    modelName = model + "," + modelName;
-                }
             }
         }
+        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);
     }