diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ClewController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ClewController.java index f2908eef..d0dc7150 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ClewController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ClewController.java @@ -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(); diff --git a/ruoyi-admin/src/main/resources/templates/system/clew/clew.html b/ruoyi-admin/src/main/resources/templates/system/clew/clew.html index 00e03212..c936a05b 100644 --- a/ruoyi-admin/src/main/resources/templates/system/clew/clew.html +++ b/ruoyi-admin/src/main/resources/templates/system/clew/clew.html @@ -278,6 +278,10 @@ title: '广告主', visible: false }, + { + field: 'sourceSaleName', + title: '原始销售' + }, { field: 'saleName', title: '销售' diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/Clew.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/Clew.java index 10bd6151..96964983 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/Clew.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/Clew.java @@ -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; diff --git a/ruoyi-system/src/main/resources/mapper/system/ClewMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ClewMapper.xml index b4a4dad0..c1267e54 100644 --- a/ruoyi-system/src/main/resources/mapper/system/ClewMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/ClewMapper.xml @@ -7,6 +7,7 @@ + @@ -42,7 +43,7 @@ - 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 company = #{company}, - sale_id = #{saleId}, + source_sale_id = sale_id, sale_id = #{saleId}, info_flow = #{infoFlow}, next_time = #{nextTime}, wx_name = #{wxName}, @@ -233,7 +234,7 @@ update clew - sale_id = #{saleId}, + source_sale_id = sale_id, sale_id = #{saleId}, update_time = #{updateTime}, assign_times = #{assignTimes},