clunt
/
RuoYi
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 销售二次分配时，需要记录原是销售是谁

This commit is contained in:
Gavin Tigano 2024-07-11 10:38:10 +08:00
parent 278bf616af
commit 76fc495423
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ClewController.java
View File

@ -105,6 +105,10 @@ public class ClewController extends BaseController
if(user != null){
model.setSaleName(user.getUserName());
}
SysUser sourceUser = sysUserService.selectUserById(model.getSourceSaleId());
if(sourceUser != null){
model.setSourceSaleName(sourceUser.getUserName());
}
}
if(model.getSourceApp() != null){
CompanyApp param = new CompanyApp();

4
ruoyi-admin/src/main/resources/templates/system/clew/clew.html
View File

@ -278,6 +278,10 @@
title: '广告主',
visible: false
},
{
field: 'sourceSaleName',
title: '原始销售'
},
{
field: 'saleName',
title: '销售'

5
ruoyi-system/src/main/java/com/ruoyi/system/domain/Clew.java
View File

@ -30,6 +30,11 @@ public class Clew extends BaseEntity
@Excel(name = "广告主")
private Long company;
private Long sourceSaleId;
private String sourceSaleName;
/** 销售 */
@Excel(name = "销售")
private Long saleId;

7
ruoyi-system/src/main/resources/mapper/system/ClewMapper.xml
View File

@ -7,6 +7,7 @@
<resultMap type="Clew" id="ClewResult">
<result property="id" column="id" />
<result property="company" column="company" />
<result property="sourceSaleId" column="source_sale_id" />
<result property="saleId" column="sale_id" />
<result property="infoFlow" column="info_flow" />
<result property="nextTime" column="next_time" />
@ -42,7 +43,7 @@
</resultMap>
<sql id="selectClewVo">
select id, company, sale_id, info_flow, next_time,
select id, company, source_sale_id, sale_id, info_flow, next_time,
wx_name, phone, debt_type, debt_money, source_type,
source_app, wx_account, customer_status, customer_level, touch_qrcode,
contact_number, is_touch, is_add_wx, is_effective, is_plan, is_deal,
@ -194,7 +195,7 @@
update clew
<trim prefix="SET" suffixOverrides=",">
<if test="company != null">company = #{company},</if>
<if test="saleId != null">sale_id = #{saleId},</if>
<if test="saleId != null">source_sale_id = sale_id, sale_id = #{saleId},</if>
<if test="infoFlow != null and infoFlow != ''">info_flow = #{infoFlow},</if>
<if test="nextTime != null">next_time = #{nextTime},</if>
<if test="wxName != null">wx_name = #{wxName},</if>
@ -233,7 +234,7 @@
<update id="updateBatchClew" parameterType="Clew">
update clew
<trim prefix="SET" suffixOverrides=",">
<if test="saleId != null">sale_id = #{saleId},</if>
<if test="saleId != null">source_sale_id = sale_id, sale_id = #{saleId},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="assignTimes != null">assign_times = #{assignTimes},</if>
</trim>