分菜单

This commit is contained in:
wuyibo
2023-07-27 18:02:33 +08:00
parent 7eefb42ca4
commit 5af654258b
12 changed files with 3687 additions and 458 deletions

View File

@@ -3,6 +3,7 @@ package com.ruoyi.system.domain;
import java.util.List;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.core.annotation.Excel;
@@ -14,6 +15,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
* @author ruoyi
* @date 2023-05-06
*/
@Data
public class Customer extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -60,7 +62,8 @@ public class Customer extends BaseEntity
/** 客户居住 区县/区域 */
@Excel(name = "客户居住 区县/区域")
private String liveAddress;
@Excel(name = "到店状态")
private String storeStatus;
/** 客户状态 */
@Excel(name = "客户状态")
private String status;
@@ -137,317 +140,4 @@ public class Customer extends BaseEntity
/** 跟进模块-客户跟进记录信息 */
private List<FollowUp> followUpList;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setUserName(String userName)
{
this.userName = userName;
}
public String getUserName()
{
return userName;
}
public void setNickName(String nickName)
{
this.nickName = nickName;
}
public String getNickName()
{
return nickName;
}
public void setUserType(String userType)
{
this.userType = userType;
}
public String getUserType()
{
return userType;
}
public void setEmail(String email)
{
this.email = email;
}
public String getEmail()
{
return email;
}
public void setPhoneNumber(String phoneNumber)
{
this.phoneNumber = phoneNumber;
}
public String getPhoneNumber()
{
return phoneNumber;
}
public void setSex(String sex)
{
this.sex = sex;
}
public String getSex()
{
return sex;
}
public void setAvatar(String avatar)
{
this.avatar = avatar;
}
public String getAvatar()
{
return avatar;
}
public void setClueChannel(String clueChannel)
{
this.clueChannel = clueChannel;
}
public String getClueChannel()
{
return clueChannel;
}
public void setDataSource(String dataSource)
{
this.dataSource = dataSource;
}
public String getDataSource()
{
return dataSource;
}
public void setLiveAddress(String liveAddress)
{
this.liveAddress = liveAddress;
}
public String getLiveAddress()
{
return liveAddress;
}
public void setStatus(String status)
{
this.status = status;
}
public String getStatus()
{
return status;
}
public void setDelFlag(String delFlag)
{
this.delFlag = delFlag;
}
public String getDelFlag()
{
return delFlag;
}
public void setLoginIp(String loginIp)
{
this.loginIp = loginIp;
}
public String getLoginIp()
{
return loginIp;
}
public void setLoginDate(Date loginDate)
{
this.loginDate = loginDate;
}
public Date getLoginDate()
{
return loginDate;
}
public void setWechat(String wechat)
{
this.wechat = wechat;
}
public String getWechat()
{
return wechat;
}
public void setBuyCarType(String buyCarType)
{
this.buyCarType = buyCarType;
}
public String getBuyCarType()
{
return buyCarType;
}
public void setExistModels(String existModels)
{
this.existModels = existModels;
}
public String getExistModels()
{
return existModels;
}
public void setIsAssessment(Integer isAssessment)
{
this.isAssessment = isAssessment;
}
public Integer getIsAssessment()
{
return isAssessment;
}
public void setIntentionCarModels(String intentionCarModels)
{
this.intentionCarModels = intentionCarModels;
}
public String getIntentionCarModels()
{
return intentionCarModels;
}
public void setContrastCarModels(String contrastCarModels)
{
this.contrastCarModels = contrastCarModels;
}
public String getContrastCarModels()
{
return contrastCarModels;
}
public void setIsTestDrive(Integer isTestDrive)
{
this.isTestDrive = isTestDrive;
}
public Integer getIsTestDrive()
{
return isTestDrive;
}
public void setIsOffer(Integer isOffer)
{
this.isOffer = isOffer;
}
public Integer getIsOffer()
{
return isOffer;
}
public void setIsFinance(Integer isFinance)
{
this.isFinance = isFinance;
}
public Integer getIsFinance()
{
return isFinance;
}
public void setUnBookingCarReason(String unBookingCarReason)
{
this.unBookingCarReason = unBookingCarReason;
}
public String getUnBookingCarReason()
{
return unBookingCarReason;
}
public void setPreToStoreDate(Date preToStoreDate)
{
this.preToStoreDate = preToStoreDate;
}
public Date getPreToStoreDate()
{
return preToStoreDate;
}
public void setLastToStoreDate(Date lastToStoreDate)
{
this.lastToStoreDate = lastToStoreDate;
}
public Date getLastToStoreDate()
{
return lastToStoreDate;
}
public void setStoreName(String storeName)
{
this.storeName = storeName;
}
public String getStoreName()
{
return storeName;
}
public void setOrderDate(Date orderDate)
{
this.orderDate = orderDate;
}
public Date getOrderDate()
{
return orderDate;
}
public List<FollowUp> getFollowUpList()
{
return followUpList;
}
public void setFollowUpList(List<FollowUp> followUpList)
{
this.followUpList = followUpList;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("userName", getUserName())
.append("nickName", getNickName())
.append("userType", getUserType())
.append("email", getEmail())
.append("phoneNumber", getPhoneNumber())
.append("sex", getSex())
.append("avatar", getAvatar())
.append("clueChannel", getClueChannel())
.append("dataSource", getDataSource())
.append("liveAddress", getLiveAddress())
.append("status", getStatus())
.append("delFlag", getDelFlag())
.append("loginIp", getLoginIp())
.append("loginDate", getLoginDate())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("wechat", getWechat())
.append("buyCarType", getBuyCarType())
.append("existModels", getExistModels())
.append("isAssessment", getIsAssessment())
.append("intentionCarModels", getIntentionCarModels())
.append("contrastCarModels", getContrastCarModels())
.append("isTestDrive", getIsTestDrive())
.append("isOffer", getIsOffer())
.append("isFinance", getIsFinance())
.append("unBookingCarReason", getUnBookingCarReason())
.append("preToStoreDate", getPreToStoreDate())
.append("lastToStoreDate", getLastToStoreDate())
.append("storeName", getStoreName())
.append("orderDate", getOrderDate())
.append("followUpList", getFollowUpList())
.toString();
}
}

View File

@@ -2,6 +2,7 @@ package com.ruoyi.system.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.core.annotation.Excel;
@@ -13,6 +14,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
* @author ruoyi
* @date 2023-05-07
*/
@Data
public class FollowUp extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -41,76 +43,9 @@ public class FollowUp extends BaseEntity
/** 级别 */
@Excel(name = "级别")
private String followLevel;
@Excel(name = "跟进结果")
private String followResult;
@Excel(name = "跟进方式")
private String followUpMethod;
public void setId(Integer id)
{
this.id = id;
}
public Integer getId()
{
return id;
}
public void setCustomerId(Long customerId)
{
this.customerId = customerId;
}
public Long getCustomerId()
{
return customerId;
}
public void setFollowUpDate(Date followUpDate)
{
this.followUpDate = followUpDate;
}
public Date getFollowUpDate()
{
return followUpDate;
}
public void setFollowUpRecord(String followUpRecord)
{
this.followUpRecord = followUpRecord;
}
public String getFollowUpRecord()
{
return followUpRecord;
}
public void setPreToStoreDate(Date preToStoreDate)
{
this.preToStoreDate = preToStoreDate;
}
public Date getPreToStoreDate()
{
return preToStoreDate;
}
public void setFollowLevel(String followLevel)
{
this.followLevel = followLevel;
}
public String getFollowLevel()
{
return followLevel;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("customerId", getCustomerId())
.append("followUpDate", getFollowUpDate())
.append("followUpRecord", getFollowUpRecord())
.append("preToStoreDate", getPreToStoreDate())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("followLevel", getFollowLevel())
.toString();
}
}

View File

@@ -76,8 +76,8 @@ public class CustomerServiceImpl implements ICustomerService
public int updateCustomer(Customer customer)
{
customer.setUpdateTime(DateUtils.getNowDate());
customerMapper.deleteFollowUpByCustomerId(customer.getId());
insertFollowUp(customer);
/* customerMapper.deleteFollowUpByCustomerId(customer.getId());
insertFollowUp(customer);*/
return customerMapper.updateCustomer(customer);
}

View File

@@ -2,6 +2,8 @@ package com.ruoyi.system.service.impl;
import java.util.List;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.system.domain.Customer;
import com.ruoyi.system.mapper.CustomerMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.system.mapper.FollowUpMapper;
@@ -19,6 +21,8 @@ public class FollowUpServiceImpl implements IFollowUpService
{
@Autowired
private FollowUpMapper followUpMapper;
@Autowired
private CustomerMapper customerMapper;
/**
* 查询跟进模块-客户跟进记录
@@ -54,6 +58,16 @@ public class FollowUpServiceImpl implements IFollowUpService
public int insertFollowUp(FollowUp followUp)
{
followUp.setCreateTime(DateUtils.getNowDate());
Customer customer = new Customer();
customer.setId(followUp.getCustomerId());
//如果跟进记录的跟进级别选择
if("战败".equals(followUp.getFollowLevel())){
customer.setStatus("defeat");
customerMapper.updateCustomer(customer);
}else if("订车".equals(followUp.getFollowLevel())||"成交".equals(followUp.getFollowLevel())){
customer.setStatus("order");
customerMapper.updateCustomer(customer);
}
return followUpMapper.insertFollowUp(followUp);
}

View File

@@ -17,6 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="dataSource" column="data_source" />
<result property="liveAddress" column="live_address" />
<result property="status" column="status" />
<result property="storeStatus" column="store_status"/>
<result property="delFlag" column="del_flag" />
<result property="loginIp" column="login_ip" />
<result property="loginDate" column="login_date" />
@@ -60,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectCustomerVo">
select id, user_name, nick_name, user_type, email, phonenumber, sex, avatar, clue_channel, data_source, live_address, status, del_flag, login_ip, login_date, create_by, create_time, update_by, update_time, remark, wechat, buy_car_type, exist_models, is_assessment, intention_car_models, contrast_car_models, is_test_drive, is_offer, is_finance, un_booking_car_reason, pre_to_store_date, last_to_store_date, store_name, order_date from f_customer
select id, user_name, nick_name, user_type, email,store_status, phonenumber, sex, avatar, clue_channel, data_source, live_address, status, del_flag, login_ip, login_date, create_by, create_time, update_by, update_time, remark, wechat, buy_car_type, exist_models, is_assessment, intention_car_models, contrast_car_models, is_test_drive, is_offer, is_finance, un_booking_car_reason, pre_to_store_date, last_to_store_date, store_name, order_date from f_customer
</sql>
<select id="selectCustomerList" resultType="com.ruoyi.system.domain.vo.CustomerVo">
@@ -112,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="dataSource != null and dataSource != ''"> and t.data_source = #{dataSource}</if>
<if test="liveAddress != null and liveAddress != ''"> and t.live_address = #{liveAddress}</if>
<if test="status != null and status != ''"> and t.status = #{status}</if>
<if test="storeStatus != null and storeStatus != ''"> and t.store_status = #{storeStatus}</if>
<if test="loginDate != null "> and t.login_date = #{loginDate}</if>
<if test="wechat != null and wechat != ''"> and t.wechat = #{wechat}</if>
<if test="buyCarType != null and buyCarType != ''"> and t.buy_car_type = #{buyCarType}</if>
@@ -135,7 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectCustomerById" parameterType="Long" resultMap="CustomerFollowUpResult">
select a.id, a.user_name, a.nick_name, a.user_type, a.email, a.phonenumber, a.sex, a.avatar, a.clue_channel, a.data_source, a.live_address, a.status, a.del_flag, a.login_ip, a.login_date, a.create_by, a.create_time, a.update_by, a.update_time, a.remark, a.wechat, a.buy_car_type, a.exist_models, a.is_assessment, a.intention_car_models, a.contrast_car_models, a.is_test_drive, a.is_offer, a.is_finance, a.un_booking_car_reason, a.pre_to_store_date, a.last_to_store_date, a.store_name, a.order_date,
select a.id, a.user_name,a.store_status, a.nick_name, a.user_type, a.email, a.phonenumber, a.sex, a.avatar, a.clue_channel, a.data_source, a.live_address, a.status, a.del_flag, a.login_ip, a.login_date, a.create_by, a.create_time, a.update_by, a.update_time, a.remark, a.wechat, a.buy_car_type, a.exist_models, a.is_assessment, a.intention_car_models, a.contrast_car_models, a.is_test_drive, a.is_offer, a.is_finance, a.un_booking_car_reason, a.pre_to_store_date, a.last_to_store_date, a.store_name, a.order_date,
b.id as sub_id, b.customer_id as sub_customer_id, b.follow_up_date as sub_follow_up_date, b.follow_up_record as sub_follow_up_record, b.pre_to_store_date as sub_pre_to_store_date, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.remark as sub_remark, b.follow_level as sub_follow_level
from f_customer a
left join f_follow_up b on b.customer_id = a.id
@@ -156,6 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="dataSource != null">data_source,</if>
<if test="liveAddress != null">live_address,</if>
<if test="status != null">status,</if>
<if test="storeStatus != null">store_status,</if>
<if test="delFlag != null">del_flag,</if>
<if test="loginIp != null">login_ip,</if>
<if test="loginDate != null">login_date,</if>
@@ -191,6 +194,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="dataSource != null">#{dataSource},</if>
<if test="liveAddress != null">#{liveAddress},</if>
<if test="status != null">#{status},</if>
<if test="storeStatus != null">#{storeStatus},</if>
<if test="delFlag != null">#{delFlag},</if>
<if test="loginIp != null">#{loginIp},</if>
<if test="loginDate != null">#{loginDate},</if>
@@ -230,6 +234,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="dataSource != null">data_source = #{dataSource},</if>
<if test="liveAddress != null">live_address = #{liveAddress},</if>
<if test="status != null">status = #{status},</if>
<if test="storeStatus != null">store_status = #{storeStatus},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
<if test="loginIp != null">login_ip = #{loginIp},</if>
<if test="loginDate != null">login_date = #{loginDate},</if>
@@ -279,9 +284,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<insert id="batchFollowUp">
insert into f_follow_up( id, customer_id, follow_up_date, follow_up_record, pre_to_store_date, create_by, create_time, update_by, update_time, remark, follow_level) values
insert into f_follow_up( id, customer_id, follow_up_date, follow_up_record, pre_to_store_date, create_by, create_time, update_by, update_time, remark, follow_level,follow_result,follow_up_method) values
<foreach item="item" index="index" collection="list" separator=",">
( #{item.id}, #{item.customerId}, #{item.followUpDate}, #{item.followUpRecord}, #{item.preToStoreDate}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.remark}, #{item.followLevel})
( #{item.id}, #{item.customerId}, #{item.followUpDate}, #{item.followUpRecord}, #{item.preToStoreDate}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.remark}, #{item.followLevel},#{item.followResult},#{item.followUpMethod})
</foreach>
</insert>
</mapper>

View File

@@ -16,16 +16,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="followLevel" column="follow_level" />
<result property="followResult" column="follow_result" />
<result property="followUpMethod" column="follow_up_method" />
</resultMap>
<sql id="selectFollowUpVo">
select id, customer_id, follow_up_date, follow_up_record, pre_to_store_date, create_by, create_time, update_by, update_time, remark, follow_level from f_follow_up
select id, customer_id, follow_up_date, follow_up_record, pre_to_store_date, create_by, create_time, update_by, update_time, remark, follow_level,follow_result,follow_up_method from f_follow_up
</sql>
<select id="selectFollowUpList" parameterType="FollowUp" resultMap="FollowUpResult">
<include refid="selectFollowUpVo"/>
<where>
<if test="customerId != null and customerId != ''"> and customer_id = #{customerId}</if>
<if test="followResult != null and followResult != ''"> and follow_result = #{followResult}</if>
<if test="followUpMethod != null and followUpMethod != ''"> and follow_up_method = #{followUpMethod}</if>
<if test="followUpDate != null "> and follow_up_date = #{followUpDate}</if>
<if test="followUpRecord != null and followUpRecord != ''"> and follow_up_record = #{followUpRecord}</if>
<if test="preToStoreDate != null "> and pre_to_store_date = #{preToStoreDate}</if>
@@ -51,6 +55,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
<if test="followLevel != null">follow_level,</if>
<if test="followResult != null ">follow_result ,</if>
<if test="followUpMethod != null">follow_up_method ,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="customerId != null">#{customerId},</if>
@@ -63,6 +69,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
<if test="followLevel != null">#{followLevel},</if>
<if test="followResult != null ">#{followResult},</if>
<if test="followUpMethod != null">#{followUpMethod},</if>
</trim>
</insert>
@@ -79,6 +87,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="followLevel != null">follow_level = #{followLevel},</if>
<if test="followResult != null "> follow_result = #{followResult},</if>
<if test="followUpMethod != null "> follow_up_method = #{followUpMethod},</if>
</trim>
where id = #{id}
</update>