From c27b5cb6b38ecc0451ebd3140cd684a1e3634037 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Thu, 12 May 2022 15:01:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95-=E6=84=8F?=
 =?UTF-8?q?=E5=90=91=E8=BD=A6=E5=9E=8B=E3=80=81=E8=99=9A=E6=8B=9F=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E3=80=81=E8=BD=A6=E5=9E=8B=E5=BA=93=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9E=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=93=81=E7=89=8Csid=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/api/basevehiclemodel/BaseVehicleModelListVo.java    | 2 ++
 .../anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java    | 3 +++
 .../base/biz/basevehiclemodel/BaseVehicleModelMapper.xml     | 1 +
 .../base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml | 2 +-
 .../buscenter/api/busmaindeposit/pc/PcBusMainDepositVo.java  | 2 ++
 .../api/bussalesordermodel/BusSalesOrderModelDto.java        | 4 +++-
 .../buscenter/biz/busmaindeposit/BusMainDepositService.java  | 1 +
 .../buscenter/biz/bussalesorder/BusSalesOrderService.java    | 5 ++++-
 .../crm/api/crmvehicledemand/pc/PcCrmVehicleDemandVo.java    | 2 ++
 .../crm/biz/crmvehicledemand/CrmVehicledemandService.java    | 1 +
 10 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelListVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelListVo.java
index 6955900e11..460422e5b0 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelListVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelListVo.java
@@ -17,6 +17,8 @@ public class BaseVehicleModelListVo implements Vo {
     private String sid;
     @ApiModelProperty(value = "品牌名称")
     private String brandName;
+    @ApiModelProperty(value = "品牌sid")
+    private String brandSid;
     @ApiModelProperty(value = "车型名称")
     private String vehicleAlias;
     @ApiModelProperty(value = "版本")
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java
index 8d38776c25..bdb929c4c5 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java
@@ -21,4 +21,7 @@ public class BaseVehmodelVo implements Vo {
     private String modelName;
     @ApiModelProperty(value = "更多配置")
     private String otherConfig;
+
+    @ApiModelProperty(value = "品牌sid")
+    private String brandSid;
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml
index 123c190edf..fd022db1ab 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml
@@ -333,6 +333,7 @@
         SELECT DISTINCT
         bm.sid,
         bm.brandName,
+        bm.carBrand as brandSid,
         bm.vehicleAlias,
         bm.vehicleVersionValue,
         bm.fuelTypeValue,
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml
index 237120834c..617246c010 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml
@@ -209,7 +209,7 @@
     </select>
 
     <select id="selectO" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo">
-        select bvc.guidedPrice, bm.modelName, bmc.otherConfig
+        select bvc.guidedPrice, bm.modelName, bmc.otherConfig,bm.carBrand as brandSid
         from base_vehmodel_config bvc
                  left join base_vehicle_model bm on bvc.modelSid = bm.sid
                  left join base_model_config bmc on bvc.configurationItemsSid = bmc.sid
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusMainDepositVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusMainDepositVo.java
index 32e8d1cdbb..fb5d163eb6 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusMainDepositVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusMainDepositVo.java
@@ -15,6 +15,8 @@ public class PcBusMainDepositVo implements Vo {
 
     @ApiModelProperty(value = "品牌")
     private String brandName;
+    @ApiModelProperty(value = "品牌sid")
+    private String brandSid;
     @ApiModelProperty(value = "车型sid")
     private String modelSid;
     @ApiModelProperty(value = "车型配置sid")
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDto.java
index 6e138b9737..b073f3a8e7 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDto.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDto.java
@@ -51,9 +51,11 @@ import java.math.BigDecimal;
 public class BusSalesOrderModelDto implements Dto {
 
     private static final long serialVersionUID = -216156078782065154L;
-    
+
     @ApiModelProperty(value = "品牌")
     private String brandName;
+    @ApiModelProperty(value = "品牌sid")
+    private String brandSid;
     @ApiModelProperty("车型sid")
     private String modelSid;
     @ApiModelProperty("配置sid")
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
index f43ece7c93..62e5b9cf3a 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
@@ -1462,6 +1462,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                         list.get(i).setGuidedPrice(voResultBean.getData().getGuidedPrice());
                         list.get(i).setModelName(voResultBean.getData().getModelName());
                         list.get(i).setOtherConfig(voResultBean.getData().getOtherConfig());
+                        list.get(i).setBrandSid(voResultBean.getData().getBrandSid());
                     }
                 }
             }
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
index b990507468..c30ca66ce7 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
@@ -421,8 +421,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             } else {
                 variables.put("isLoan", false);
             }
+            //销售支持部经理的角色sid
+            String roleSid = "87a823b0-201b-4a0b-8025-774a5aa27bef";
             //查询销售支持部经理是否超权限
 
+
+
             //查询总经理审批是否超权限
 
             //查询是否排产
@@ -910,7 +914,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     }
 
 
-
     /**
      * 删除/批量删除销售订单
      *
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/pc/PcCrmVehicleDemandVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/pc/PcCrmVehicleDemandVo.java
index a16d2de588..0c9a005ebf 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/pc/PcCrmVehicleDemandVo.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/pc/PcCrmVehicleDemandVo.java
@@ -19,6 +19,8 @@ public class PcCrmVehicleDemandVo implements Vo {
     private String modelConfigSid;
     @ApiModelProperty(value = "品牌")
     private String brandName;
+    @ApiModelProperty(value = "品牌sid")
+    private String brandSid;
     @ApiModelProperty(value = "车型别名")
     private String modelAlias;
     /**
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java
index 60d511f3c5..9a6199d375 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java
@@ -387,6 +387,7 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
                     list.get(i).setGuidedPrice(voResultBean.getData().getGuidedPrice());
                     list.get(i).setModelName(voResultBean.getData().getModelName());
                     list.get(i).setOtherConfig(voResultBean.getData().getOtherConfig());
+                    list.get(i).setBrandSid(voResultBean.getData().getBrandSid());
                 }
             }
         }