销售订单-意向车型、虚拟订单、车型库配置分页列表返回添加品牌sid字段

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 = "版本")

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;
 }

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,

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

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")

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")

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());
                     }
                 }
             }

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
     }
 
 
-
     /**
      * 删除/批量删除销售订单
      *

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;
     /**

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());
                 }
             }
         }