客户管理调式修复

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/VehModelQuery.java

@@ -2,19 +2,23 @@ package com.yxt.anrui.base.api.basevehiclemodel;
 
 
 import com.yxt.common.core.query.Query;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 @Data
 public class VehModelQuery implements Query {
 
+    private static final long serialVersionUID = 4901809739666168867L;
     @ApiModelProperty("车型名称")
     private String modelName;
     @ApiModelProperty("常用配置名称")
     private String configName;
     @ApiModelProperty("品牌sid")
     private String brandSid;
+
+    @ApiModelProperty(value = "用户sid")
+    private String userSid;
+
+    @ApiModelProperty(value = "使用组织sid:后端内部使用")
+    private String orgSid;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/AppModelVeDetailVo.java

@@ -22,5 +22,11 @@ public class AppModelVeDetailVo implements Vo {
     @ApiModelProperty("销售指导价")
     private BigDecimal saleReferencePrice;
 
+    @ApiModelProperty(value = "常用配置")
+    private String configName;
+
+    @ApiModelProperty(value = "其他配置")
+    private String otherConfig;
+
 
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java

@@ -417,7 +417,7 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
     /**
      * 查询条件
      *
-     * @param query
+     * @param
      * @return
      */
    /* private QueryWrapper<BaseVehicleModelListVo> notTheCompanyBuildQueryWrapper(BaseVehicleModelListQuery query) {
@@ -467,7 +467,7 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
     /**
      * 更多车型分页列表(非本公司的)
      *
-     * @param query
+     * @param
      * @return
      */
    /* public IPage<BaseVehicleModelListVo> notTheCompanyModelPageList(PagerQuery<BaseVehicleModelListQuery> query) {
@@ -559,6 +559,9 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
 
     public PagerVo<VehModelVo> listPageByVehmodel(PagerQuery<VehModelQuery> pq) {
         VehModelQuery query = pq.getParams();
+        String userSid = query.getUserSid();
+        String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        query.setOrgSid(orgSid);
         QueryWrapper<VehModelVo> qw = createQueryWrapper1(query);
         IPage<VehModelVo> page = PagerUtil.queryToPage(pq);
         IPage<VehModelVo> pagging = baseMapper.listPageByVehmodel(page, qw);
@@ -577,6 +580,9 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
         if (StringUtils.isNotBlank(query.getConfigName())) {
             qw.like("bmc.configName", query.getConfigName());
         }
+        if (StringUtils.isNotBlank(query.getOrgSid())) {
+            qw.eq("bvc.useOrgSid", query.getOrgSid());
+        }
         return qw;
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml

@@ -189,7 +189,9 @@
         SELECT bvm.vehicleAlias AS modelName,
                bvm.brandName,
                bvm.carBrand     AS brandSid,
-               bvc.guidedPrice  AS saleReferencePrice
+               bvc.guidedPrice  AS saleReferencePrice,
+               bmc.configName,
+               bmc.otherConfig
         FROM base_vehmodel_config bvc
                  LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
                  LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
@@ -292,8 +294,7 @@
 
     <select id="selVehModelByUseOrgSidAndModelSidAndConfigSid"
             resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVos">
-        SELECT
-        bvm.`vehicleAlias`,
+        SELECT bvm.`vehicleAlias`,
                bvm.sid as modelSid,
                bmc.`configName`,
                bmc.sid as configSid,

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java

@@ -454,10 +454,8 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
 
     public AppModelVeDetailVo getAppIntentionVehicleVo(String userSid, String modelSid, String configSid) {
         AppModelVeDetailVo vo = null;
-        String useOrg = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
-        if (StringUtils.isNotBlank(useOrg)) {
-            vo = baseMapper.getAppIntentionVehicleVo(useOrg, modelSid, configSid);
-        }
+        String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        vo = baseMapper.getAppIntentionVehicleVo(orgSid, modelSid, configSid);
         return vo;
     }
 

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java

@@ -326,6 +326,8 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
         entity.setBrandName(data.getBrandName());
         entity.setStates("1");
         entity.setSaleReferencePrice(data.getSaleReferencePrice());
+        entity.setOtherConfig(data.getOtherConfig());
+        entity.setSketChconfiguration(data.getConfigName());
         appCrmVehicleDemandDto.fillEntity(entity);
         baseMapper.insert(entity);
         return rb.success();

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitMapper.xml

@@ -36,7 +36,7 @@
         <!--提醒日期-->
         cv.remind_day,
         cv.remind_day_key,
-        (SELECT COUNT(*) FROM crm_vehicledemand cve WHERE cve.customerSid = cv.customerSid) xqcounts
+        (SELECT COUNT(*) FROM crm_vehicledemand cve WHERE cve.customerSid = cv.customerSid and cve.states = 1) xqcounts
         FROM crm_visit cv
         ${ew.customSqlSegment}
     </select>