From 76fc4954232b213e0686ab496d185b83a3e2a784 Mon Sep 17 00:00:00 2001
From: Gavin Tigano <clunt@vip.163.com>
Date: Thu, 11 Jul 2024 10:38:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=94=80=E5=94=AE=E4=BA=8C=E6=AC=A1?=
 =?UTF-8?q?=E5=88=86=E9=85=8D=E6=97=B6=EF=BC=8C=E9=9C=80=E8=A6=81=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=8E=9F=E6=98=AF=E9=94=80=E5=94=AE=E6=98=AF=E8=B0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/web/controller/system/ClewController.java    | 4 ++++
 .../src/main/resources/templates/system/clew/clew.html     | 4 ++++
 .../src/main/java/com/ruoyi/system/domain/Clew.java        | 5 +++++
 .../src/main/resources/mapper/system/ClewMapper.xml        | 7 ++++---
 4 files changed, 17 insertions(+), 3 deletions(-)

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 @@
     <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>