客户意向车型完善。

客户跟进记录完善。

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackagePageListVo.java

@@ -23,7 +23,7 @@ public class BaseDiscountpackagePageListVo implements Vo {
     private String discountType;
 
     @ApiModelProperty("优惠包名称")
-    private String discountName;
+    private String projectName;
 
     @ApiModelProperty("优惠包价值")
     private String discountMoney;

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

@@ -186,4 +186,12 @@ public interface BaseVehicleModelFeign {
     @PostMapping("/notTheCompanyModelPageList")
     ResultBean<PagerVo<BaseVehicleModelListVo>> notTheCompanyModelPageList(@RequestBody PagerQuery<BaseVehicleModelListQuery> query);
 
+    /**
+     * 新增意向车型选择车型查询车型列表
+     *
+     * @return
+     */
+    @ApiOperation("新增意向车型选择车型查询车型列表")
+    @PostMapping("/listPageByVehmodel")
+    public ResultBean<PagerVo<VehModelVo>> listPageByVehmodel(@RequestBody PagerQuery<VehModelQuery> pq);
 }

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

@@ -103,6 +103,11 @@ public class BaseVehicleModelFeignFallback implements BaseVehicleModelFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<PagerVo<VehModelVo>> listPageByVehmodel(PagerQuery<VehModelQuery> pq) {
+        return null;
+    }
+
     /*@Override
     public ResultBean<PagerVo<BaseVehicleModelListVo>> selectPage(PagerQuery<BaseVehicleModelListQuery> query) {
         return null;

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

@@ -0,0 +1,20 @@
+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 {
+
+    @ApiModelProperty("车型名称")
+    private String modelName;
+    @ApiModelProperty("常用配置名称")
+    private String configName;
+    @ApiModelProperty("品牌sid")
+    private String brandSid;
+}

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

@@ -0,0 +1,20 @@
+package com.yxt.anrui.base.api.basevehiclemodel;
+
+
+import com.yxt.common.core.query.Query;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class VehModelVo implements Vo {
+
+    @ApiModelProperty("车型名称")
+    private String modelName;
+    @ApiModelProperty("常用配置名称")
+    private String configName;
+    @ApiModelProperty("品牌名称")
+    private String brandName;
+    @ApiModelProperty("其他配置说明")
+    private String otherConfig;
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@@ -178,7 +178,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
 			baseOutsourcingApplicationVehicle.setOutAppSid(sid);
 			baseOutsourcingApplicationVehicleService.save(baseOutsourcingApplicationVehicle);
 		}
-		return rb.success().setMsg("修改成功");
+		return rb.success().setMsg("修改成功").setData(sid);
 	}
 
 	public ResultBean delAllBySids(String[] sids) {

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

@@ -146,4 +146,5 @@ public interface BaseVehicleModelMapper extends BaseMapper<BaseVehicleModel> {
     IPage<BaseVehicleModelListVo> notTheCompanyModelPageList(IPage<BaseVehicleModelListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicleModelListVo> qw);
 
 
+    IPage<VehModelVo> listPageByVehmodel(IPage<VehModelVo> page,@Param(Constants.WRAPPER) QueryWrapper<VehModelVo> qw);
 }

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

@@ -389,4 +389,16 @@
         productionCarNum,
         nowCarNum DESC
     </select>
+
+    <select id="listPageByVehmodel" resultType="com.yxt.anrui.base.api.basevehiclemodel.VehModelVo">
+        SELECT bvm.`brandName`,bvm.`modelName`,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`
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>

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

@@ -243,6 +243,13 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
         return rb.success().setData(pv1);
     }
 
+    @Override
+    public ResultBean<PagerVo<VehModelVo>> listPageByVehmodel(PagerQuery<VehModelQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<VehModelVo> pv = baseVehicleModelService.listPageByVehmodel(pq);
+        return rb.success().setData(pv);
+    }
+
 
 //    @Override
 //    public ResultBean<PagerVo<BaseVehicleModelListVo>> selectPage(PagerQuery<BaseVehicleModelListQuery> query) {

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

@@ -15,6 +15,7 @@ import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixV
 import com.yxt.anrui.base.biz.basemodelszconfig.BaseModelSzconfigService;
 import com.yxt.anrui.base.biz.basetrailer.BaseTrailerService;
 import com.yxt.anrui.base.biz.basevehiclemodelappendix.BaseVehicleModelAppendixService;
+import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemand;
 import com.yxt.anrui.portal.api.sysorganization.SysOrgVo;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
@@ -28,6 +29,7 @@ import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -523,4 +525,28 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
         }
         return rb.success().setMsg("修改成功");
     }
+
+
+    public PagerVo<VehModelVo> listPageByVehmodel(PagerQuery<VehModelQuery> pq) {
+        VehModelQuery query = pq.getParams();
+        QueryWrapper<VehModelVo> qw = createQueryWrapper1(query);
+        IPage<VehModelVo> page = PagerUtil.queryToPage(pq);
+        IPage<VehModelVo> pagging = baseMapper.listPageByVehmodel(page, qw);
+        PagerVo<VehModelVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    private QueryWrapper<VehModelVo> createQueryWrapper1(VehModelQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<VehModelVo> qw = new QueryWrapper<>();
+        qw.eq("bvm.carBrand",query.getBrandSid());
+        if (StringUtils.isNotBlank(query.getModelName())){
+            qw.like("bvm.modelName",query.getModelName());
+        }
+        if (StringUtils.isNotBlank(query.getConfigName())){
+            qw.like("bmc.configName",query.getConfigName());
+        }
+        return qw;
+    }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDeposit.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -82,8 +83,20 @@ public class BusDeposit extends BaseEntity {
     @ApiModelProperty("付款方式")
     private String payType;
 
-    @ApiModelProperty("收款银行账号")
+    @ApiModelProperty("付款银行账号")
-    private String proBankAcc;
+    private String payBankAcc;
+
+    @ApiModelProperty("收款银行key")
+    private String proBankKey;
+
+    @ApiModelProperty("收款银行value")
+    private String proBankValue;
+
+    @ApiModelProperty("收款银行账号key")
+    private String proBankAccKey;
+
+    @ApiModelProperty("收款银行账号value")
+    private String proBankAccValue;
 
     @ApiModelProperty("备注")
     private String remarks;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDepositDto.java

@@ -89,8 +89,25 @@ public class BusDepositDto implements Dto {
     @ApiModelProperty("付款方式")
     private String payType;
 
-    @ApiModelProperty("收款银行账号")
+    @ApiModelProperty("付款银行账号")
-    private String proBankAcc;
+    @NotBlank(message = "付款银行账号不能为空")
+    private String payBankAcc;
+
+    @ApiModelProperty("收款银行key")
+    @NotBlank(message = "收款银行不能为空")
+    private String proBankKey;
+
+    @ApiModelProperty("收款银行value")
+    @NotBlank(message = "收款银行不能为空")
+    private String proBankValue;
+
+    @ApiModelProperty("收款银行账号key")
+    @NotBlank(message = "收款银行账号不能为空")
+    private String proBankAccKey;
+
+    @ApiModelProperty("收款银行账号value")
+    @NotBlank(message = "收款银行账号不能为空")
+    private String proBankAccValue;
 
     @ApiModelProperty("备注")
     private String remarks;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusDepositBuscenterDto.java

@@ -19,6 +19,9 @@ public class AppBusDepositBuscenterDto implements Dto {
     @ApiModelProperty("付款凭证")
     private List<String> payImages;
 
+    @ApiModelProperty("收款银行账号key")
+    private String collectionNumberKey;
+
     @ApiModelProperty("收款银行账号")
     private String collectionNumber;
 
@@ -68,8 +71,4 @@ public class AppBusDepositBuscenterDto implements Dto {
     @ApiModelProperty("收款银行")
     private String collectionBankKey;
 
-    @ApiModelProperty("收款银行账号")
-    private String collectionNumberKey;
-
-
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusDepositDto.java

@@ -56,9 +56,25 @@ public class BusDepositDto extends BusMainDepositDto{
     @NotBlank(message = "付款方式不能为空")
     private String payType;
 
-    @ApiModelProperty("收款银行账号")
+    @ApiModelProperty("付款银行账号")
+    @NotBlank(message = "付款银行账号不能为空")
+    private String payBankAcc;
+
+    @ApiModelProperty("收款银行key")
+    @NotBlank(message = "收款银行不能为空")
+    private String proBankKey;
+
+    @ApiModelProperty("收款银行value")
+    @NotBlank(message = "收款银行不能为空")
+    private String proBankValue;
+
+    @ApiModelProperty("收款银行账号key")
+    @NotBlank(message = "收款银行账号不能为空")
+    private String proBankAccKey;
+
+    @ApiModelProperty("收款银行账号value")
     @NotBlank(message = "收款银行账号不能为空")
-    private String proBankAcc;
+    private String proBankAccValue;
 
     @ApiModelProperty("备注")
     private String remarks;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusDepositVo.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -39,8 +40,20 @@ public class BusDepositVo extends BusMainDepositVo{
     @ApiModelProperty("付款方式")
     private String payType;
 
-    @ApiModelProperty("收款银行账号")
+    @ApiModelProperty("付款银行账号")
-    private String proBankAcc;
+    private String payBankAcc;
+
+    @ApiModelProperty("收款银行key")
+    private String proBankKey;
+
+    @ApiModelProperty("收款银行value")
+    private String proBankValue;
+
+    @ApiModelProperty("收款银行账号key")
+    private String proBankAccKey;
+
+    @ApiModelProperty("收款银行账号value")
+    private String proBankAccValue;
 
     @ApiModelProperty("备注")
     private String remarks;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDeposit.java

@@ -78,12 +78,12 @@ public class BusMainDeposit extends BaseEntity {
     @ApiModelProperty("单据类型")
     private String depositBillType;
 
-    @ApiModelProperty("流程定义的id")
+/*    @ApiModelProperty("流程定义的id")
     private String procDefId;
     @ApiModelProperty("环节定义的sid")
     private String nodeSid;
     @ApiModelProperty("流程实例的sid")
-    private String procInstSid;
+    private String procInstSid;*/
 
     @ApiModelProperty(value = "节点状态")
     private String nodeState;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml

@@ -86,7 +86,11 @@
                bd.payTypeKey,
                bd.payType,
                bd.payTypeKey,
-               bd.proBankAcc,
+               bd.payBankAcc,
+               bd.proBankKey,
+               bd.proBankValue,
+               bd.proBankAccKey,
+               bd.proBankAccValue,
                bd.paymentProof,
                bd.remarks
         FROM bus_main_deposit bmd

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@@ -256,8 +256,10 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             BusDepositCustomer customer = null;
             for (BusDepositCustomerVo customerVo : customerList) {
                 customer = new BusDepositCustomer();
+                String sid = customer.getSid();
                 BeanUtil.copyProperties(customerVo, customer);
                 customer.setBillSid(billSid);
+                customer.setSid(sid);
                 busDepositCustomerService.save(customer);
             }
         }
@@ -650,8 +652,8 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             busMainDeposit.setDepositBillType("01");
             busMainDeposit.setDepositBillTypeKey("订金收取");
             busMainDeposit.setCreateDate(dateFormat.format(date));
-            busMainDeposit.setProcDefId(dto.getTaskId());
+/*            busMainDeposit.setProcDefId(dto.getTaskId());
-            busMainDeposit.setProcInstSid(dto.getProcInsId());
+            busMainDeposit.setProcInstSid(dto.getProcInsId());*/
             baseMapper.insert(busMainDeposit);
             BusDeposit busDeposit = new BusDeposit();
             busDeposit.setBillNo(busMainDeposit.getBillNo());
@@ -691,7 +693,8 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
      */
     public BusDeposit setBusDeposit(BusDeposit busDeposit, AppBusDepositBuscenterDto dto) {
         busDeposit.setDraweeName(dto.getPayName());
-        busDeposit.setProBankAcc(dto.getCollectionNumber());
+        busDeposit.setProBankAccKey(dto.getCollectionNumberKey());
+        busDeposit.setProBankAccValue(dto.getCollectionNumber());
         busDeposit.setPayTypeKey(dto.getPayTypeKey());
         busDeposit.setPayType(dto.getPayType());
         busDeposit.setPaymentDate(dto.getPayDate());

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemand.java

@@ -49,12 +49,15 @@ public class CrmVehicledemand extends BaseEntity {
     @ApiModelProperty("车型名称")
     private String modelName;
 
-    @ApiModelProperty("简述配置  ")
+    @ApiModelProperty("简述配置")
     private String sketChconfiguration;
 
     @ApiModelProperty("其它配置说明")
     private String otherConfig;
 
+    @ApiModelProperty("换选装内容")
+    private String changeOptions;
+
     @ApiModelProperty("车型报价")
     private String vehicleModelOffer;
 

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandDto.java

@@ -52,6 +52,9 @@ public class CrmVehicledemandDto implements Dto {
 	@ApiModelProperty("其它配置说明")
     private String otherConfig;
 
+    @ApiModelProperty("换选装内容")
+    private String changeOptions;
+    
 	@ApiModelProperty("车型报价")
     private BigDecimal vehicleModelOffer;
     

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandVo.java

@@ -58,6 +58,9 @@ public class CrmVehicledemandVo implements Vo {
 	@ApiModelProperty("其它配置说明")
     private String otherConfig;
 
+    @ApiModelProperty("换选装内容")
+    private String changeOptions;
+    
 	@ApiModelProperty("车型报价")
     private BigDecimal vehicleModelOffer;
     

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvisit/CrmVisitVo.java

@@ -33,6 +33,9 @@ public class CrmVisitVo implements Vo {
     @ApiModelProperty("员工Name")
     private String staffName;
 
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
     @ApiModelProperty("跟进形式key")
     private String follow_form_key;
 

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

@@ -41,9 +41,9 @@
         ${ew.customSqlSegment}
     </select>
     <select id="selVisitVo" resultType="com.yxt.anrui.crm.api.crmvisit.CrmVisitVo">
-        select cv.sid,
+        SELECT cv.sid,
                cv.customerSid,
-               cc.`name` as customerName,
+               cct.`name` AS customerName,
                cv.follow_form,
                cv.follow_form_key,
                cv.follow_type,
@@ -53,11 +53,12 @@
                cv.follow_state,
                cv.follow_state_key,
                cv.isOnRemind,
+               cv.isOnRemindkey,
                cv.remind_day,
                cv.remind_day_key
-        from crm_visit cv
+        FROM crm_visit cv
-                 left join crm_customer cc on cc.sid = cv.customerSid
+                     LEFT JOIN crm_customer_temp cct ON cct.sid = cv.customerSid
-        where cv.sid = #{sid};
+        where cv.sid = #{sid}
     </select>
     <!--查询本周记录条数-->
     <select id="selectCurWeekCount" resultType="int">