车型，客户问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppVehicleModelPriceQuery.java

@@ -18,6 +18,9 @@ public class AppVehicleModelPriceQuery implements Query {
     @ApiModelProperty(value = "名称（优先级最高，有值时 查询车型名称）")
     private String name;
 
+    @ApiModelProperty(value = "品牌名称")
+    private String brand;
+
     @ApiModelProperty(value = "排放标准")
     private String emissionStandard;
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java

@@ -230,7 +230,7 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
      * @param qw
      * @return
      */
-    IPage<AppVehicleModelPriceVo> getModelList(IPage<AppVehicleModelPriceQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppVehicleModelPriceVo> qw);
+    IPage<AppVehicleModelPriceVo> getModelList(IPage<AppVehicleModelPriceQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppVehicleModelPriceVo> qw,@Param("useOrgSid") String useOrgSid);
 
     /**
      * 手机端查询不本公司的现车，排产车

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -490,9 +490,11 @@
         bvm.gearboxTypeValue,
         bvc.priceValidity,
         (SELECT CONCAT(MIN(bvc.guidedPrice), '-', MAX(bvc.guidedPrice)) FROM base_vehmodel_config bvc WHERE bvc.modelSid
-        = bvm.sid) AS guidedPrice,
-        (SELECT count(*) FROM base_vehmodel_config bvc WHERE bvc.modelSid = bvm.sid) AS configNum,
-        (SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid AND lockedState = '03') AS nowCarNum,
+        = bvm.sid AND bvc.useOrgSid = #{useOrgSid}) AS guidedPrice,
+        (SELECT count(*) FROM base_vehmodel_config bvc WHERE bvc.modelSid = bvm.sid AND bvc.useOrgSid = #{useOrgSid}) AS
+        configNum,
+        (SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid AND lockedState = '03' AND bv.useOrg =
+        #{useOrgSid}) AS nowCarNum,
         (SELECT count(*)
         FROM bus_vehicle_apply_detail bvad
         WHERE bvad.vehicleSid = bvm.sid) AS produceCarNum
@@ -527,7 +529,7 @@
                         FROM base_vehicle bv
                         WHERE bv.modelSid = bvm.sid
                           AND bv.modelConfigSid = bvc.configurationItemsSid
-                          AND lockedState = '0004')
+                          AND lockedState = '03')
                        +
                        (SELECT count(*)
                         FROM bus_vehicle_apply_detail bvad

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -22,6 +22,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.DateUtils;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
@@ -30,10 +31,8 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import javax.xml.crypto.Data;
+import java.util.*;
 
 /**
  * Project: anrui-base(安瑞基础信息模块) <br/>
@@ -488,6 +487,11 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         String useOrg = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
 
         AppCurrentCarDetailConfigVo configDetailVo = baseMapper.getAppModelConfig(modelSid, configSid, useOrg);
+        String date = configDetailVo.getDate();
+        Date date1 = DateUtils.dateStrConvertDate(date, "yyyy-MM-dd");
+        long time = date1.getTime();
+        configDetailVo.setDateLong(time);
+
         //车型详细配置数据
         AppCurrentCarDetailVo currentCarVo = baseMapper.getAppCurrentCarDetailConfigVo(modelSid, configSid, useOrg);
         List<List<ConfigInfoSpanSize>> modelInfoList = new ArrayList<>();
@@ -747,7 +751,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         }
         IPage<AppVehicleModelPriceQuery> page = PagerUtil.queryToPage(pagerQuery);
         QueryWrapper<AppVehicleModelPriceVo> qw = appExistingCarBuildQW(pagerQuery.getParams());
-        IPage<AppVehicleModelPriceVo> iPage = baseMapper.getModelList(page, qw);
+        IPage<AppVehicleModelPriceVo> iPage = baseMapper.getModelList(page, qw, data.getSid());
         // 3、 查询更多配置（其它分公司）
         for (AppVehicleModelPriceVo record : iPage.getRecords()) {
             String sid = record.getModelSid();
@@ -757,7 +761,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             if (list.size() > 0) {
                 String s = list.get(0);
                 record.setModelImage(s);
-            }else {
+            } else {
                 record.setModelImage("");
             }
             String useOrg = data.getSid();
@@ -803,6 +807,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (StringUtils.isNotBlank(pagerQuery.getHorsepower())) { // 马力
             qw.eq("bvm.powerValue", pagerQuery.getHorsepower());
         }
+        if (StringUtils.isNotBlank(pagerQuery.getBrand())) { // 品牌
+            qw.eq("bvm.brandName", pagerQuery.getBrand());
+        }
         if (StringUtils.isNotBlank(pagerQuery.getUseOrg())) { // 分公司
             qw.eq("bvc.useOrgSid", pagerQuery.getUseOrg());
         }
@@ -1254,14 +1261,20 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             if (StringUtils.isNotBlank(query.getNames())) {
                 qw.like("bv.vinNo", query.getNames());//车架号
             }
-            if (StringUtils.isNotBlank(query.getNames())) {
-                qw.like("bv.vehicleStateValue", query.getNames());//状态
+//            if (StringUtils.isNotBlank(query.getNames())) {
+//                qw.eq("bv.vehicleStateValue", query.getNames());//状态
+//            }
+//            if (StringUtils.isNotBlank(query.getNames())) {
+//                qw.eq("bmc.carColor", query.getNames());//车身颜色
+//            }
+//            if (StringUtils.isNotBlank(query.getNames())) {
+//                qw.eq("bv.location", query.getNames());//存放地点
+//            }
+            if (StringUtils.isNotBlank(query.getModelSid())) {// 车型
+                qw.eq("bv.modelSid", query.getModelSid());
             }
-            if (StringUtils.isNotBlank(query.getNames())) {
-                qw.like("bmc.carColor", query.getNames());//车身颜色
-            }
-            if (StringUtils.isNotBlank(query.getNames())) {
-                qw.like("bv.location", query.getNames());//存放地点
+            if (StringUtils.isNotBlank(query.getConfigSid())) {//分公司
+                qw.eq("bv.modelConfigSid", query.getConfigSid());
             }
             if (StringUtils.isNotBlank(query.getUseOrg())) {//分公司
                 qw.eq("bv.useOrg", query.getUseOrg());
@@ -1300,7 +1313,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         QueryWrapper<AppBaseNowProduceCarVo> qw = new QueryWrapper<>();
         if (query != null) {
             if (StringUtils.isNotBlank(query.getNames())) {
-                qw.like("bvo.orderStatus", query.getNames());//订单状态
+                qw.like("bvo.orderNo", query.getNames());// 订单编号
             }
             if (StringUtils.isNotBlank(query.getUseOrg())) {//分公司
                 qw.eq("bvo.useOrg", query.getUseOrg());

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomer/CrmCustomerMapper.java

@@ -158,5 +158,5 @@ public interface CrmCustomerMapper extends BaseMapper<CrmCustomer> {
 
     List<CrmCustomerSelectVo> cusList();
 
-    int updateRemindAndByCustomerSid(@Param("customerSid") String customerSid,@Param("remind_day") String remind_day, @Param("remind_remark") String remind_remark,@Param("isOnRemind") String isOnRemind, @Param("isOnRemindkey") String isOnRemindkey);
+    int updateRemindAndByCustomerSid(@Param("customerSid") String customerSid, @Param("remind_day") String remind_day, @Param("remind_remark") String remind_remark, @Param("isOnRemind") String isOnRemind, @Param("isOnRemindkey") String isOnRemindkey, @Param("follow_state") String follow_state);
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomer/CrmCustomerMapper.xml

@@ -137,7 +137,8 @@
         SET remind_day    = #{remind_day},
             remind_remark = #{remind_remark},
             isOnRemind    = #{isOnRemind},
-            isOnRemindkey=#{isOnRemindkey}
+            isOnRemindkey=#{isOnRemindkey},
+            follow_state  = #{follow_state}
         WHERE sid = #{customerSid}
     </update>
 

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomer/CrmCustomerService.java

@@ -974,8 +974,8 @@ public class CrmCustomerService extends MybatisBaseService<CrmCustomerMapper, Cr
         return baseMapper.cusList();
     }
 
-    public int updateRemindAndByCustomerSid(String customerSid, String remind_day, String remind_remark, String isOnRemind, String isOnRemindkey) {
-        return baseMapper.updateRemindAndByCustomerSid(customerSid, remind_day, remind_remark, isOnRemind, isOnRemindkey);
+    public int updateRemindAndByCustomerSid(String customerSid, String remind_day, String remind_remark, String isOnRemind, String isOnRemindkey,String follow_state) {
+        return baseMapper.updateRemindAndByCustomerSid(customerSid, remind_day, remind_remark, isOnRemind, isOnRemindkey,follow_state);
     }
 
     /*获取身份证信息*/

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml

@@ -41,7 +41,7 @@
         cct.companyName,
         (select Max(DATE_FORMAT(cv.createTime,'%Y-%m-%d')) from crm_visit cv where cv.customerSid = cct.sid order by
         cv.id DESC) as visitTime ,
-        cv.follow_state
+        cct.follow_state
         FROM
         crm_customer_temp cct
         LEFT JOIN crm_visit cv ON cct.sid = cv.customerSid

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

@@ -139,7 +139,8 @@ public class CrmVisitRest implements CrmVisitFeign {
             String remind_day = dto.getRemind_day();
             String remind_remark = dto.getRemind_remark();
             String isOnRemind = dto.getIsOnRemind();
-            crmCustomerService.updateRemindAndByCustomerSid(customerSid, remind_day, remind_remark, isOnRemind, isOnRemindkey);
+            String follow_state = dto.getFollow_state();
+            crmCustomerService.updateRemindAndByCustomerSid(customerSid, remind_day, remind_remark, isOnRemind, isOnRemindkey,follow_state);
             return rb.success().setMsg("添加成功");
         }
         return rb.fail().setMsg("保存失败，该客户不存在");

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

@@ -398,7 +398,8 @@ public class CrmVisitService extends MybatisBaseService<CrmVisitMapper, CrmVisit
         String remind_day = appCrmVisitDto.getRemind_day();
         String remind_remark = appCrmVisitDto.getRemind_remark();
         String isOnRemind = appCrmVisitDto.getIsOnRemind();
-        int i = crmCustomerService.updateRemindAndByCustomerSid(customerSid, remind_day, remind_remark, isOnRemind, isOnRemindkey);
+        String follow_state = appCrmVisitDto.getFollow_state();
+        int i = crmCustomerService.updateRemindAndByCustomerSid(customerSid, remind_day, remind_remark, isOnRemind, isOnRemindkey,follow_state);
         if (i > 0) {
             CrmVisit entity = new CrmVisit();
             List<String> materialsList = appCrmVisitDto.getMaterialsList();